1. 特色方功能迭代
This commit is contained in:
@@ -6,4 +6,5 @@ alwaysApply: true
|
|||||||
1. 写代码的时候要补充详细的中文注释(每个方法是干嘛的,为什么要这样写),如果是工作区,则所有项目都适用该规则
|
1. 写代码的时候要补充详细的中文注释(每个方法是干嘛的,为什么要这样写),如果是工作区,则所有项目都适用该规则
|
||||||
2. 注意不要生成太多的空行,上一部分代码和下一部分代码中间的空行不要大于2行
|
2. 注意不要生成太多的空行,上一部分代码和下一部分代码中间的空行不要大于2行
|
||||||
3. 有封装好的方法、组件需要复用,不要重复造轮子
|
3. 有封装好的方法、组件需要复用,不要重复造轮子
|
||||||
4. 小程序端的抽屉全部需要用page-container来防止用户意外退出页面
|
4. 小程序端的抽屉全部需要用page-container来防止用户意外退出页面(记得使用v-if而不是v-show)
|
||||||
|
5. 数据库的(created_at、updated_at、deleted_at)统一使用时间戳,不要使用字符串,并且我在查询器中一级格式化成字符串了,无需再次格式化
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<page-container
|
<page-container
|
||||||
:show="agreementPopupVisible"
|
:if="agreementPopupVisible"
|
||||||
position="bottom"
|
position="bottom"
|
||||||
round
|
round
|
||||||
overlay
|
overlay
|
||||||
|
|||||||
@@ -152,7 +152,7 @@
|
|||||||
v-if="detailUrl(tea)"
|
v-if="detailUrl(tea)"
|
||||||
class="tea-item"
|
class="tea-item"
|
||||||
v-for="(tea, tIndex) in specialPrescription.items"
|
v-for="(tea, tIndex) in specialPrescription.items"
|
||||||
:key="tea.id || tIndex"
|
:key="tIndex"
|
||||||
:url="detailUrl(tea)"
|
:url="detailUrl(tea)"
|
||||||
hover-class="tea-item--active"
|
hover-class="tea-item--active"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -117,7 +117,7 @@
|
|||||||
|
|
||||||
<!-- 协议抽屉 -->
|
<!-- 协议抽屉 -->
|
||||||
<page-container
|
<page-container
|
||||||
:show="showAgreement"
|
:if="showAgreement"
|
||||||
position="bottom"
|
position="bottom"
|
||||||
round
|
round
|
||||||
overlay
|
overlay
|
||||||
|
|||||||
@@ -167,7 +167,7 @@
|
|||||||
<view class="text-block" v-if="parsedContent.question">
|
<view class="text-block" v-if="parsedContent.question">
|
||||||
<text class="block-content">{{ parsedContent.question }}</text>
|
<text class="block-content">{{ parsedContent.question }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="info-row" v-for="(row, idx) in (parsedContent.drugs || [])" :key="'fd-' + idx">
|
<view class="info-row" v-for="(row, idx) in (parsedContent.drugs || [])" :key="idx">
|
||||||
<text class="label">{{ row.name || '药品' }}</text>
|
<text class="label">{{ row.name || '药品' }}</text>
|
||||||
<text class="value">×{{ row.quantity != null ? row.quantity : 1 }}</text>
|
<text class="value">×{{ row.quantity != null ? row.quantity : 1 }}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
<view v-if="clinicQuestion" class="clinic-question">{{ clinicQuestion }}</view>
|
<view v-if="clinicQuestion" class="clinic-question">{{ clinicQuestion }}</view>
|
||||||
<view v-if="clinicDrugs.length" class="clinic-drugs">
|
<view v-if="clinicDrugs.length" class="clinic-drugs">
|
||||||
<view class="sub-title">涉及药品</view>
|
<view class="sub-title">涉及药品</view>
|
||||||
<view v-for="(row, idx) in clinicDrugs" :key="'d-' + idx" class="drug-line">
|
<view v-for="(row, idx) in clinicDrugs" :key="idx" class="drug-line">
|
||||||
<text class="n">{{ row.name || '药品' }}</text>
|
<text class="n">{{ row.name || '药品' }}</text>
|
||||||
<text class="q">×{{ row.quantity != null ? row.quantity : 1 }}</text>
|
<text class="q">×{{ row.quantity != null ? row.quantity : 1 }}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -164,10 +164,10 @@
|
|||||||
查看物流
|
查看物流
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- <view class="order_info active" v-if="item.is_pay==0 && item.status==0 && item.cancel_status==0"-->
|
<view class="order_info active" v-if="item.is_pay==0 && item.status==0 && item.cancel_status==0"
|
||||||
<!-- @tap.stop="goCancel(item.id)">-->
|
@tap.stop="goCancel(item.id)">
|
||||||
<!-- 取消-->
|
取消
|
||||||
<!-- </view>-->
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<u-loadmore :status="loadMoreStatus" v-if="orderList.length!=0" margin-top="30" margin-bottom="30" />
|
<u-loadmore :status="loadMoreStatus" v-if="orderList.length!=0" margin-top="30" margin-bottom="30" />
|
||||||
|
|||||||
@@ -135,7 +135,7 @@
|
|||||||
</block>
|
</block>
|
||||||
|
|
||||||
<block v-if="data.prescription_type==2||data.prescription_type == 5||data.prescription_type == 7">
|
<block v-if="data.prescription_type==2||data.prescription_type == 5||data.prescription_type == 7">
|
||||||
<view class="item" v-for="(it,index) in infoList.repice" :key="it.id || index">
|
<view class="item" v-for="(it,index) in infoList.repice" :key="index">
|
||||||
<!-- v-for="(it,index) in item.content" :key="it.id" -->
|
<!-- v-for="(it,index) in item.content" :key="it.id" -->
|
||||||
<view class="name" style="justify-content: space-between;">
|
<view class="name" style="justify-content: space-between;">
|
||||||
<view class="yp_name">
|
<view class="yp_name">
|
||||||
@@ -305,7 +305,7 @@
|
|||||||
</block>
|
</block>
|
||||||
|
|
||||||
<block v-if="data.prescription_type==2||data.prescription_type == 5||data.prescription_type == 7">
|
<block v-if="data.prescription_type==2||data.prescription_type == 5||data.prescription_type == 7">
|
||||||
<view class="item" v-for="(it,index) in infoList.repice" :key="it.id || index">
|
<view class="item" v-for="(it,index) in infoList.repice" :key="index">
|
||||||
<view class="name" style="justify-content: space-between;">
|
<view class="name" style="justify-content: space-between;">
|
||||||
<view class="yp_name">
|
<view class="yp_name">
|
||||||
<text>{{ (it.content && it.content.drug_name) || '' }} </text>
|
<text>{{ (it.content && it.content.drug_name) || '' }} </text>
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="container safe-area-inset-bottom">
|
<view class="container safe-area-inset-bottom" style="padding-bottom: 100rpx">
|
||||||
<!-- #ifdef MP-WEIXIN -->
|
<!-- #ifdef MP-WEIXIN -->
|
||||||
<page-container
|
<page-container
|
||||||
:show="pageBackGuardShow"
|
:if="pageBackGuardShow"
|
||||||
:overlay="false"
|
:overlay="false"
|
||||||
@leave="onPageBackGuardLeave"
|
@leave="onPageBackGuardLeave"
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user