shish 3 лет назад
Родитель
Сommit
2f790d9747

+ 5 - 5
ghsApp/src/pagesOrder/refundDetail.vue

@@ -11,18 +11,18 @@
 			<view>
 				<view class="list" v-for="(res,i) in product" :key="i">
 				<view class="flex list-title" >
-					{{res.name}} ¥{{parseFloat(res.xhUnitPrice)}}*{{res.xhNum}}{{res.xhUnitName}}=¥{{parseFloat(res.xhPrice)}}
+					{{res.name}} ¥{{parseFloat(res.xhUnitPrice)}} x {{res.xhNum}}{{res.xhUnitName}} = ¥{{parseFloat(res.xhPrice)}}
 				</view>
 			</view>
 			</view>
 		</view>
 		<view class="flex refund-item">
 			<view class="refund-label"><text></text>退款金额:</view>
-			<view class="list">{{refundPrice}}</view>
+			<view class="list">¥{{refundPrice}}</view>
 		</view>
 		<view class=" refund-item">
 			<view class="refund-label">备注信息:</view>
-			<view class="list">{{remak}}</view>
+			<view class="list">{{remark}}</view>
 		</view>
 	</view>
 </template>
@@ -44,8 +44,8 @@ export default {
 			refundDetail({ id: this.option.id }).then(res=>{
 				this.product = res.data.itemList||[];
 				this.refundType = res.data.info.refundType||0;
-				this.refundPrice = res.data.info.refundPrice||0;
-				this.remark = res.data.remark;
+				this.refundPrice = res.data.info.refundPrice ? parseFloat(res.data.info.refundPrice) : 0
+				this.remark = res.data.info.remark;
 			})
 
 		},

+ 1 - 0
ghsApp/src/pagesOrder/refundList.vue

@@ -8,6 +8,7 @@
               <text>单号:{{item.orderSn}}</text>
               <text>操作:{{item.shopAdminName}}</text>
               <text>类型:{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
+              <text v-if="!$util.isEmpty(item.remark)">备注:{{item.remark}}</text>
 
               <text style="position:absolute;right:-425upx;top:0upx;">{{ item.status==0?'退款中':item.status==1?'已完成':'退款中' }}</text>    
 

+ 6 - 10
hdApp/src/pagesPurchase/refundDetail.vue

@@ -32,21 +32,17 @@
 				<div class="module-com input-line-wrap">
 
 					<tui-list-cell class="line-cell" :hover="false">
-						<div class="tui-title">退款金额</div>
+						<div class="tui-title">金额</div>
             <div class="detail-price_box red">¥{{ refundPrice }}</div>
 					</tui-list-cell>
 
-				</div>
-			</view>
-
-      <view v-if="detailInfo.remark !=''" class="content-box price-detail">
-        <div class="module-com input-line-wrap">
-          <tui-list-cell class="line-cell" :hover="false" >
+          <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.remark !=''">
             <div class="tui-title">备注</div>
-            <input :disabled="true" v-model="refundData.info.remark" placeholder-class="phcolor" class="tui-input" name="name" maxlength="50" type="text" />
+            <div class="detail-price_box">{{ refundData.info.remark }}</div>
           </tui-list-cell>
-        </div>
-      </view>
+
+				</div>
+			</view>
 
     </view>
   </view>