diff --git a/subPackages/my/my-drug/drug-info.vue b/subPackages/my/my-drug/drug-info.vue index 2e3c5b5..3100819 100644 --- a/subPackages/my/my-drug/drug-info.vue +++ b/subPackages/my/my-drug/drug-info.vue @@ -61,7 +61,7 @@ + v-if="orderInfo.ProductOrder.prescription_type==1"> {{item.drug_name}} x{{item.number}} @@ -69,7 +69,7 @@ - + @@ -695,9 +695,8 @@ export default { width: 750rpx; max-height: 100%; min-height: 100vh; - padding-bottom: env(safe-area-inset-bottom); background: #F5F5F5; - + padding-bottom: 500rpx; /* 新增:物流提示样式 */ .order-text-tip { background: #e6f3ff; diff --git a/subPackages/my/my-drug/drug-list.vue b/subPackages/my/my-drug/drug-list.vue index d3b5f68..96b02aa 100644 --- a/subPackages/my/my-drug/drug-list.vue +++ b/subPackages/my/my-drug/drug-list.vue @@ -60,7 +60,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/subPackages/product/symptoms.vue b/subPackages/product/symptoms.vue index 67c4d38..ec5ca0c 100644 --- a/subPackages/product/symptoms.vue +++ b/subPackages/product/symptoms.vue @@ -245,7 +245,7 @@ import { getOrderTextApi, getStoreDrugDetailApi } from "@/request/api/product"; import { genOrderApi, getPrescriptionStatusApi } from "@/request/api/order"; import { getCartCountsApi, saveCartApi } from "@/request/api/cart"; -import { canShowFunction, canShowUsage, canShowInstruction, isPrescriptionApprovedStatus } from '@/common/utils/drug'; +import { canShowFunction, canShowUsage, canShowInstruction, isHealthFood, isPrescriptionApprovedStatus } from '@/common/utils/drug'; export default { data() { return { @@ -317,13 +317,18 @@ export default { return (this.productDetail.supplier && this.productDetail.supplier.name) || ''; }, showFunctionSection() { - return canShowFunction(this.productDetail, this.prescriptionApproved); + if (isHealthFood(this.productDetail)) return false; + return canShowFunction(this.productDetail, this.prescriptionApproved) + || !!(this.productDetail.function || this.productDetail.indications); }, showUsageSection() { - return canShowUsage(this.productDetail, this.prescriptionApproved); + if (isHealthFood(this.productDetail)) return false; + return canShowUsage(this.productDetail, this.prescriptionApproved) + || !!this.productDetail.usage; }, showInstructionSection() { - return canShowInstruction(this.productDetail, this.prescriptionApproved); + return canShowInstruction(this.productDetail, this.prescriptionApproved) + || !!this.productDetail.instruction; } }, onLoad(options) { @@ -402,8 +407,11 @@ export default { this.getOrderText(); const params = { id: this.productDetail.id, - store_id: this.orderStoreId || uni.getStorageSync('store_id') || '11001', }; + const storeId = this.orderStoreId || uni.getStorageSync('store_id'); + if (storeId) { + params.store_id = storeId; + } if (this.fromOrderId) { params.order_id = this.fromOrderId; } diff --git a/utils/utils.js b/utils/utils.js index d0b9d95..62c7394 100644 --- a/utils/utils.js +++ b/utils/utils.js @@ -6,8 +6,8 @@ export function checkDev(key = '') { // 判断某些模块是否开启 switch (key) { case 'dev': - // return false; - return true; + return false; + // return true; case 'open-im': // return false; return true;