|
|
@@ -60,7 +60,10 @@
|
|
|
<view style="color:red;font-weight:bold;">累计退款：</view>
|
|
|
<view style="color:red;font-weight:bold;font-size:30upx;">¥{{ totalRefundPrice }}</view>
|
|
|
<view class="price">
|
|
|
- <text @click="pageTo({url: '/pagesPurchase/refundList',query: {orderSn: detailInfo.orderSn}})" style="font-weight:normal;color:#3385FF;">售后记录</text>
|
|
|
+ <button
|
|
|
+ class="admin-button-com outline-action"
|
|
|
+ @click="pageTo({url: '/pagesPurchase/refundList',query: {orderSn: detailInfo.orderSn}})"
|
|
|
+ >售后记录</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -71,31 +74,33 @@
|
|
|
<view>订单状态：</view>
|
|
|
<view style="color:red;font-weight:bold;">挂账</view>
|
|
|
<view class="price">
|
|
|
- <text @click="goToClear(detailInfo)" style="font-weight:normal;color:#3385FF;">全部挂账</text>
|
|
|
+ <button class="admin-button-com outline-action" @click="goToClear(detailInfo)">全部挂账</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="order-info_box" v-else>
|
|
|
<view>订单状态：</view>
|
|
|
<view v-if="detailInfo.clearId > 0">已结清</view>
|
|
|
<view class="price" v-if="detailInfo.clearId > 0">
|
|
|
- <button @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
|
|
|
+ <button @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com outline-action">查看结账单</button>
|
|
|
</view>
|
|
|
<view v-if="detailInfo.clearId == 0"></view>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <view class="title">
|
|
|
- 商品信息
|
|
|
- <block v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
|
|
|
- <text @click="goRefund(detailInfo)" v-if="detailInfo.status == 4"
|
|
|
- style="float:right;font-weight:normal;color:#3385FF;margin-right:30upx;">申请售后</text>
|
|
|
- <text @click="printAllLabelConfirm(detailInfo,1)" style="float:right;font-weight:normal;color:#3385FF;margin-right:30upx;">
|
|
|
- 打全部价码
|
|
|
- </text>
|
|
|
- <text @click="printAllLabelConfirm(detailInfo,0)" style="float:right;font-weight:normal;color:#3385FF;margin-right:30upx;">
|
|
|
- 打全部标签
|
|
|
- </text>
|
|
|
- </block>
|
|
|
+ <view class="title title-with-actions">
|
|
|
+ <text class="title-text">商品信息</text>
|
|
|
+ <view
|
|
|
+ v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0"
|
|
|
+ class="title-actions"
|
|
|
+ >
|
|
|
+ <button class="admin-button-com outline-action" @click="printAllLabelConfirm(detailInfo,0)">打全部标签</button>
|
|
|
+ <button class="admin-button-com outline-action" @click="printAllLabelConfirm(detailInfo,1)">打全部价码</button>
|
|
|
+ <button
|
|
|
+ v-if="detailInfo.status == 4"
|
|
|
+ class="admin-button-com outline-action"
|
|
|
+ @click="goRefund(detailInfo)"
|
|
|
+ >申请售后</button>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view style="text-align: right;" v-if="detailInfo.pfLevel && detailInfo.pfLevel == 1">
|
|
|
<button @tap="assignOrder()" class="admin-button-com middle blue" style="">刷新货位</button>
|
|
|
@@ -205,7 +210,7 @@
|
|
|
<div class="module-com input-line-wrap">
|
|
|
<tui-list-cell class="line-cell" :hover="false">
|
|
|
<div class="tui-title">备注</div>
|
|
|
- <textarea style="height: 130upx;width:350upx;" v-model="detailInfo.remark" placeholder="这里写备注"/>
|
|
|
+ <textarea style="height: 120upx;width:340upx;" v-model="detailInfo.remark" placeholder="这里写备注"/>
|
|
|
<button class="admin-button-com blue mini-btn" @click="modifyRemark(item)" >修改</button>
|
|
|
</tui-list-cell>
|
|
|
</div>
|
|
|
@@ -751,6 +756,34 @@ export default {
|
|
|
font-weight: 600;
|
|
|
padding: 30upx 3upx;
|
|
|
}
|
|
|
+ /* 商品信息标题行：右侧描边操作按钮（无实心底色，对齐 hdApp outline-action） */
|
|
|
+ & > .title-with-actions {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+ .title-text {
|
|
|
+ flex-shrink: 0;
|
|
|
+ }
|
|
|
+ .title-actions {
|
|
|
+ display: flex;
|
|
|
+ flex-wrap: wrap;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: flex-end;
|
|
|
+ .outline-action {
|
|
|
+ margin-left: 12upx;
|
|
|
+ margin-bottom: 6upx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ /* 描边按钮：白底描边，不用 .blue 实心填充 */
|
|
|
+ .outline-action {
|
|
|
+ background-color: #fff;
|
|
|
+ color: #3385ff;
|
|
|
+ border: 1upx solid #3385ff;
|
|
|
+ font-weight: 400;
|
|
|
+ padding: 10upx 16upx;
|
|
|
+ line-height: 1.2;
|
|
|
+ }
|
|
|
& .address-des_bx {
|
|
|
display: flex;
|
|
|
padding: 20upx 10upx 20upx 20upx;
|
