shish 3 gadi atpakaļ
vecāks
revīzija
7f10e221b4

+ 2 - 2
ghsApp/src/pagesPurchase/orderItem.vue

@@ -24,8 +24,8 @@
 					<text class="info-value" style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;width:300upx;">{{ info.adminName }} </text>
 					<text class="info-value" style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;width:300upx;">{{ info.adminName }} </text>
 				</view>
 				</view>
 				<view v-if="!$util.isEmpty(info.remark)" class="info-row">
 				<view v-if="!$util.isEmpty(info.remark)" class="info-row">
-					<text class="info-label" style="color:red;"> 备注:</text>
-					<text class="info-value" style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;width:450upx;color:red;">{{ info.remark }} </text>
+					<text class="info-label" style="color:red;font-weight:bold"> 备注:</text>
+					<text class="info-value" style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;width:450upx;color:red;font-weight:bold">{{ info.remark }} </text>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="item-price">¥{{ info.realPrice?parseFloat(info.realPrice):0 }} <text class="iconfont iconxiangyou"></text>
 			<view class="item-price">¥{{ info.realPrice?parseFloat(info.realPrice):0 }} <text class="iconfont iconxiangyou"></text>

+ 7 - 7
ghsApp/src/pagesPurchase/refundDetail.vue

@@ -11,18 +11,18 @@
 			<view>
 			<view>
 				<view class="list" v-for="(res,i) in product" :key="i">
 				<view class="list" v-for="(res,i) in product" :key="i">
 				<view class="flex list-title" >
 				<view class="flex list-title" >
-					{{res.name}} ¥{{parseFloat(res.unitPrice)}}*{{res.num}}{{res.unitName}}=¥{{parseFloat(res.price)}}
+					{{res.name}} ¥{{res.unitPrice?parseFloat(res.unitPrice):0}}*{{res.num}}{{res.unitName}}=¥{{parseFloat(res.price)}}
 				</view>
 				</view>
 			</view>
 			</view>
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="flex refund-item">
 		<view class="flex refund-item">
 			<view class="refund-label"><text></text>退款金额:</view>
 			<view class="refund-label"><text></text>退款金额:</view>
-			<view class="list">{{refundPrice}}</view>
+			<view class="list">{{refundPrice}}</view>
 		</view>
 		</view>
-		<view class=" refund-item">
-			<view class="refund-label">备注信息:</view>
-			<view class="list">{{remak}}</view>
+		<view class=" refund-item" v-if="!$util.isEmpty(remark)">
+			<view class="refund-label" style="color:red;font-weight:bold;">备注信息:</view>
+			<view class="list" style="color:red;font-weight:bold;">{{remark}}</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -44,8 +44,8 @@ export default {
 			getRefundFullInfo({ id: this.option.id }).then(res=>{
 			getRefundFullInfo({ id: this.option.id }).then(res=>{
 				this.product = res.data.itemList||[];
 				this.product = res.data.itemList||[];
 				this.refundType = res.data.info.refundType||0;
 				this.refundType = res.data.info.refundType||0;
-				this.refundPrice = res.data.info.refundPrice||0;
-				this.remark = res.data.info.remark;
+				this.refundPrice = res.data.info.refundPrice?parseFloat(res.data.info.refundPrice):0
+				this.remark = res.data.info.remark?res.data.info.remark:''
 			})
 			})
 		},
 		},
 	}
 	}

+ 1 - 1
ghsApp/src/pagesPurchase/refundList.vue

@@ -7,7 +7,7 @@
               <text>日期:{{item.addTime.substr(5,11)}}</text>
               <text>日期:{{item.addTime.substr(5,11)}}</text>
               <text>单号:{{item.refundSn}}</text>
               <text>单号:{{item.refundSn}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>操作:{{item.shopAdminName}}</text>
-              <text>备注:{{item.remark}}</text>
+              <text v-if="!$util.isEmpty(item.remark)" style="color:red;font-weight:bold;">备注:{{item.remark}}</text>
               <text style="position:absolute;right:-465upx;top:0upx;">{{ item.status==0?'退款中':item.status==1?'已完成':'退款中' }}</text>
               <text style="position:absolute;right:-465upx;top:0upx;">{{ item.status==0?'退款中':item.status==1?'已完成':'退款中' }}</text>
           </view>
           </view>
           <view class="flex val">¥{{parseFloat(item.refundPrice)}} <view class="iconfont iconxiangyou"></view> </view>
           <view class="flex val">¥{{parseFloat(item.refundPrice)}} <view class="iconfont iconxiangyou"></view> </view>