|
|
@@ -216,13 +216,17 @@
|
|
|
<text v-if="detailInfo.book == 1" style="position:absolute;left:155upx;top:65upx;color:#999999;">预订 {{ parseFloat(s.xhPreNum) }}{{s.xhUnitName}} x ¥{{ s.xhUnitPrice?parseFloat(s.xhUnitPrice):0 }}</text>
|
|
|
|
|
|
<text style="position:absolute;left:270upx;top:103upx;color:#333333;">
|
|
|
- <text v-if="s.giveNum && Number(s.giveNum)>0" style="margin-right:15upx;">已赠 {{parseFloat(s.giveNum)}}{{s.xhUnitName}}</text>
|
|
|
- <text style="color:red;font-weight: bold;" v-if="Number(s.refundNum)>0">已退{{ s.refundNum }}{{s.xhUnitName}}</text>
|
|
|
+ <text v-if="s.giveNum && Number(s.giveNum)>0" style="margin-right:16upx;">已赠 {{parseFloat(s.giveNum)}}{{s.xhUnitName}}</text>
|
|
|
+ <text style="color:red;font-weight: bold;margin-right:16upx;" v-if="Number(s.refundNum)>0">已退{{ s.refundNum }}{{s.xhUnitName}}</text>
|
|
|
+ <text style="color:#CCCCCC;" @click.stop="beginUpdateItemRemark(s)">
|
|
|
+ {{s.remark}}
|
|
|
+ <text style="color:#3385FF;cursor: pointer;margin-left:5upx;">改备注</text>
|
|
|
+ </text>
|
|
|
</text>
|
|
|
|
|
|
- <view class="item-info" @click="pageTo({url:'/admin/item/detail?id='+s.productId})">
|
|
|
+ <view class="item-info">
|
|
|
<view class="info-line">
|
|
|
- <text class="item-name">{{ s.name }}</text>
|
|
|
+ <text class="item-name" @click="pageTo({url:'/admin/item/detail?id='+s.productId})">{{ s.name }}</text>
|
|
|
<text class="item-price">
|
|
|
<text class="unit"></text>
|
|
|
<text class="price">
|
|
|
@@ -398,6 +402,16 @@
|
|
|
</view>
|
|
|
</uni-popup>
|
|
|
|
|
|
+ <uni-popup ref="updateItemRemarkRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
|
|
|
+ <view style="padding:30upx;">
|
|
|
+ <textarea v-model="updateItemRemarkText" style="border:1upx solid #cccccc;height:120upx;font-size:28upx;" placeholder="请修改备注"></textarea>
|
|
|
+ <view style="text-align:center;">
|
|
|
+ <button class="admin-button-com big default" style="margin:30upx auto 10upx auto;width:45%;" @click="cancelItemRemarkModify()">取消</button>
|
|
|
+ <button class="admin-button-com big blue" style="margin:30upx auto 10upx 20upx;width:45%;" @click="confirmItemRemarkModify()">修改</button>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </uni-popup>
|
|
|
+
|
|
|
<modal-module :show="fhLabelShow" @click="fhConfirm" :maskClosable="true" title="物流信息" padding="30rpx 30rpx" >
|
|
|
<template v-slot:content>
|
|
|
<div class="app-modal-input-wrap">
|
|
|
@@ -433,7 +447,7 @@ import { hasHitNavigate } from "@/api/map";
|
|
|
import { getWeixinId } from "@/api/invite";
|
|
|
import { IMGHOST } from '@/config'
|
|
|
import { partItem } from "@/api/part"
|
|
|
-import { delItem } from "@/api/order-item";
|
|
|
+import { delItem,updateRemarkItemFn } from "@/api/order-item";
|
|
|
import ModalModule from "@/components/plugin/modal"
|
|
|
export default {
|
|
|
name: "orderDetail",
|
|
|
@@ -464,12 +478,14 @@ export default {
|
|
|
givePopShow:false,
|
|
|
giveNum:1,
|
|
|
modifyRemarkText:'',
|
|
|
+ updateItemRemarkText:'',
|
|
|
fhWlInfo:[],
|
|
|
fhWlNo:'',
|
|
|
fhWl:'顺丰',
|
|
|
fhWlFocus:false,
|
|
|
fhLabelShow:false,
|
|
|
- payDate:''
|
|
|
+ payDate:'',
|
|
|
+ currentItem:[]
|
|
|
};
|
|
|
},
|
|
|
onPullDownRefresh() {
|
|
|
@@ -564,6 +580,26 @@ export default {
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
+ beginUpdateItemRemark(info){
|
|
|
+ this.updateItemRemarkText = info.remark
|
|
|
+ this.currentItem = info
|
|
|
+ this.$refs.updateItemRemarkRef.open('center')
|
|
|
+ },
|
|
|
+ confirmItemRemarkModify(){
|
|
|
+ let that = this
|
|
|
+ uni.showLoading({mask:true})
|
|
|
+ updateRemarkItemFn({id: this.currentItem.id,remark:this.updateItemRemarkText}).then(res=>{
|
|
|
+ uni.hideLoading()
|
|
|
+ if(res.code == 1){
|
|
|
+ that.cancelItemRemarkModify()
|
|
|
+ that.$msg('修改成功')
|
|
|
+ that.init()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ cancelItemRemarkModify(){
|
|
|
+ this.$refs.updateItemRemarkRef.close()
|
|
|
+ },
|
|
|
cancelModify(){
|
|
|
this.$refs.modifyRemarkRef.close()
|
|
|
},
|