From ddaf17637158f4262b982ac616a3698faba45c94 Mon Sep 17 00:00:00 2001
From: lq <workerqi@163.com>
Date: Wed, 10 Dec 2025 11:31:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85UI?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           |    2 +-
 request/api/product.js               |    8 +
 subPackages/my/my-drug/drug-info.vue | 1685 +++++++++++++-------------
 subPackages/product/product.vue      |    2 +-
 subPackages/product/symptoms.vue     | 1346 +++++++++++++++-----
 5 files changed, 1902 insertions(+), 1141 deletions(-)

diff --git a/pages.json b/pages.json
index b052eac..b593539 100644
--- a/pages.json
+++ b/pages.json
@@ -174,7 +174,7 @@
         {
           "path": "product/symptoms",
           "style": {
-            "navigationBarTitleText": "填写病症",
+            "navigationBarTitleText": "商品详情",
             "enablePullDownRefresh": false
           }
         }
diff --git a/request/api/product.js b/request/api/product.js
index b4b8c7c..5ad8598 100644
--- a/request/api/product.js
+++ b/request/api/product.js
@@ -15,4 +15,12 @@ export async function getStoreDrugListBySalespersonApi(params) {
  */
 export async function getStoreDrugDetailApi(params) {
     return await get('/product/product-detail', params, 3)
+}
+/**
+ * 获取商品配送服务文本
+ * @param params
+ * @returns {Promise<*>}
+ */
+export async function getOrderTextApi(params) {
+    return await get('/product/order-text', params, 3)
 }
\ No newline at end of file
diff --git a/subPackages/my/my-drug/drug-info.vue b/subPackages/my/my-drug/drug-info.vue
index c45f2b8..7c296c2 100644
--- a/subPackages/my/my-drug/drug-info.vue
+++ b/subPackages/my/my-drug/drug-info.vue
@@ -1,418 +1,483 @@
 <template>
-	<view class="container safe-area-inset-bottom">
-		<view class="head_cancle" v-if="orderInfo.ProductOrder.status!=0  && orderInfo.ProductOrder.cancel_status==1">
-			订单已取消
-		</view>
-		<!-- 快递——自提 -->
-		<view class="_choose"
-			v-if="orderInfo.ProductOrder.status==0&&orderInfo.ProductOrder.is_pay==0 && orderInfo.ProductOrder.cancel_status==0">
-			<text>配送方式</text>
-			<view class="_fs" @click="toShowed">
-				<text>{{orderInfo.ProductOrder.delivery_method==0&&'快递到家'||orderInfo.ProductOrder.delivery_method==1&&'到店自取'}}</text>
-				<text class="iconfont icon-jiantou1"></text>
-				<u-action-sheet :list="list" v-model="toshowed" :tips="tips" border-radius="24"
-					:safe-area-inset-bottom="true" @click="chooseway"></u-action-sheet>
-			</view>
-		</view>
-		<!-- 收货地址 已添加地址 -->
-		<view class="head" v-if="isshow&&orderInfo.ProductOrder.status==0" @click="toChoose">
-			<view class="state">
-				<text>收货地址</text>
-				<view class="qh">
-					<view class="iconfont icon-jiantou1"></view>
-				</view>
-			</view>
-			<view class="name" @click="toChoose" v-if="!orderInfo.ProductOrder.address">
-				请先选择收货地址
-			</view>
-			<view class="name" @click="toChoose" v-if="orderInfo.ProductOrder.address">
-				{{JSON.parse(orderInfo.ProductOrder.address).name || '请先选择收货地址'}}
-				{{JSON.parse(orderInfo.ProductOrder.address).mobile || ''}}
-			</view>
-			<view class="choose_area" v-if="orderInfo.ProductOrder.address">
-				{{JSON.parse(orderInfo.ProductOrder.address).region || ''}}{{JSON.parse(orderInfo.ProductOrder.address).detail_address || ''}}
-			</view>
-		</view>
+  <view class="container safe-area-inset-bottom">
+    <!-- 物流提示信息 -->
+    <view class="order-text-tip" v-if="orderText">
+      <text>{{ orderText }}</text>
+    </view>
 
-		<!-- 到店自取 -->
-		<view class="head" v-if="isshowed">
-			<view class="state">
-				<text>到店自取</text>
-			</view>
-			<view class="name">
-				{{infoList.store.name}}
-				{{infoList.store.mobile}}
-			</view>
-			<view class="choose_area">
-				{{infoList.store.position}}
-			</view>
-		</view>
+    <view class="head_cancle" v-if="orderInfo.ProductOrder.status!=0  && orderInfo.ProductOrder.cancel_status==1">
+      订单已取消
+    </view>
+    <!-- 快递——自提 -->
+    <view class="_choose"
+          v-if="orderInfo.ProductOrder.status==0&&orderInfo.ProductOrder.is_pay==0 && orderInfo.ProductOrder.cancel_status==0">
+      <text>配送方式</text>
+      <view class="_fs" @click="toShowed">
+        <text>{{orderInfo.ProductOrder.delivery_method==0&&'快递到家'||orderInfo.ProductOrder.delivery_method==1&&'到店自取'}}</text>
+        <text class="iconfont icon-jiantou1"></text>
+        <u-action-sheet :list="list" v-model="toshowed" :tips="tips" border-radius="24"
+                        :safe-area-inset-bottom="true" @click="chooseway"></u-action-sheet>
+      </view>
+    </view>
+    <!-- 收货地址 已添加地址 -->
+    <view class="head" v-if="isshow&&orderInfo.ProductOrder.status==0" @click="toChoose">
+      <view class="state">
+        <text>收货地址</text>
+        <view class="qh">
+          <view class="iconfont icon-jiantou1"></view>
+        </view>
+      </view>
+      <view class="name" @click="toChoose" v-if="!orderInfo.ProductOrder.address">
+        请先选择收货地址
+      </view>
+      <view class="name" @click="toChoose" v-if="orderInfo.ProductOrder.address">
+        {{JSON.parse(orderInfo.ProductOrder.address).name || '请先选择收货地址'}}
+        {{JSON.parse(orderInfo.ProductOrder.address).mobile || ''}}
+      </view>
+      <view class="choose_area" v-if="orderInfo.ProductOrder.address">
+        {{JSON.parse(orderInfo.ProductOrder.address).region || ''}}{{JSON.parse(orderInfo.ProductOrder.address).detail_address || ''}}
+      </view>
+    </view>
 
-		<!-- 商品列表 -->
-		<view class="card">
-			<!-- 门店 -->
-			<view class="store"><text class="iconfont icon-mendian"></text>{{infoList.store.name}}</view>
+    <!-- 到店自取 -->
+    <view class="head" v-if="isshowed">
+      <view class="state">
+        <text>到店自取</text>
+      </view>
+      <view class="name">
+        {{infoList.store.name}}
+        {{infoList.store.mobile}}
+      </view>
+      <view class="choose_area">
+        {{infoList.store.position}}
+      </view>
+    </view>
 
-			<!-- <view class="list" v-if="chinese">
-				<view class="it_" v-for="(item,index) in chinese.list" :key="item.id">
-					<view class="it_name">{{item.name}}</view>
-					<view class="it_price">
-						<text>￥{{item.price}}</text>
-						<view class="it_num">
-							x{{item.number}}
-						</view>
-					</view>
-				</view>
-			</view> -->
+    <!-- 商品列表 -->
+    <view class="card">
+      <!-- 门店 -->
+      <view class="store"><text class="iconfont icon-mendian"></text>{{infoList.store.name}}</view>
 
-			<!-- granular -->
-			<view class="list"
-				v-if="orderInfo.ProductOrder.prescription_type==1||orderInfo.ProductOrder.prescription_type==3">
-				<view class="it_" v-for="(item,index) in orderInfo.ProductOrderItems" :key="item.id">
-					<view class="it_name">{{item.drug_name}}
-						<text class="it_num" style="margin-left: 8rpx;">x{{item.number}}</text>
-					</view>
-					<!-- <view class="it_price">
-						<text>￥{{item.price}}</text>
-						<view class="it_num">
-							x{{item.number}}
-						</view>
-					</view> -->
-				</view>
-			</view>
+      <!-- granular -->
+      <view class="list"
+            v-if="orderInfo.ProductOrder.prescription_type==1||orderInfo.ProductOrder.prescription_type==3">
+        <view class="it_" v-for="(item,index) in orderInfo.ProductOrderItems" :key="item.id">
+          <view class="it_name">{{item.drug_name}}
+            <text class="it_num" style="margin-left: 8rpx;">x{{item.number}}</text>
+          </view>
+        </view>
+      </view>
 
+      <view class="list_west" v-if="orderInfo.ProductOrder.prescription_type==2">
+        <view class="list" v-for="(item,index) in orderInfo.ProductOrderItems" :key="item.id">
+          <view class="img">
+            <image :src="item.drug_image || '/static/empty/gwc.png'" mode=""></image>
+          </view>
+          <view class="it">
+            <view class="it_name">{{item.drug_name}}{{item.drug.function}}</view>
+            <view class="it_info">
+              {{item.drug.usage}}
+            </view>
+            <view class="it_price">
+              <text>￥{{item.price}}</text>
+              <view class="it_num">
+                x{{item.number}}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
 
-			<view class="list_west" v-if="orderInfo.ProductOrder.prescription_type==2">
-				<view class="list" v-for="(item,index) in orderInfo.ProductOrderItems" :key="item.id">
-					<view class="img">
-						<image :src="item.drug_image || '/static/empty/gwc.png'" mode=""></image>
-					</view>
-					<view class="it">
-						<view class="it_name">{{item.drug_name}}{{item.drug.function}}</view>
-						<view class="it_info">
-							{{item.drug.usage}}
-						</view>
-						<view class="it_price">
-							<text>￥{{item.price}}</text>
-							<view class="it_num">
-								x{{item.number}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
+      <!-- 数量 -->
+      <view class="goods">
+        <view class="good_">
+          <text>商品总价</text>
+          <text class="price">￥{{orderInfo.ProductOrder.items_price}}</text>
+        </view>
+        <view class="good_">
+          <text>快递费</text>
+          <text class="price">￥{{orderInfo.ProductOrder.trans_expenses}}</text>
+        </view>
+        <view class="good_">
+          <text>诊疗费</text>
+          <text class="price">￥{{orderInfo.ProductOrder.treatement_price}}</text>
+        </view>
+        <view class="good_">
+          <text>加工费</text>
+          <view class="price"><text
+              v-if="payWay">共{{payWay.dosage}}剂</text>￥{{orderInfo.ProductOrder.process_price}}</view>
+        </view>
+        <view class="good_">
+          <text>总金额</text>
+          <view class="total">
+            合计:
+            <text class="price">￥{{orderInfo.ProductOrder.total_pay_price}}</text>
+          </view>
+        </view>
+        <view class="good_" v-if="orderInfo.ProductOrder&&orderInfo.ProductOrder.pay_time!='0'">
+          <text>支付时间</text>
+          <view class="price">
+            <text class="price">{{orderInfo.ProductOrder.pay_time | formatDate}}</text>
+          </view>
+        </view>
+      </view>
+    </view>
 
-			<!-- 数量 -->
-			<view class="goods">
-				<view class="good_">
-					<text>商品总价</text>
-					<text class="price">￥{{orderInfo.ProductOrder.items_price}}</text>
-				</view>
-				<view class="good_">
-					<text>快递费</text>
-					<text class="price">￥{{orderInfo.ProductOrder.trans_expenses}}</text>
-				</view>
-				<view class="good_">
-					<text>诊疗费</text>
-					<text class="price">￥{{orderInfo.ProductOrder.treatement_price}}</text>
-				</view>
-				<view class="good_">
-					<text>加工费</text>
-					<view class="price"><text
-							v-if="payWay">共{{payWay.dosage}}剂</text>￥{{orderInfo.ProductOrder.process_price}}</view>
-				</view>
-				<view class="good_">
-					<!-- 共{{orderInfo.ProductOrder.count}}件 -->
-					<text>总金额</text>
-					<view class="total">
-						合计:
-						<text class="price">￥{{orderInfo.ProductOrder.total_pay_price}}</text>
-					</view>
-				</view>
-				<view class="good_" v-if="orderInfo.ProductOrder&&orderInfo.ProductOrder.pay_time!='0'">
-					<text>支付时间</text>
-					<view class="price">
-						<text class="price">{{orderInfo.ProductOrder.pay_time | formatDate}}</text>
-					</view>
-				</view>
-			</view>
-		</view>
+    <!-- 代煎服务提醒 -->
+    <view class="umode">
+      <u-modal v-model="openshow" title="服务提示" :content="content" @confirm="confirm" @cancel="cancel"
+               :content-style="{color:'#666666',fontSize: '28rpx'}"
+               :title-style="{color:'#111000',fontWeight: '540',fontSize: '33rpx'}" :show-title="true"
+               :show-cancel-button="true" confirm-text="我需要" cancel-text="不需要" cancel-color="#F44336"
+               confirm-color="#536DFE"></u-modal>
+    </view>
 
-		<!-- 提醒 -->
-		<view class="umode">
-			<u-modal v-model="openshow" title="服务提示" :content="content" @confirm="confirm" @cancel="cancel"
-				:content-style="{color:'#666666',fontSize: '28rpx'}"
-				:title-style="{color:'#111000',fontWeight: '540',fontSize: '33rpx'}" :show-title="true"
-				:show-cancel-button="true" confirm-text="我需要" cancel-text="不需要" cancel-color="#F44336"
-				confirm-color="#536DFE"></u-modal>
-		</view>
+    <!-- 物流提示模态框 -->
+    <view class="umode">
+      <u-modal
+          v-model="showOrderTextModal"
+          title="温馨提示"
+          :content="modalContent"
+          :confirm-text="modalConfirmText"
+          :cancel-text="modalCancelText"
+          :show-cancel-button="showCancelButton"
+          :confirm-color="modalConfirmColor"
+          :cancel-color="modalCancelColor"
+          @confirm="handleOrderTextConfirm"
+          @cancel="handleOrderTextCancel"
+          :content-style="modalContentStyle"
+          :title-style="modalTitleStyle"
+      ></u-modal>
+    </view>
 
-
-		<!-- 底部  -->
-		<view class="footer"
-			v-if="orderInfo.ProductOrder.status==0 && orderInfo.ProductOrder.is_pay==0 && orderInfo.ProductOrder.cancel_status==0">
-			<button class="to_pay" @click="toPay">立即支付</button>
-		</view>
-		<u-toast ref="uToast" />
-	</view>
+    <!-- 底部  -->
+    <view class="footer"
+          v-if="orderInfo.ProductOrder.status==0 && orderInfo.ProductOrder.is_pay==0 && orderInfo.ProductOrder.cancel_status==0">
+      <button class="to_pay" @click="toPay">立即支付</button>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
 </template>
 
 <script>
-	import {
-		getaddressList,
-		getDelivery,
-		getPayConfig,
-		getOrdDetail,
-		getUpdateUseWay,
-		getUseWayPay,
-		storeInfo,
-	} from '../../../request/api/api'
-	export default {
-		data() {
-			return {
-				isshow: true,
-				isshowed: false,
-				show: false,
-				form: {
-					check: false
-				},
-				orderInfo: {
-					ProductOrder: {}
-				}, // 订单
-				chinese: [],
-				west: [],
-				granular: [],
-				actionList: [],
-				order_id: "", // 订单id
-				order_no: "", // 订单编号
-				p_id: "", // 处方id
-				orderType: 0, // 处方id
-				list: [{
-					text: '快递到家'
-				}, {
-					text: '到店自取'
-				}],
-				toshowed: false,
-				tips: {
-					text: '配送方式',
-					color: '#111111',
-					fontSize: 38
-				},
-				wayText: "快递到家",
-				delivery_method: 0, // 快递方式 0 快递   1 自提
-				content: '', // 弹窗内容
-				openshow: false, // 弹窗是否展示
-				is_decoct: 1, // 代煎服务  1确定代煎  0不代煎
-				infoList: [], // 门店信息
-				payWay: "",
-				flag: true,
-				timer: '',
-			}
-		},
-		onLoad(e) {
-			this.p_id = e.id
-			this.orderType = e.order_type
-		},
-		methods: {
-			// 不需要代煎-代煎费
-			cancel() {
-				this.openshow = false;
-				this.is_decoct = 0
-				this.getUpuseWay()
-			},
-			// 需要代煎
-			confirm() {
-				this.is_decoct = 1
-				this.getUpuseWay()
-			},
-			// 更新代煎服务
-			getUpuseWay() {
-				getUpdateUseWay({
-					method: "post",
-					data: {
-						is_decoct: this.is_decoct,
-						order_id: this.order_id,
-						store_id: uni.getStorageSync('store_id') || '11001'
-					}
-				}).then((res) => {
-					if (res.data.errcode == 0) {
-						this.getInfo()
-						// console.log(res, '确定代煎');
-					}
-				})
-			},
-			toShowed() {
-				this.toshowed = true
-			},
-			chooseway(index) {
-				// this.wayText = this.list[index].text
-				this.delivery_method = index
+import {
+  getaddressList,
+  getDelivery,
+  getPayConfig,
+  getOrdDetail,
+  getUpdateUseWay,
+  getUseWayPay,
+  storeInfo,
+} from '../../../request/api/api'
 
-				if (index == 1) {
-					this.isshowed = true
-					this.isshow = false
-					this.toUpdata()
-				} else {
-					this.isshowed = false
-					this.isshow = true
-					this.toChoose()
-				}
-				// console.log(`点击了第${index + 1}项，内容为：${this.list[index].text}`)
-			},
-			// 更新配送方式
-			toUpdata() {
-				if (!this.order_id) return
-				getDelivery({
-					method: "post",
-					data: {
-						address_id: uni.getStorageSync('address_id'),
-						delivery_method: this.delivery_method,
-						order_id: this.order_id,
-						store_id: uni.getStorageSync('store_id') || '11001'
-					}
-				}).then((res) => {
-					if (res.data.errcode == 0) {
-						this.getInfo()
-						// console.log(res, '确定代煎');
-					}
-				})
-			},
-			// 门店信息
-			getStoreInfo() {
-				storeInfo({
-					method: "post",
-					data: {
-						store_id: uni.getStorageSync('store_id') || '11001',
-					}
-				}).then((res) => {
-					// console.log(res, 'info');
-					if (res.data.errcode == 0) {
-						this.infoList = res.data.data
-					}
-				})
-			},
-			toForm() {
-				this.form['check'] = !this.form['check']
-			},
+// 导入 getOrderTextApi 接口方法
+import { getOrderTextApi } from '../../../request/api/product'
 
-			// 产品信息
-			getInfo() {
-				let list = {
-					store_id: uni.getStorageSync('store_id') || '11001',
-					order_id: this.p_id
-				}
-				getOrdDetail({
-					method: "post",
-					data: list
-				}).then((res) => {
-					// console.log(res, 'info');
-					if (res.data.errcode == 0) {
-						console.log(res.data, 'res.data')
-						this.orderInfo = res.data.data
-						// this.chinese = res.data.data.chinese
-						// this.west = res.data.data.west
-						// this.granular = res.data.data.granular
-						this.order_id = res.data.data.ProductOrder.id
-						uni.setStorageSync('userWay_order_id', res.data.data.ProductOrder.id)
-						uni.setStorageSync('delivery_method', res.data.data.ProductOrder.delivery_method)
-						// this.order_no = res.data.data.ProductOrder.order_no
-						// console.log(this.west.content);
+export default {
+  data() {
+    return {
+      isshow: true,
+      isshowed: false,
+      show: false,
+      form: {
+        check: false
+      },
+      orderInfo: {
+        ProductOrder: {}
+      }, // 订单
+      chinese: [],
+      west: [],
+      granular: [],
+      actionList: [],
+      order_id: "", // 订单id
+      order_no: "", // 订单编号
+      p_id: "", // 处方id
+      orderType: 0, // 处方id
+      list: [{
+        text: '快递到家'
+      }, {
+        text: '到店自取'
+      }],
+      toshowed: false,
+      tips: {
+        text: '配送方式',
+        color: '#111111',
+        fontSize: 38
+      },
+      wayText: "快递到家",
+      delivery_method: 0, // 快递方式 0 快递   1 自提
+      content: '', // 弹窗内容
+      openshow: false, // 弹窗是否展示
+      is_decoct: 1, // 代煎服务  1确定代煎  0不代煎
+      infoList: [], // 门店信息
+      payWay: "",
+      flag: true,
+      timer: '',
+      // 新增：物流提示信息
+      orderText: '本次商品物流配送，由萧康医药提供服务。',
+      // 新增：物流提示模态框控制
+      showOrderTextModal: false,
+      // 新增：模态框配置
+      modalContent: '',
+      modalConfirmText: '我知道了',
+      modalCancelText: '取消支付',
+      showCancelButton: true,
+      modalConfirmColor: '#536DFE',
+      modalCancelColor: '#F44336',
+      modalContentStyle: {
+        color: '#666666',
+        fontSize: '28rpx',
+        maxHeight: '300rpx',
+        overflow: 'auto'
+      },
+      modalTitleStyle: {
+        color: '#111000',
+        fontWeight: '540',
+        fontSize: '33rpx'
+      },
+    }
+  },
+  onLoad(e) {
+    this.p_id = e.id
+    this.orderType = e.order_type
+    // 获取订单提示文本
+    this.getOrderText();
+  },
+  methods: {
+    // 获取订单提示文本
+    getOrderText() {
+      getOrderTextApi().then((res) => {
+        if (res.data && res.data.result) {
+          this.orderText = res.data.result;
+          // 设置模态框内容
+          this.modalContent = `${res.data.result}\n\n请在确认以上信息后继续支付。`;
+        }
+      }).catch(err => {
+        console.error('获取订单提示失败:', err);
+      })
+    },
+    // 不需要代煎-代煎费
+    cancel() {
+      this.openshow = false;
+      this.is_decoct = 0
+      this.getUpuseWay()
+    },
+    // 需要代煎
+    confirm() {
+      this.is_decoct = 1
+      this.getUpuseWay()
+    },
+    // 物流提示确认 - 用户选择"我知道了"
+    handleOrderTextConfirm() {
+      this.showOrderTextModal = false;
+      // 用户点击"我知道了"后，继续执行支付
+      this.doPay();
+    },
+    // 物流提示取消 - 用户选择"取消支付"
+    handleOrderTextCancel() {
+      this.showOrderTextModal = false;
+      // 用户选择取消支付，显示提示信息
+      uni.showToast({
+        title: '您已取消支付',
+        icon: 'none',
+        duration: 2000
+      });
+      // 可选：跳转到其他页面或执行其他操作
+      // uni.navigateBack({
+      // 	delta: 1
+      // });
+    },
+    // 更新代煎服务
+    getUpuseWay() {
+      getUpdateUseWay({
+        method: "post",
+        data: {
+          is_decoct: this.is_decoct,
+          order_id: this.order_id,
+          store_id: uni.getStorageSync('store_id') || '11001'
+        }
+      }).then((res) => {
+        if (res.data.errcode == 0) {
+          this.getInfo()
+        }
+      })
+    },
+    toShowed() {
+      this.toshowed = true
+    },
+    chooseway(index) {
+      this.delivery_method = index
 
-            if (res.data.data.ProductOrder.delivery_method == 1) {
-              this.isshowed = true
-              this.isshow = false
-            } else {
-              this.isshowed = false
-              this.isshow = true
+      if (index == 1) {
+        this.isshowed = true
+        this.isshow = false
+        this.toUpdata()
+      } else {
+        this.isshowed = false
+        this.isshow = true
+        this.toChoose()
+      }
+    },
+    // 更新配送方式
+    toUpdata() {
+      if (!this.order_id) return
+      getDelivery({
+        method: "post",
+        data: {
+          address_id: uni.getStorageSync('address_id'),
+          delivery_method: this.delivery_method,
+          order_id: this.order_id,
+          store_id: uni.getStorageSync('store_id') || '11001'
+        }
+      }).then((res) => {
+        if (res.data.errcode == 0) {
+          this.getInfo()
+        }
+      })
+    },
+    // 门店信息
+    getStoreInfo() {
+      storeInfo({
+        method: "post",
+        data: {
+          store_id: uni.getStorageSync('store_id') || '11001',
+        }
+      }).then((res) => {
+        if (res.data.errcode == 0) {
+          this.infoList = res.data.data
+        }
+      })
+    },
+    toForm() {
+      this.form['check'] = !this.form['check']
+    },
+
+    // 产品信息
+    getInfo() {
+      let list = {
+        store_id: uni.getStorageSync('store_id') || '11001',
+        order_id: this.p_id
+      }
+      getOrdDetail({
+        method: "post",
+        data: list
+      }).then((res) => {
+        if (res.data.errcode == 0) {
+          this.orderInfo = res.data.data
+          this.order_id = res.data.data.ProductOrder.id
+          uni.setStorageSync('userWay_order_id', res.data.data.ProductOrder.id)
+          uni.setStorageSync('delivery_method', res.data.data.ProductOrder.delivery_method)
+
+          if (res.data.data.ProductOrder.delivery_method == 1) {
+            this.isshowed = true
+            this.isshow = false
+          } else {
+            this.isshowed = false
+            this.isshow = true
+          }
+        }
+      })
+    },
+    // 代煎费
+    getServe() {
+      getUseWayPay({
+        method: "post",
+        data: {
+          order_id: uni.getStorageSync('userWay_order_id'),
+          store_id: uni.getStorageSync('store_id') || '11001'
+        }
+      }).then((res) => {
+        if (res.data.errcode == 0) {
+          if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+          }
+          this.payWay = res.data.data
+          this.content =
+              `平台可以为您提供有偿代煎服务（${this.payWay.decoct_price}元/剂）您的处方共${this.payWay.dosage}剂， 费用${this.payWay.total_decoct_price}元。 您是否需要？`
+        } else {
+          if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+          }
+        }
+      })
+    },
+    // 地址列表
+    getList() {
+      getaddressList({
+        method: "post",
+        data: {
+          store_id: uni.getStorageSync('store_id') || '11001',
+        }
+      }).then((res) => {
+        if (res.data.errcode == 0) {
+          this.actionList = res.data.data
+        }
+      })
+
+      this.toUpdata()
+    },
+    // 地址
+    toChoose() {
+      uni.navigateTo({
+        url: '/subPackages/setup/area-list?id=' + this.p_id + '&order_id=' + this.order_id
+      })
+    },
+
+    // 支付
+    toPay() {
+      if (this.form['check']) {
+        uni.showToast({
+          icon: "error",
+          title: '请勾选协议'
+        })
+        return
+      }
+
+      // 先显示物流提示模态框
+      this.showOrderTextModal = true;
+    },
+
+    // 实际支付逻辑
+    doPay() {
+      let that = this
+      if (this.flag) {
+        this.flag = false
+        // 获取支付配置
+        getPayConfig({
+          method: "post",
+          data: {
+            order_id: this.order_id,
+            store_id: uni.getStorageSync('store_id') || '11001',
+          }
+        }).then((res) => {
+          console.log(res.data.data.timeStamp, 'pay');
+          uni.showLoading({
+            title: "加载中"
+          });
+
+          if (res.data.errcode == 0) {
+            if (!res.data.data.appId) {
+              setTimeout(() => {
+                that.flag = false
+                uni.navigateTo({
+                  url: '/subPackages/my/my-drug/drug-list'
+                })
+                uni.hideLoading();
+              }, 300)
+              return;
             }
-					}
-				})
-			},
-			// 代煎费
-			getServe() {
-				getUseWayPay({
-					method: "post",
-					data: {
-						order_id: uni.getStorageSync('userWay_order_id'),
-						store_id: uni.getStorageSync('store_id') || '11001'
-					}
-				}).then((res) => {
-					if (res.data.errcode == 0) {
-						if (this.timer) { //注销定时器
-							// console.log('注销定时器')
-							clearTimeout(this.timer);
-							this.timer = null;
-						}
-						this.payWay = res.data.data
-						this.content =
-							`平台可以为您提供有偿代煎服务（${this.payWay.decoct_price}元/剂）您的处方共${this.payWay.dosage}剂， 费用${this.payWay.total_decoct_price}元。 您是否需要？`
-						// console.log(this.payWay, 'way');
 
-						// setTimeout(() => {
-						// 	this.openshow = true;
-						// }, 500)
-					} else {
-						if (this.timer) { //注销定时器
-							// console.log('注销定时器')
-							clearTimeout(this.timer);
-							this.timer = null;
-						}
-					}
-				})
-			},
-			// 地址列表
-			getList() {
-				getaddressList({
-					method: "post",
-					data: {
-						store_id: uni.getStorageSync('store_id') || '11001',
-					}
-				}).then((res) => {
-					// console.log(res, 'list');
-					if (res.data.errcode == 0) {
-						this.actionList = res.data.data
-					}
-				})
-
-				this.toUpdata()
-			},
-			// 地址
-			toChoose() {
-        // if (this.orderType === 2) {
-        //   return;
-        // }
-				uni.navigateTo({
-					url: '/subPackages/setup/area-list?id=' + this.p_id + '&order_id=' + this.order_id
-				})
-			},
-
-			// 支付
-			toPay() {
-				if (this.form['check']) {
-					uni.showToast({
-						icon: "error",
-						title: '请勾选协议'
-					})
-					return
-				}
-				let that = this
-				if (this.flag) {
-					this.flag = false
-					// 获取支付配置
-					getPayConfig({
-						method: "post",
-						data: {
-							order_id: this.order_id,
-							store_id: uni.getStorageSync('store_id') || '11001',
-						}
-					}).then((res) => {
-						console.log(res.data.data.timeStamp, 'pay');
-						uni.showLoading({
-							title: "加载中"
-						});
-
-						if (res.data.errcode == 0) {
-              if (!res.data.data.appId) {
+            uni.requestPayment({
+              provider: res.data.data.appId,
+              timeStamp: res.data.data.timestamp,
+              nonceStr: res.data.data.nonceStr,
+              package: res.data.data.package,
+              signType: res.data.data.signType,
+              paySign: res.data.data.paySign,
+              success: (res) => {
+                console.log('success:' + JSON.stringify(res));
                 setTimeout(() => {
                   that.flag = false
                   uni.navigateTo({
@@ -420,487 +485,473 @@
                   })
                   uni.hideLoading();
                 }, 300)
-                return;
+              },
+              fail: function(err) {
+                that.flag = false
+                console.log('fail:' + JSON.stringify(err));
+                uni.hideLoading();
+                uni.showToast({
+                  title: '支付失败',
+                  duration: 1500,
+                  mask: false,
+                  icon: 'error'
+                })
+                setTimeout(() => {
+                  if (res.data.msg) {
+                    uni.showToast({
+                      title: res.data.msg,
+                      duration: 1500,
+                      mask: false,
+                      icon: 'error'
+                    })
+                    return
+                  }
+                }, 1000)
               }
+            })
+          } else {
+            uni.hideLoading();
+            this.$refs.uToast.show({
+              title: res.data.msg,
+              type: 'default',
+              icon: false
+            })
+          }
 
-							uni.requestPayment({
-								provider: res.data.data.appId,
-								timeStamp: res.data.data.timestamp,
-								nonceStr: res.data.data.nonceStr,
-								package: res.data.data.package,
-								signType: res.data.data.signType,
-								paySign: res.data.data.paySign,
-								success: (res) => {
-									console.log('success:' + JSON.stringify(res));
-									setTimeout(() => {
-										that.flag = false
-										uni.navigateTo({
-											url: '/subPackages/my/my-drug/drug-list'
-										})
-										uni.hideLoading();
-									}, 300)
-								},
-								fail: function(err) {
-									that.flag = false
-									console.log('fail:' + JSON.stringify(err));
-									uni.hideLoading();
-									uni.showToast({
-										title: '支付失败',
-										duration: 1500,
-										mask: false,
-										icon: 'error'
-									})
-									setTimeout(() => {
-										if (res.data.msg) {
-											uni.showToast({
-												title: res.data.msg,
-												duration: 1500,
-												mask: false,
-												icon: 'error'
-											})
-											return
-										}
-									}, 1000)
-								}
-							})
-						} else {
-							uni.hideLoading();
-							this.$refs.uToast.show({
-								title: res.data.msg,
-								type: 'default',
-								icon: false
-							})
-						}
+        })
 
-					})
-
-				}
-			}
-		},
-		mounted() {
-			this.getStoreInfo()
-			const order_id = uni.getStorageSync('userWay_order_id')
-			// if (order_id) {
-			// 	this.getServe()
-			// } else {
-			// 	this.timer = setInterval(() => {
-			// 		this.getServe()
-			// 	}, 500)
-			// }
-			const delivery_method = uni.getStorageSync('delivery_method')
-			if (delivery_method == 1) {
-				this.isshowed = true
-				this.isshow = false
-			} else {
-				this.isshowed = false
-				this.isshow = true
-			}
-		},
-		onShow() {
-			this.getInfo()
-			this.getList()
-		},
-		onUnload() {
-			uni.removeStorageSync('userWay_order_id')
-		}
-	}
+      }
+    }
+  },
+  mounted() {
+    this.getStoreInfo()
+    const order_id = uni.getStorageSync('userWay_order_id')
+    const delivery_method = uni.getStorageSync('delivery_method')
+    if (delivery_method == 1) {
+      this.isshowed = true
+      this.isshow = false
+    } else {
+      this.isshowed = false
+      this.isshow = true
+    }
+  },
+  onShow() {
+    this.getInfo()
+    this.getList()
+  },
+  onUnload() {
+    uni.removeStorageSync('userWay_order_id')
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		width: 750rpx;
-		max-height: 100%;
-		min-height: 100vh;
-		padding-bottom: env(safe-area-inset-bottom);
-		background: #F5F5F5;
+.container {
+  width: 750rpx;
+  max-height: 100%;
+  min-height: 100vh;
+  padding-bottom: env(safe-area-inset-bottom);
+  background: #F5F5F5;
 
-		.head_cancle {
-			padding: 20rpx 42rpx;
-			font-size: 32rpx;
-			font-weight: 500;
-			color: #222;
-		}
+  /* 新增：物流提示样式 */
+  .order-text-tip {
+    background: #e6f3ff;
+    padding: 20rpx 30rpx;
+    margin: 20rpx 20rpx 0 20rpx;
+    border-radius: 8rpx;
+    font-size: 26rpx;
+    color: #1890ff;
+    line-height: 1.4;
+    border-left: 6rpx solid #1890ff;
+  }
 
-		.agreen {
-			padding: 60rpx 50rpx 20rpx;
-			// color: #6C7380;
-			// letter-spacing: 2rpx;
+  .head_cancle {
+    padding: 20rpx 42rpx;
+    font-size: 32rpx;
+    font-weight: 500;
+    color: #222;
+  }
 
-			.top {
-				margin: 0 0 20rpx 0;
-				font-family: PingFang SC-Regular, PingFang SC;
-				text-align: center;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #222;
-			}
-		}
+  .agreen {
+    padding: 60rpx 50rpx 20rpx;
+    // color: #6C7380;
+    // letter-spacing: 2rpx;
 
-		.umode {
-			font-size: 36rpx;
-			font-family: PingFang SC-Bold, PingFang SC;
-			font-weight: bold;
-			color: #232323;
-			text-align: center;
+    .top {
+      margin: 0 0 20rpx 0;
+      font-family: PingFang SC-Regular, PingFang SC;
+      text-align: center;
+      font-size: 32rpx;
+      font-weight: 500;
+      color: #222;
+    }
+  }
 
-			text {
-				font-size: 24rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
-				font-weight: 400;
-				color: #999999;
-			}
-		}
+  .umode {
+    font-size: 36rpx;
+    font-family: PingFang SC-Bold, PingFang SC;
+    font-weight: bold;
+    color: #232323;
+    text-align: center;
 
-		.p_state {
-			width: 750rpx;
-			height: 160rpx;
-			background: #536DFE;
-			margin: 20rpx auto;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 40rpx;
+    text {
+      font-size: 24rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #999999;
+    }
+  }
 
-			.state {
-				font-family: PingFang SC-Bold, PingFang SC;
-				display: flex;
-				flex-direction: column;
+  .p_state {
+    width: 750rpx;
+    height: 160rpx;
+    background: #536DFE;
+    margin: 20rpx auto;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 40rpx;
 
-				text {
-					font-size: 36rpx;
-					font-family: PingFang SC-Bold, PingFang SC;
-					font-weight: bold;
-					color: #FFFFFF;
-				}
+    .state {
+      font-family: PingFang SC-Bold, PingFang SC;
+      display: flex;
+      flex-direction: column;
 
-				.notice {
-					font-size: 24rpx;
-					font-weight: 400;
-					margin-top: 12rpx;
-				}
-			}
+      text {
+        font-size: 36rpx;
+        font-family: PingFang SC-Bold, PingFang SC;
+        font-weight: bold;
+        color: #FFFFFF;
+      }
 
-			.iconfont {
-				font-size: 52rpx;
-				color: #fff;
-			}
-		}
+      .notice {
+        font-size: 24rpx;
+        font-weight: 400;
+        margin-top: 12rpx;
+      }
+    }
 
-		._choose {
-			width: 750rpx;
-			height: 88rpx;
-			margin: 0rpx auto;
-			background: #fff;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 40rpx;
+    .iconfont {
+      font-size: 52rpx;
+      color: #fff;
+    }
+  }
 
-			._fs {
-				display: flex;
-				align-items: center;
+  ._choose {
+    width: 750rpx;
+    height: 88rpx;
+    margin: 0rpx auto;
+    background: #fff;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 40rpx;
 
-				.iconfont {
-					font-size: 32rpx;
-					margin-left: 16rpx;
-					color: #222333;
-				}
-			}
-		}
+    ._fs {
+      display: flex;
+      align-items: center;
 
-		.head {
-			width: 750rpx;
-			height: 168rpx;
-			margin: 20rpx auto;
-			background: #fff;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			padding: 0 40rpx;
+      .iconfont {
+        font-size: 32rpx;
+        margin-left: 16rpx;
+        color: #222333;
+      }
+    }
+  }
 
-			.state {
-				font-size: 28rpx;
-				font-family: PingFang SC-Bold, PingFang SC;
-				font-weight: bold;
-				color: #232323;
-				line-height: 0rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+  .head {
+    width: 750rpx;
+    height: 168rpx;
+    margin: 20rpx auto;
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    padding: 0 40rpx;
 
-				text {
-					display: inline-block;
-					width: 116rpx;
-					height: 38rpx;
-					line-height: 38rpx;
-					text-align: center;
-					background: #536DFE;
-					border-radius: 30rpx 30rpx 30rpx 30rpx;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					margin-right: 14rpx;
-				}
+    .state {
+      font-size: 28rpx;
+      font-family: PingFang SC-Bold, PingFang SC;
+      font-weight: bold;
+      color: #232323;
+      line-height: 0rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
 
-				.qh {
-					display: flex;
-					align-items: center;
+      text {
+        display: inline-block;
+        width: 116rpx;
+        height: 38rpx;
+        line-height: 38rpx;
+        text-align: center;
+        background: #536DFE;
+        border-radius: 30rpx 30rpx 30rpx 30rpx;
+        font-size: 20rpx;
+        color: #FFFFFF;
+        margin-right: 14rpx;
+      }
 
-					.iconfont {
-						font-size: 28rpx;
-						margin-left: 16rpx;
-					}
-				}
-			}
+      .qh {
+        display: flex;
+        align-items: center;
 
-			.name {
-				font-size: 28rpx;
-				font-family: PingFang SC-Bold, PingFang SC;
-				font-weight: bold;
-				color: #232323;
-				margin: 10rpx 0;
-			}
+        .iconfont {
+          font-size: 28rpx;
+          margin-left: 16rpx;
+        }
+      }
+    }
 
-			.choose_area {
-				font-size: 24rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
-				font-weight: 400;
-				color: #232323;
-			}
-		}
+    .name {
+      font-size: 28rpx;
+      font-family: PingFang SC-Bold, PingFang SC;
+      font-weight: bold;
+      color: #232323;
+      margin: 10rpx 0;
+    }
 
-		.card {
-			width: 750rpx;
-			margin: 0 auto;
-			padding: 20rpx 12rpx 0rpx 20rpx;
-			background: #FFFFFF;
+    .choose_area {
+      font-size: 24rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #232323;
+    }
+  }
 
-			.store {
-				font-size: 28rpx;
-				font-family: PingFang SC-Regular, PingFang SC;
-				font-weight: 500;
-				color: #232323;
-				margin-left: 20rpx;
-				padding: 10rpx 0;
+  .card {
+    width: 750rpx;
+    margin: 0 auto;
+    padding: 20rpx 12rpx 0rpx 20rpx;
+    background: #FFFFFF;
 
-				.iconfont {
-					font-size: 39rpx;
-					color: #666666;
-					vertical-align: middle;
-					margin-right: 10rpx;
-				}
+    .store {
+      font-size: 28rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 500;
+      color: #232323;
+      margin-left: 20rpx;
+      padding: 10rpx 0;
 
-			}
+      .iconfont {
+        font-size: 39rpx;
+        color: #666666;
+        vertical-align: middle;
+        margin-right: 10rpx;
+      }
 
-			.list_west {
+    }
 
-				.list {
-					display: flex;
-					justify-content: space-around;
-					width: 100%;
-					padding: 32rpx;
-					display: flex;
-					align-items: center;
+    .list_west {
 
-					.img {
-						width: 200rpx;
-						height: 200rpx;
-						margin-right: 10rpx;
+      .list {
+        display: flex;
+        justify-content: space-around;
+        width: 100%;
+        padding: 32rpx;
+        display: flex;
+        align-items: center;
 
-						image {
-							width: 200rpx;
-							height: 200rpx;
-							border-radius: 8rpx;
-						}
-					}
+        .img {
+          width: 200rpx;
+          height: 200rpx;
+          margin-right: 10rpx;
 
-					.it {
-						flex: 1;
-						padding: 16rpx 10rpx;
-						font-family: PingFang SC-Bold, PingFang SC;
-						margin: 10rpx;
+          image {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 8rpx;
+          }
+        }
 
-						.it_name {
-							font-weight: bold;
-							color: #232323;
-							margin-bottom: 10rpx;
-							display: -webkit-box;
-							-webkit-line-clamp: 1;
-							-webkit-box-orient: vertical;
-							text-overflow: ellipsis;
-							overflow: hidden;
-							margin-bottom: 20rpx;
-						}
+        .it {
+          flex: 1;
+          padding: 16rpx 10rpx;
+          font-family: PingFang SC-Bold, PingFang SC;
+          margin: 10rpx;
 
-						.it_info {
-							display: -webkit-box;
-							-webkit-line-clamp: 1;
-							-webkit-box-orient: vertical;
-							text-overflow: ellipsis;
-							overflow: hidden;
-							margin-bottom: 20rpx;
-						}
+          .it_name {
+            font-weight: bold;
+            color: #232323;
+            margin-bottom: 10rpx;
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            margin-bottom: 20rpx;
+          }
 
-						.it_price {
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
+          .it_info {
+            display: -webkit-box;
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            margin-bottom: 20rpx;
+          }
 
-							text {
-								font-size: 28rpx;
-								font-weight: bold;
-								color: #232323;
-							}
-						}
+          .it_price {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
 
-					}
-				}
+            text {
+              font-size: 28rpx;
+              font-weight: bold;
+              color: #232323;
+            }
+          }
 
-			}
+        }
+      }
 
-			.list {
-				width: 100%;
-				padding: 12rpx 12rpx;
-				display: flex;
-				flex-wrap: wrap;
+    }
+
+    .list {
+      width: 100%;
+      padding: 12rpx 12rpx;
+      display: flex;
+      flex-wrap: wrap;
 
 
-				.it_ {
-					width: 30%;
-					padding: 16rpx 10rpx;
-					font-family: PingFang SC-Bold, PingFang SC;
-					margin: 0 10rpx 10rpx 0;
+      .it_ {
+        width: 30%;
+        padding: 16rpx 10rpx;
+        font-family: PingFang SC-Bold, PingFang SC;
+        margin: 0 10rpx 10rpx 0;
 
-					.it_name {
-						font-weight: bold;
-						color: #232323;
-						margin-bottom: 10rpx;
-						display: -webkit-box;
-						-webkit-line-clamp: 1;
-						-webkit-box-orient: vertical;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						padding-left: 5rpx;
-					}
+        .it_name {
+          font-weight: bold;
+          color: #232323;
+          margin-bottom: 10rpx;
+          display: -webkit-box;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          padding-left: 5rpx;
+        }
 
-					.it_price {
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
+        .it_price {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
 
-						text {
-							font-size: 28rpx;
-							font-weight: bold;
-							color: #999999;
-						}
-					}
+          text {
+            font-size: 28rpx;
+            font-weight: bold;
+            color: #999999;
+          }
+        }
 
-					.it_num {
-						color: #999999;
-					}
-				}
-			}
+        .it_num {
+          color: #999999;
+        }
+      }
+    }
 
-			.goods {
-				margin-top: 20rpx;
-				padding: 0 30rpx 10rpx;
-				margin-bottom: 140rpx;
+    .goods {
+      margin-top: 20rpx;
+      padding: 0 30rpx 10rpx;
+      margin-bottom: 140rpx;
 
-				.good_ {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					height: 88rpx;
+      .good_ {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 88rpx;
 
-					text {
-						font-size: 28rpx;
-						font-family: PingFang SC-Bold, PingFang SC;
-						font-weight: bold;
-						color: #232323;
-					}
+        text {
+          font-size: 28rpx;
+          font-family: PingFang SC-Bold, PingFang SC;
+          font-weight: bold;
+          color: #232323;
+        }
 
-					.total {
-						font-size: 26rpx;
-						font-family: PingFang SC-Regular, PingFang SC;
-						font-weight: 400;
-						color: #666666;
+        .total {
+          font-size: 26rpx;
+          font-family: PingFang SC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #666666;
 
-						.price {
-							font-size: 34rpx;
-							font-weight: 500;
-						}
-					}
+          .price {
+            font-size: 34rpx;
+            font-weight: 500;
+          }
+        }
 
-					.price {
-						font-size: 28rpx;
-						font-family: PingFang SC-Regular, PingFang SC;
-						font-weight: 400;
-						color: #666666;
-					}
-				}
-			}
-		}
+        .price {
+          font-size: 28rpx;
+          font-family: PingFang SC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #666666;
+        }
+      }
+    }
+  }
 
-		.infos {
-			width: 750rpx;
-			margin: 20rpx auto 160rpx;
-			padding: 20rpx 32rpx;
-			background: #FFFFFF;
+  .infos {
+    width: 750rpx;
+    margin: 20rpx auto 160rpx;
+    padding: 20rpx 32rpx;
+    background: #FFFFFF;
 
 
-			.title {
-				height: 44rpx;
-				font-size: 32rpx;
-				font-family: PingFang SC-Bold, PingFang SC;
-				font-weight: bold;
-				color: #232323;
-				line-height: 44rpx;
-			}
+    .title {
+      height: 44rpx;
+      font-size: 32rpx;
+      font-family: PingFang SC-Bold, PingFang SC;
+      font-weight: bold;
+      color: #232323;
+      line-height: 44rpx;
+    }
 
-			._info {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin: 18rpx 0;
+    ._info {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 18rpx 0;
 
-				text {
-					font-size: 28rpx;
-					font-family: PingFang SC-Regular, PingFang SC;
-					font-weight: 400;
-					color: #999999;
-				}
+      text {
+        font-size: 28rpx;
+        font-family: PingFang SC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #999999;
+      }
 
-				.info {
-					font-size: 28rpx;
-					font-family: PingFang SC-Regular, PingFang SC;
-					font-weight: 400;
-					color: #232323;
-				}
-			}
-		}
+      .info {
+        font-size: 28rpx;
+        font-family: PingFang SC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #232323;
+      }
+    }
+  }
 
-		.footer {
-			width: 750rpx;
-			height: 114rpx;
-			position: fixed;
-			left: 0;
-			bottom: env(safe-area-inset-bottom);
-			display: flex;
-			align-items: center;
-			padding: 0rpx 24rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC-Regular, PingFang SC;
-			font-weight: 400;
+  .footer {
+    width: 750rpx;
+    height: 114rpx;
+    position: fixed;
+    left: 0;
+    bottom: env(safe-area-inset-bottom);
+    display: flex;
+    align-items: center;
+    padding: 0rpx 24rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
 
-			.to_pay {
-				width: 690rpx;
-				height: 84rpx;
-				line-height: 84rpx;
-				background: #536DFE;
-				border-radius: 64rpx;
-				color: #FFFFFF;
-				text-align: center;
-			}
-		}
+    .to_pay {
+      width: 690rpx;
+      height: 84rpx;
+      line-height: 84rpx;
+      background: #536DFE;
+      border-radius: 64rpx;
+      color: #FFFFFF;
+      text-align: center;
+    }
+  }
 
-	}
+}
 </style>
\ No newline at end of file
diff --git a/subPackages/product/product.vue b/subPackages/product/product.vue
index 16f0485..9f579b0 100644
--- a/subPackages/product/product.vue
+++ b/subPackages/product/product.vue
@@ -48,7 +48,7 @@
           </view>
           <view class="item-bottom">
             <view class="price-section">
-              <text class="price-tag">¥{{ item.price }}</text>
+              <text class="price-tag">¥{{ item.drug.drug_store_drug.price }}</text>
               <text class="stock-tag">库存：999盒</text>
             </view>
             <!-- 简洁的购物车图标按钮 -->
diff --git a/subPackages/product/symptoms.vue b/subPackages/product/symptoms.vue
index 4012f03..976a0f8 100644
--- a/subPackages/product/symptoms.vue
+++ b/subPackages/product/symptoms.vue
@@ -1,181 +1,577 @@
 <template>
   <view class="container">
-<!--    <view class="header">-->
-<!--      <h1>信息填写</h1>-->
-<!--      <p>您正在购买【{{ formData.drug_name }}】请提供您的医疗历史信息，帮助我们更好地为您服务</p>-->
-<!--    </view>-->
-
-    <!-- 药品信息卡片 -->
-    <view class="drug-card">
-      <view class="drug-image-wrapper">
-        <image class="drug-image" :src="formData.image" mode="aspectFill" v-if="formData.image"></image>
-        <view class="drug-image-placeholder" v-else>药品图片</view>
+    <!-- 商品图片轮播 -->
+    <view class="swiper-section">
+      <swiper
+          class="swiper"
+          indicator-dots
+          autoplay
+          circular
+          indicator-color="rgba(255,255,255,0.6)"
+          indicator-active-color="#536DFE"
+      >
+        <swiper-item v-for="(img, index) in productImages" :key="index">
+          <image
+              class="swiper-image"
+              :src="img"
+              mode="aspectFill"
+              @click="previewImage(index)"
+          />
+        </swiper-item>
+      </swiper>
+      <!-- 收藏按钮 -->
+      <view class="favorite-btn" @click="toggleFavorite">
+        <u-icon
+            :name="isFavorite ? 'heart-fill' : 'heart'"
+            :color="isFavorite ? '#FF5252' : '#fff'"
+            size="24"
+        />
       </view>
-      <view class="drug-info">
-        <view class="drug-name">{{ formData.drug_name }}</view>
-        <view class="drug-indications" v-if="indicationsText">
-          功效：{{ indicationsText }}
+    </view>
+
+    <!-- 商品基本信息 -->
+    <view class="basic-info">
+      <view class="price-section">
+        <text class="current-price">¥{{ productPrice }}</text>
+        <text class="original-price" v-if="productDetail.daijian_price">
+          ¥{{ productDetail.daijian_price }}
+        </text>
+        <view class="sales-tag" v-if="productDetail.is_otc === 0">
+          <text>处方药</text>
         </view>
-        <view class="price-section">
-          <view class="unit-price">单价：¥{{ formData.price }}</view>
-          <view class="total-price">总价：¥{{ totalPrice.toFixed(2) }}</view>
+        <view class="sales-tag" v-else>
+          <text>非处方药</text>
+        </view>
+      </view>
+
+      <view class="product-name">{{ productDetail.drug_name }}</view>
+      <view class="product-subtitle">{{ productDetail.drug_alias || productDetail.drug_name }}</view>
+
+      <view class="meta-info">
+        <view class="meta-item">
+          <u-icon name="file-text" size="16" color="#999"></u-icon>
+          <text>规格：{{ productDetail.specification || '暂无' }}</text>
         </view>
       </view>
     </view>
 
-    <u-form :model="formData" ref="uForm">
-      <!-- 购买数量 -->
-      <view class="form-item-wrapper">
-        <u-form-item label="购买数量" prop="hasVisited" label-width="200">
-          <u-number-box v-model="formData.number" :min="1" :max="100" @change="updateTotalPrice"></u-number-box>
-        </u-form-item>
-      </view>
+    <!-- 物流提示信息 -->
+    <view class="order-text-tip" v-if="orderText">
+      <text>{{ orderText }}</text>
+    </view>
 
-      <!-- 是否就诊过 -->
-      <view v-if="!isOtc" class="form-item-wrapper">
-        <u-form-item label="是否就诊过" prop="hasVisited" label-width="200">
-          <u-radio-group v-model="formData.hasVisited">
-            <u-radio name="1" style="margin-right: 60rpx;">是</u-radio>
-            <u-radio name="0">否</u-radio>
-          </u-radio-group>
-        </u-form-item>
+    <!-- 功效与用法 -->
+    <view class="detail-section">
+      <view class="section-title">
+        <text>功效主治</text>
       </view>
-
-      <!-- 是否用过此药 -->
-      <view v-if="!isOtc" class="form-item-wrapper">
-        <u-form-item label="是否用过此药" prop="hasUsedDrug" label-width="200">
-          <u-radio-group v-model="formData.hasUsedDrug">
-            <u-radio name="1" style="margin-right: 60rpx;">是</u-radio>
-            <u-radio name="0">否</u-radio>
-          </u-radio-group>
-        </u-form-item>
+      <view class="section-content">
+        {{ productDetail.function || productDetail.indications || '暂无相关信息' }}
       </view>
+    </view>
 
-      <!-- 患病信息 -->
-      <view v-if="!isOtc" class="form-item-wrapper">
-        <u-form-item label="患病信息" prop="illnessInfo" label-width="200">
-          <u-input
-              v-model="formData.illnessInfo"
-              type="select"
-              placeholder="请选择患病信息"
-              @click="showIllnessPicker = true"
-              disabled
-          />
-        </u-form-item>
+    <view class="detail-section">
+      <view class="section-title">
+        <text>用法用量</text>
       </view>
-    </u-form>
+      <view class="section-content">
+        {{ productDetail.usage || '暂无相关信息' }}
+      </view>
+    </view>
 
-    <!-- 患病信息选择器 -->
+    <!-- 说明书 -->
+    <view class="detail-section">
+      <view class="section-title">
+        <text>说明书</text>
+      </view>
+      <view class="instruction-content">
+        <image
+            v-if="productDetail.instruction"
+            class="instruction-image"
+            :src="productDetail.instruction"
+            mode="widthFix"
+            @click="previewInstruction"
+        />
+        <view v-else class="no-instruction">
+          <u-icon name="file-text" size="48" color="#999"></u-icon>
+          <text>暂无说明书，详见产品内部的说明书</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 购物车弹窗 -->
+    <u-popup
+        v-model="showCartPopup"
+        mode="bottom"
+        border-radius="20"
+        :closeable="true"
+        @close="closeCartPopup"
+    >
+      <view class="cart-popup">
+        <view class="popup-header">
+          <text class="popup-title">选择购买数量</text>
+        </view>
+
+        <view class="product-info">
+          <image
+              class="product-image"
+              :src="productDetail.image"
+              mode="aspectFill"
+          ></image>
+          <view class="product-details">
+            <text class="product-name">{{ productDetail.drug_name }}</text>
+            <text class="product-spec">{{ productDetail.specification || '暂无规格' }}</text>
+            <view class="product-price">¥{{ productPrice }}</view>
+          </view>
+        </view>
+
+        <view class="quantity-selector">
+          <text class="quantity-label">购买数量</text>
+          <view class="quantity-controls">
+            <u-number-box
+                v-model="cartQuantity"
+                :min="1"
+                :max="999"
+                integer
+                :step="1"
+                :disabled-input="false"
+            ></u-number-box>
+          </view>
+        </view>
+
+        <view class="popup-actions">
+          <button class="cancel-btn" @click="closeCartPopup">取消</button>
+          <button class="confirm-btn" @click="addToCart">加入购物车</button>
+        </view>
+      </view>
+    </u-popup>
+
+    <!-- 立即购买弹窗（非处方药） -->
+    <u-popup
+        v-model="showBuyPopup"
+        mode="bottom"
+        border-radius="20"
+        :closeable="true"
+        @close="closeBuyPopup"
+    >
+      <view class="cart-popup">
+        <view class="popup-header">
+          <text class="popup-title">选择购买数量</text>
+        </view>
+
+        <view class="product-info">
+          <image
+              class="product-image"
+              :src="productDetail.image"
+              mode="aspectFill"
+          ></image>
+          <view class="product-details">
+            <text class="product-name">{{ productDetail.drug_name }}</text>
+            <text class="product-spec">{{ productDetail.specification || '暂无规格' }}</text>
+            <view class="product-price">¥{{ productPrice }}</view>
+          </view>
+        </view>
+
+        <view class="quantity-selector">
+          <text class="quantity-label">购买数量</text>
+          <view class="quantity-controls">
+            <u-number-box
+                v-model="buyQuantity"
+                :min="1"
+                :max="999"
+                integer
+                :step="1"
+                :disabled-input="false"
+            ></u-number-box>
+          </view>
+        </view>
+
+        <view class="popup-actions">
+          <button class="cancel-btn" @click="closeBuyPopup">取消</button>
+          <button class="confirm-btn" @click="buyNowConfirm">立即下单</button>
+        </view>
+      </view>
+    </u-popup>
+
+    <!-- 处方药购买表单弹窗 -->
+    <u-popup
+        v-model="showPrescriptionFormPopup"
+        mode="bottom"
+        border-radius="20"
+        :closeable="true"
+        @close="closePrescriptionFormPopup"
+    >
+      <view class="prescription-popup">
+        <view class="popup-header">
+          <text class="popup-title">请填写用药信息</text>
+        </view>
+
+        <view class="product-info">
+          <image
+              class="product-image"
+              :src="productDetail.image"
+              mode="aspectFill"
+          ></image>
+          <view class="product-details">
+            <text class="product-name">{{ productDetail.drug_name }}</text>
+            <text class="product-spec">{{ productDetail.specification || '暂无规格' }}</text>
+            <view class="product-price">¥{{ productPrice }}</view>
+          </view>
+        </view>
+
+        <view class="quantity-selector">
+          <text class="quantity-label">购买数量</text>
+          <view class="quantity-controls">
+            <u-number-box
+                v-model="prescriptionQuantity"
+                :min="1"
+                :max="999"
+                integer
+                :step="1"
+                :disabled-input="false"
+            ></u-number-box>
+          </view>
+        </view>
+
+        <u-form :model="prescriptionFormData" ref="prescriptionForm">
+          <!-- 是否就诊过 -->
+          <view class="form-item-wrapper">
+            <u-form-item label="是否就诊过" prop="hasVisited" label-width="200">
+              <u-radio-group v-model="prescriptionFormData.hasVisited">
+                <u-radio name="1" style="margin-right: 60rpx;">是</u-radio>
+                <u-radio name="0">否</u-radio>
+              </u-radio-group>
+            </u-form-item>
+          </view>
+
+          <!-- 是否用过此药 -->
+          <view class="form-item-wrapper">
+            <u-form-item label="是否用过此药" prop="hasUsedDrug" label-width="200">
+              <u-radio-group v-model="prescriptionFormData.hasUsedDrug">
+                <u-radio name="1" style="margin-right: 60rpx;">是</u-radio>
+                <u-radio name="0">否</u-radio>
+              </u-radio-group>
+            </u-form-item>
+          </view>
+
+          <!-- 患病信息 -->
+          <view class="form-item-wrapper">
+            <u-form-item label="患病信息" prop="illnessInfo" label-width="200">
+              <u-input
+                  v-model="prescriptionFormData.illnessInfo"
+                  type="select"
+                  placeholder="请选择患病信息"
+                  @click="showIllnessPicker = true"
+                  disabled
+              />
+            </u-form-item>
+          </view>
+        </u-form>
+
+        <view class="popup-actions">
+          <button class="cancel-btn" @click="closePrescriptionFormPopup">取消</button>
+          <button class="confirm-btn" @click="submitPrescriptionForm">提交信息</button>
+        </view>
+      </view>
+    </u-popup>
+
+    <!-- 患病信息选择器 - 需要放在最外层避免被弹窗遮挡 -->
     <u-picker
         v-model="showIllnessPicker"
         mode="selector"
         :range="illnessOptions"
         range-key="label"
         @confirm="onIllnessConfirm"
+        :mask-close-able="true"
     ></u-picker>
 
-<!--    <u-button-->
-<!--        class="submit-btn"-->
-<!--        type="primary"-->
-<!--        @click="submitForm"-->
-<!--    >-->
-<!--      {{ isOtc? '立即下单': '提交信息'}}-->
-<!--    </u-button>-->
-
-    <!-- 底部  -->
+    <!-- 底部操作栏 -->
     <view class="footer">
-      <button class="to_pay" @click="submitForm">
-        {{ isOtc? '立即下单': '提交信息'}}
-      </button>
+      <view class="footer-left">
+        <view class="action-item" @click="goToCart">
+          <u-icon name="shopping-cart" size="24" color="#666"></u-icon>
+          <text class="action-text">购物车</text>
+        </view>
+        <view class="action-item" @click="goBack">
+          <u-icon name="home" size="24" color="#666"></u-icon>
+          <text class="action-text">首页</text>
+        </view>
+      </view>
+      <view class="footer-right">
+        <button class="add-cart-btn" @click="showCartPopup = true">加入购物车</button>
+        <button class="buy-now-btn" @click="handleBuyNow">
+          {{ productDetail.is_otc === 0 ? '立即购买' : '立即下单' }}
+        </button>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-import {getStoreDrugDetailApi} from "@/request/api/product";
-import {genOrderApi, saveRegisterInfoApi} from "@/request/api/order";
+import {getOrderTextApi, getStoreDrugDetailApi} from "@/request/api/product";
+import { genOrderApi } from "@/request/api/order";
+import { getCartCountsApi, saveCartApi } from "@/request/api/cart";
 
 export default {
   data() {
     return {
-      formData: {
+      productDetail: {
         id: '',
         drug_name: '',
+        drug_alias: '',
         image: '',
+        price: 0,
+        drug_store_drug: { price: 0 },
+        daijian_price: null,
+        specification: '',
+        function: '',
+        usage: '',
+        instruction: '',
+        is_otc: 1,
+        guozi_no: '',
+        bar_code: '',
+        indications: '',
+        indications_array: []
+      },
+      formData: {
+        id: '',
         hasVisited: '1',
         hasUsedDrug: '1',
         number: 1,
         illnessInfo: '',
         doctor_id: '',
+        type: '',
+        drug_name: '',
+        image: '',
         price: 0
       },
-      illnessOptions: [
-        { value: '感冒', label: '感冒' },
-        { value: '发烧', label: '发烧' },
-        { value: '头痛', label: '头痛' },
-        { value: '过敏', label: '过敏' },
-        { value: '其他', label: '其他' }
-      ],
-      showIllnessPicker: false,
+      productImages: [],
+      isFavorite: false,
+      cartCount: 0,
       submitted: false,
-      isOtc: true,
-      totalPrice: 0,
-      indicationsText: ''
+
+      // 购物车弹窗数据
+      showCartPopup: false,
+      cartQuantity: 1,
+
+      // 立即购买弹窗数据（非处方药）
+      showBuyPopup: false,
+      buyQuantity: 1,
+
+      // 处方药表单弹窗数据
+      showPrescriptionFormPopup: false,
+      prescriptionQuantity: 1,
+      prescriptionFormData: {
+        hasVisited: '1',
+        hasUsedDrug: '1',
+        illnessInfo: '',
+      },
+
+      illnessOptions: [],
+      showIllnessPicker: false,
+      orderText: '本次商品物流配送，由萧康医药提供服务。',
     };
   },
+  computed: {
+    // 计算商品价格，优先使用drug_store_drug.price
+    productPrice() {
+      if (this.productDetail.drug_store_drug && this.productDetail.drug_store_drug.price) {
+        return parseFloat(this.productDetail.drug_store_drug.price);
+      }
+      return parseFloat(this.productDetail.price || 0);
+    }
+  },
   onLoad(options) {
     if (options.id) {
+      // 从options中获取传递的参数
+      this.productDetail.id = options.id;
       this.formData.id = options.id;
-      this.formData.type = options.type;
-      this.formData.image = options.image;
-      this.formData.price = options.price;
-      this.formData.doctor_id = options.doctor_id;
-      this.formData.drug_name = options.drug_name;
-      this.isOtc = options.is_otc === '0';
+      this.formData.type = options.type || '';
+      this.formData.image = options.image || '';
+      this.formData.price = parseFloat(options.price || 0);
+      this.formData.doctor_id = options.doctor_id || '';
+      this.formData.drug_name = options.drug_name || '';
 
-      // 初始化总价
-      this.totalPrice = parseFloat(options.price || 0) * this.formData.number;
+      // 设置productDetail的基本信息
+      this.productDetail.id = options.id;
+      this.productDetail.drug_name = options.drug_name || '';
+      this.productDetail.image = options.image || '';
+      this.productDetail.price = parseFloat(options.price || 0);
+
+      // 加载商品详情
+      this.getDetail();
     } else {
+      // 如果没有id参数，尝试从本地存储获取
       const savedId = uni.getStorageSync('symptoms_id');
       if (savedId) {
+        this.productDetail.id = savedId;
         this.formData.id = savedId;
+        this.getDetail();
       }
     }
 
-    this.getDetail()
+    // 更新购物车数量
+    this.updateCartCount();
+  },
+  onShow() {
+    this.updateCartCount();
   },
   methods: {
-    getDetail() {
-      let that = this;
-      getStoreDrugDetailApi({
-        id: this.formData.id,
-      }).then((res) => {
-        that.illnessOptions = res.data.result.indications_array;
-
-        // 获取药品功效信息
-        if (res.data.result.indications_array && res.data.result.indications_array.length > 0) {
-          // 将功效数组转换为逗号分隔的字符串
-          that.indicationsText = res.data.result.indications_array.map(item => item.label || item.value).join('，');
+    getOrderText() {
+      getOrderTextApi().then((res) => {
+        if (res.data && res.data.result) {
+          this.orderText = res.data.result;
         }
-
-        console.log('11zzz', res);
-        console.log('11zzz', that.illnessOptions);
+      }).catch(err => {
+        console.error('获取订单提示失败:', err);
       })
     },
-    onIllnessConfirm(e) {
-      const index = e[0];
-      this.formData.illnessInfo = this.illnessOptions[index].value;
-      this.showIllnessPicker = false;
-    },
-    // 更新总价
-    updateTotalPrice() {
-      // 把price转换为数字
-      console.log(parseFloat(this.formData.price || 0), typeof parseFloat(this.formData.price || 0), 'ssss')
+    // 获取商品详情 - 保留原有的getDetail方法
+    getDetail() {
+      let that = this;
+      this.getOrderText();
+      getStoreDrugDetailApi({
+        id: this.productDetail.id,
+      }).then((res) => {
+        if (res.data.code === 0) {
+          const data = res.data.result;
 
-      this.totalPrice = parseFloat(this.formData.price || 0) * this.formData.number;
+          // 更新productDetail
+          Object.assign(this.productDetail, data);
+
+          // 处理商品图片
+          this.productImages = data.image ? [data.image] : [];
+
+          // 处理功效信息
+          if (data.indications_array && data.indications_array.length > 0) {
+            this.illnessOptions = data.indications_array.map(item => ({
+              value: item.label || item.value,
+              label: item.label || item.value
+            }));
+          }
+
+          // 如果没有功效信息，使用function字段
+          if (!this.productDetail.indications && data.function) {
+            this.productDetail.indications = data.function;
+          }
+
+          console.log('商品详情加载成功:', this.productDetail);
+          console.log('商品价格:', this.productPrice);
+        }
+      }).catch(error => {
+        console.error('加载商品详情失败:', error);
+        uni.showToast({
+          title: '加载失败',
+          icon: 'none'
+        });
+      });
     },
-    submitForm() {
-      if (!this.formData.hasVisited && this.isOtc === false) {
+
+    updateTotalPrice() {
+      // 保留原有的更新总价逻辑
+      return (this.productPrice * this.formData.number).toFixed(2);
+    },
+
+    // 图片预览
+    previewImage(index) {
+      if (this.productImages.length > 0) {
+        uni.previewImage({
+          current: index,
+          urls: this.productImages
+        });
+      }
+    },
+
+    // 说明书预览
+    previewInstruction() {
+      if (this.productDetail.instruction) {
+        uni.previewImage({
+          urls: [this.productDetail.instruction]
+        });
+      }
+    },
+
+    // 收藏功能
+    toggleFavorite() {
+      this.isFavorite = !this.isFavorite;
+      uni.showToast({
+        title: this.isFavorite ? '已收藏' : '已取消收藏',
+        icon: 'none'
+      });
+    },
+
+    // 更新购物车数量
+    updateCartCount() {
+      getCartCountsApi({
+        store_id: uni.getStorageSync('store_id') || '11001',
+        page: 1,
+        limit: 100
+      }).then((res) => {
+        if (res.data.code == 0) {
+          this.cartCount = res.data.result.cart_count;
+        }
+      })
+    },
+
+    // 加入购物车
+    addToCart() {
+      saveCartApi({
+        store_id: uni.getStorageSync('store_id') || '11001',
+        drug_id: this.productDetail.id,
+        quantity: this.cartQuantity
+      }).then(() => {
+        this.updateCartCount();
+        this.closeCartPopup();
+
+        uni.showToast({
+          title: `已加入${this.cartQuantity}件商品`,
+          icon: 'success',
+          duration: 1500
+        });
+      }).catch(error => {
+        console.error('加入购物车失败:', error);
+        uni.showToast({
+          title: '加入购物车失败',
+          icon: 'none'
+        });
+      });
+    },
+
+    // 处理立即购买
+    handleBuyNow() {
+      if (this.productDetail.is_otc === 0) {
+        // 处方药：显示表单弹窗
+        this.showPrescriptionFormPopup = true;
+      } else {
+        // 非处方药：显示数量选择弹窗
+        this.showBuyPopup = true;
+      }
+    },
+
+    // 非处方药立即下单
+    buyNowConfirm() {
+      genOrderApi({
+        drug_id: this.productDetail.id,
+        number: this.buyQuantity,
+        store_id: uni.getStorageSync('store_id') || '11001',
+      }).then((resOrder) => {
+        this.closeBuyPopup();
+        uni.navigateTo({
+          url: `/subPackages/my/my-drug/drug-info?id=${resOrder.data.result.id}&order_type=${resOrder.data.result.order_type}`
+        });
+      }).catch(error => {
+        console.error('下单失败:', error);
+        uni.showToast({
+          title: '下单失败',
+          icon: 'none'
+        });
+      });
+    },
+
+    // 提交处方药表单
+    submitPrescriptionForm() {
+      // 验证表单
+      if (!this.prescriptionFormData.hasVisited) {
         uni.showToast({
           title: '请选择是否就诊过',
           icon: 'none'
@@ -183,7 +579,7 @@ export default {
         return;
       }
 
-      if (!this.formData.hasUsedDrug && this.isOtc === false) {
+      if (!this.prescriptionFormData.hasUsedDrug) {
         uni.showToast({
           title: '请选择是否用过此药',
           icon: 'none'
@@ -191,7 +587,7 @@ export default {
         return;
       }
 
-      if (!this.formData.illnessInfo && this.isOtc === false) {
+      if (!this.prescriptionFormData.illnessInfo) {
         uni.showToast({
           title: '请选择患病信息',
           icon: 'none'
@@ -199,28 +595,77 @@ export default {
         return;
       }
 
+      // 设置submitted状态
+      this.submitted = true;
+
+      // 处方药流程
       uni.showToast({
         title: '信息提交成功',
         icon: 'success'
       });
 
-      if (this.isOtc === true) {
-        // 直接跳转到付款页面
-        genOrderApi({
-          drug_id: this.formData.id,
-          number: this.formData.number,
-          store_id: uni.getStorageSync('store_id') || '11001',
-        }).then((resOrder) => {
-          uni.navigateTo({
-            url: `/subPackages/my/my-drug/drug-info?id=${resOrder.data.result.id}&order_type=${resOrder.data.result.order_type}`
-          })
-        })
-        return;
-      } else {
-        uni.navigateTo({
-          url: `/subPackages/doctor/doctor-userinfo?id=${this.formData.doctor_id}&r_info=${JSON.stringify(this.formData)}&r_type=${this.formData.type}`
-        });
-      }
+      // 关闭弹窗
+      this.closePrescriptionFormPopup();
+
+      // 准备跳转数据 - 包含购买数量
+      const rInfo = {
+        id: this.productDetail.id,
+        drug_name: this.productDetail.drug_name,
+        image: this.productDetail.image,
+        price: this.productPrice,
+        number: this.prescriptionQuantity, // 使用处方药弹窗中的购买数量
+        hasVisited: this.prescriptionFormData.hasVisited,
+        hasUsedDrug: this.prescriptionFormData.hasUsedDrug,
+        illnessInfo: this.prescriptionFormData.illnessInfo,
+        doctor_id: this.formData.doctor_id,
+        type: this.formData.type
+      };
+
+      // 跳转到医生信息页
+      uni.navigateTo({
+        url: `/subPackages/doctor/doctor-userinfo?id=${this.formData.doctor_id}&r_info=${JSON.stringify(rInfo)}&r_type=${this.formData.type}`
+      });
+    },
+
+    // 跳转购物车
+    goToCart() {
+      uni.navigateTo({
+        url: '/subPackages/shop/shop-cate'
+      });
+    },
+
+    // 返回首页
+    goBack() {
+      uni.navigateBack({
+        delta: 1
+      });
+    },
+
+    // 患病信息选择
+    onIllnessConfirm(e) {
+      const index = e[0];
+      this.prescriptionFormData.illnessInfo = this.illnessOptions[index].value;
+      this.showIllnessPicker = false;
+    },
+
+    closeCartPopup() {
+      this.showCartPopup = false;
+      this.cartQuantity = 1;
+    },
+
+    closeBuyPopup() {
+      this.showBuyPopup = false;
+      this.buyQuantity = 1;
+    },
+
+    closePrescriptionFormPopup() {
+      this.showPrescriptionFormPopup = false;
+      this.prescriptionQuantity = 1;
+      this.prescriptionFormData = {
+        hasVisited: '1',
+        hasUsedDrug: '1',
+        illnessInfo: '',
+      };
     }
   }
 }
@@ -228,220 +673,477 @@ export default {
 
 <style lang="scss" scoped>
 .container {
-  padding: 24rpx;
   background-color: #f5f8ff;
   min-height: 100vh;
+  padding-bottom: 120rpx; // 为底部操作栏留出空间
 }
 
-.header {
-  text-align: center;
-  margin-bottom: 60rpx;
-  padding: 40rpx 0;
-  border-bottom: 1px solid #eaeefb;
+// 轮播图区域
+.swiper-section {
+  position: relative;
+  height: 500rpx;
+  overflow: hidden;
 
-  h1 {
-    color: #2979ff;
-    font-size: 36rpx;
-    margin-bottom: 16rpx;
-    font-weight: bold;
+  .swiper {
+    width: 100%;
+    height: 100%;
   }
 
-  p {
-    color: #666;
-    font-size: 28rpx;
-  }
-}
-
-/* 药品卡片样式 */
-.drug-card {
-  display: flex;
-  background: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 4rpx 20rpx rgba(64, 158, 255, 0.1);
-  padding: 30rpx;
-  margin-bottom: 40rpx;
-}
-
-.drug-image-wrapper {
-  width: 180rpx;
-  height: 180rpx;
-  margin-right: 30rpx;
-  flex-shrink: 0;
-}
-
-.drug-image {
-  width: 100%;
-  height: 100%;
-  border-radius: 12rpx;
-}
-
-.drug-image-placeholder {
-  width: 100%;
-  height: 100%;
-  border-radius: 12rpx;
-  background: #f0f5ff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #999;
-  font-size: 24rpx;
-}
-
-.drug-info {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.drug-name {
-  font-size: 32rpx;
-  font-weight: bold;
-  color: #333;
-  margin-bottom: 16rpx;
-}
-
-.drug-indications {
-  font-size: 26rpx;
-  color: #666;
-  line-height: 1.5;
-  margin-bottom: 20rpx;
-}
-
-.price-section {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.unit-price {
-  font-size: 28rpx;
-  color: #999;
-}
-
-.total-price {
-  font-size: 32rpx;
-  color: #ff4d4f;
-  font-weight: bold;
-}
-
-.form-item-wrapper {
-  background: #fff;
-  padding: 30rpx;
-  border-radius: 16rpx;
-  box-shadow: 0 4rpx 20rpx rgba(64, 158, 255, 0.1);
-  margin-bottom: 30rpx;
-}
-
-// 自定义uView表单样式
-::v-deep .u-form-item {
-  margin-bottom: 0;
-
-  .u-form-item__body {
-    padding: 0;
-    align-items: flex-start;
+  .swiper-image {
+    width: 100%;
+    height: 100%;
   }
 
-  .u-form-item__body__left__content__label {
-    font-size: 32rpx;
-    color: #2979ff;
-    font-weight: 600;
+  .favorite-btn {
+    position: absolute;
+    right: 30rpx;
+    top: 30rpx;
+    width: 60rpx;
+    height: 60rpx;
+    background: rgba(0, 0, 0, 0.3);
+    border-radius: 50%;
     display: flex;
     align-items: center;
+    justify-content: center;
+    z-index: 10;
+  }
+}
 
-    &::before {
-      content: "";
-      display: inline-block;
-      width: 8rpx;
-      height: 32rpx;
-      background: #2979ff;
-      margin-right: 16rpx;
-      border-radius: 4rpx;
+// 基本信息区域
+.basic-info {
+  background: #fff;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+
+  .price-section {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
+
+    .current-price {
+      font-size: 48rpx;
+      font-weight: bold;
+      color: #ff4d4f;
+      margin-right: 20rpx;
+    }
+
+    .original-price {
+      font-size: 28rpx;
+      color: #999;
+      text-decoration: line-through;
+      margin-right: 20rpx;
+    }
+
+    .sales-tag {
+      background: linear-gradient(135deg, #ff7875, #ff4d4f);
+      color: white;
+      padding: 6rpx 16rpx;
+      border-radius: 20rpx;
+      font-size: 22rpx;
+    }
+  }
+
+  .product-name {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 10rpx;
+    line-height: 1.4;
+  }
+
+  .product-subtitle {
+    font-size: 28rpx;
+    color: #666;
+    margin-bottom: 20rpx;
+  }
+
+  .meta-info {
+    .meta-item {
+      display: flex;
+      align-items: center;
+      font-size: 24rpx;
+      color: #666;
+      margin-bottom: 8rpx;
+
+      u-icon {
+        margin-right: 8rpx;
+      }
     }
   }
 }
 
-// 单选组样式
-::v-deep .u-radio-group {
-  display: flex;
-  margin-top: 20rpx;
-}
-
-::v-deep .u-radio {
-  display: flex;
-  align-items: center;
-
-  .u-radio__icon-wrap {
-    margin-right: 10rpx;
-  }
-
-  .u-radio__label {
-    font-size: 30rpx;
-    color: #555;
-  }
-}
-
-.submit-btn {
-  display: block;
-  width: 100%;
-  height: 90rpx;
-  background: linear-gradient(135deg, #2979ff, #448aff);
-  color: white;
-  border: none;
-  border-radius: 45rpx;
-  font-size: 32rpx;
-  font-weight: 500;
-  margin-top: 60rpx;
-  box-shadow: 0 8rpx 20rpx rgba(41, 121, 255, 0.25);
-}
-
-.data-display {
-  margin-top: 60rpx;
-  padding: 40rpx;
-  background: #f5f8ff;
-  border-radius: 16rpx;
-  border-left: 8rpx solid #2979ff;
-
-  h3 {
-    color: #2979ff;
-    margin-bottom: 30rpx;
-    font-size: 32rpx;
-  }
-}
-
-.data-content {
-  background: white;
-  padding: 30rpx;
-  border-radius: 16rpx;
-  font-family: monospace;
-  white-space: pre-wrap;
+/* 新增：物流提示样式 */
+.order-text-tip {
+  background: #e6f3ff;
+  padding: 20rpx 30rpx;
+  margin: 0 20rpx 20rpx 20rpx;
+  border-radius: 8rpx;
   font-size: 26rpx;
-  max-height: 400rpx;
-  overflow-y: auto;
+  color: #1890ff;
+  line-height: 1.4;
+  border-left: 6rpx solid #1890ff;
 }
 
+// 详情区域
+.detail-section {
+  background: #fff;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
 
+  .section-title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 20rpx;
+    position: relative;
+    padding-left: 20rpx;
+
+    &::before {
+      content: "";
+      position: absolute;
+      left: 0;
+      top: 50%;
+      transform: translateY(-50%);
+      width: 6rpx;
+      height: 30rpx;
+      background: #536DFE;
+      border-radius: 3rpx;
+    }
+  }
+
+  .section-content {
+    font-size: 28rpx;
+    color: #666;
+    line-height: 1.6;
+  }
+
+  // 说明书区域
+  .instruction-content {
+    .instruction-image {
+      width: 100%;
+      border-radius: 12rpx;
+    }
+
+    .no-instruction {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      padding: 60rpx 0;
+
+      u-icon {
+        margin-bottom: 20rpx;
+      }
+
+      text {
+        font-size: 28rpx;
+        color: #999;
+        text-align: center;
+      }
+    }
+  }
+}
+
+// 表单区域
+.form-item-wrapper {
+  margin-bottom: 30rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+// 购物车/购买弹窗
+.cart-popup {
+  padding: 40rpx;
+
+  .popup-header {
+    margin-bottom: 40rpx;
+    text-align: center;
+  }
+
+  .popup-title {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #2c3e50;
+  }
+
+  .product-info {
+    display: flex;
+    margin-bottom: 40rpx;
+
+    .product-image {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 12rpx;
+      margin-right: 24rpx;
+    }
+
+    .product-details {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      .product-name {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #2c3e50;
+        margin-bottom: 8rpx;
+        line-height: 1.4;
+      }
+
+      .product-spec {
+        font-size: 24rpx;
+        color: #95a5a6;
+        margin-bottom: 12rpx;
+      }
+
+      .product-price {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #ff4d4f;
+      }
+    }
+  }
+
+  .quantity-selector {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx 0;
+    border-top: 1rpx solid #f0f0f0;
+    border-bottom: 1rpx solid #f0f0f0;
+
+    .quantity-label {
+      font-size: 30rpx;
+      color: #2c3e50;
+      font-weight: 500;
+    }
+  }
+
+  .popup-actions {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 40rpx;
+
+    .cancel-btn {
+      flex: 1;
+      margin-right: 20rpx;
+      background-color: #f8f9fa;
+      color: #95a5a6;
+      border: none;
+      border-radius: 50rpx;
+      padding: 24rpx 0;
+      font-size: 30rpx;
+      font-weight: 500;
+
+      &:active {
+        background-color: #e9ecef;
+      }
+    }
+
+    .confirm-btn {
+      flex: 1;
+      margin-left: 20rpx;
+      background: linear-gradient(135deg, #4A90E2, #3A86FF);
+      color: #ffffff;
+      border: none;
+      border-radius: 50rpx;
+      padding: 24rpx 0;
+      font-size: 30rpx;
+      font-weight: 500;
+
+      &:active {
+        opacity: 0.8;
+      }
+    }
+  }
+}
+
+// 处方药表单弹窗
+.prescription-popup {
+  padding: 40rpx;
+  max-height: 80vh;
+  overflow-y: auto;
+
+  .popup-header {
+    margin-bottom: 40rpx;
+    text-align: center;
+  }
+
+  .popup-title {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #2c3e50;
+  }
+
+  .product-info {
+    display: flex;
+    margin-bottom: 40rpx;
+
+    .product-image {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 12rpx;
+      margin-right: 24rpx;
+    }
+
+    .product-details {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+
+      .product-name {
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #2c3e50;
+        margin-bottom: 8rpx;
+        line-height: 1.4;
+      }
+
+      .product-spec {
+        font-size: 24rpx;
+        color: #95a5a6;
+        margin-bottom: 12rpx;
+      }
+
+      .product-price {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #ff4d4f;
+      }
+    }
+  }
+
+  .quantity-selector {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx 0;
+    border-top: 1rpx solid #f0f0f0;
+    border-bottom: 1rpx solid #f0f0f0;
+
+    .quantity-label {
+      font-size: 30rpx;
+      color: #2c3e50;
+      font-weight: 500;
+    }
+  }
+
+  .popup-actions {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 40rpx;
+
+    .cancel-btn {
+      flex: 1;
+      margin-right: 20rpx;
+      background-color: #f8f9fa;
+      color: #95a5a6;
+      border: none;
+      border-radius: 50rpx;
+      padding: 24rpx 0;
+      font-size: 30rpx;
+      font-weight: 500;
+
+      &:active {
+        background-color: #e9ecef;
+      }
+    }
+
+    .confirm-btn {
+      flex: 1;
+      margin-left: 20rpx;
+      background: linear-gradient(135deg, #4A90E2, #3A86FF);
+      color: #ffffff;
+      border: none;
+      border-radius: 50rpx;
+      padding: 24rpx 0;
+      font-size: 30rpx;
+      font-weight: 500;
+
+      &:active {
+        opacity: 0.8;
+      }
+    }
+  }
+}
+
+// 底部操作栏
 .footer {
-  width: 750rpx;
-  height: 114rpx;
   position: fixed;
   left: 0;
-  bottom: env(safe-area-inset-bottom);
+  bottom: 0;
+  width: 100%;
+  height: 100rpx;
+  background: #fff;
   display: flex;
   align-items: center;
-  padding: 0rpx 24rpx;
-  font-size: 28rpx;
-  font-family: PingFang SC-Regular, PingFang SC;
-  font-weight: 400;
+  padding: 0 20rpx;
+  box-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.1);
+  z-index: 1000;
 
-  .to_pay {
-    width: 690rpx;
-    height: 84rpx;
-    line-height: 84rpx;
-    background: #536DFE;
-    border-radius: 64rpx;
-    color: #FFFFFF;
-    text-align: center;
+  .footer-left {
+    display: flex;
+    align-items: center;
+    flex: 1;
+
+    .action-item {
+      position: relative;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin-right: 40rpx;
+
+      .action-text {
+        font-size: 20rpx;
+        color: #666;
+        margin-top: 4rpx;
+      }
+
+      .cart-badge-container {
+        position: absolute;
+        top: -10rpx;
+        right: -10rpx;
+      }
+
+      .cart-badge {
+        position: relative;
+      }
+    }
+  }
+
+  .footer-right {
+    display: flex;
+    align-items: center;
+    flex: 2;
+
+    button {
+      flex: 1;
+      height: 80rpx;
+      line-height: 80rpx;
+      border-radius: 40rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+      border: none;
+
+      &.add-cart-btn {
+        background: linear-gradient(135deg, #FF9800, #FFB74D);
+        color: white;
+        margin-right: 20rpx;
+      }
+
+      &.buy-now-btn {
+        background: linear-gradient(135deg, #536DFE, #6C8EFF);
+        color: white;
+      }
+
+      &:active {
+        opacity: 0.8;
+      }
+    }
   }
 }
 </style>
\ No newline at end of file