|
|
@@ -87,7 +87,12 @@
|
|
|
<i class="iconfont iconxiangyou"></i>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="order-info_box remark-box" v-if="!$util.isEmpty(item.remark)">
|
|
|
+ <!-- 点击备注区域编辑，阻止冒泡避免进入订单详情 -->
|
|
|
+ <view
|
|
|
+ class="order-info_box remark-box remark-box--editable"
|
|
|
+ v-if="!$util.isEmpty(item.remark)"
|
|
|
+ @click.stop="openRemarkEdit(item)"
|
|
|
+ >
|
|
|
<view class="remark-text">{{ item.remark }}</view>
|
|
|
</view>
|
|
|
<view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum > 1 && moreOrderRemind == true" class="merge-tips" @click.stop="pageTo({ url: '/admin/order/mergeOrder?ids=' + item.sameTimeIds+'&mergeId='+item.mergeId })" >
|
|
|
@@ -794,6 +799,10 @@ export default {
|
|
|
display: block !important; /* 覆盖父级的 flex 布局 */
|
|
|
}
|
|
|
|
|
|
+.remark-box--editable:active {
|
|
|
+ opacity: 0.85;
|
|
|
+}
|
|
|
+
|
|
|
.remark-box .remark-text {
|
|
|
color: #d32f2f !important; /* 强制覆盖父级颜色 */
|
|
|
font-weight: bold !important;
|
