负数订单

hdApp/src/admin/home/order.vue

@@ -31,7 +31,7 @@
           <view class="list-bottom" style="padding-top:0upx;">
             <view style="border-bottom:1upx solid #EEEEEE;padding-bottom:8upx;">
               <span v-if="item.sendCost > 0" class="freight-text">运费 ￥{{ item.sendCost ? parseFloat(item.sendCost) : 0 }}</span>
-              <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
+              <span class="app-size-30 app-bold">{{item.forward==0?'':'-'}}¥{{ item.orderPrice ? parseFloat(item.orderPrice) :0 }}</span>
             </view>
 
         <view v-if="item.sameTimeIdsNum && item.sameTimeIdsNum>1" style="text-align: center;color:white;

hdApp/src/admin/order/detail.vue

@@ -183,7 +183,7 @@
             </view>
             <view class="msg-list">
               <view class="label">实际：</view>
-              <view class="value">￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}</view>
+              <view class="value">{{orderInfo.forward==0?'':'-'}}￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}</view>
             </view>
           </view>
         </view>

hdApp/src/admin/order/refund.vue

@@ -371,7 +371,12 @@ export default {
 			refund(refundParams).then(res => {
 				uni.hideLoading()
 				if(res.code == 1){
-					this.$util.pageTo({url:'/common/success',query:{titleType:1},type:2})
+					if(res.data.forward && res.data.forward == 1){
+						let orderId = res.data.orderId?res.data.orderId:0
+						this.$util.pageTo({url:'/admin/billing/remind?orderId='+orderId,type:2})
+					}else{
+						this.$util.pageTo({url:'/common/success',query:{titleType:1},type:2})
+					}
 				}
 			})
 		},

mallApp/src/pages/order/detail.vue

@@ -82,7 +82,7 @@
             </div>
             <div class="msg-list">
               <div class="label">合计</div>
-              <div class="value">￥{{ data.orderPrice?parseFloat(data.orderPrice):0 }}</div>
+              <div class="value">{{data.forward==0?'':'-'}}￥{{ data.orderPrice?parseFloat(data.orderPrice):0 }}</div>
             </div>
 
             <div class="msg-list" v-if="Number(data.remainDebtPrice)>0">
@@ -112,11 +112,11 @@
       </block>
     </div>
     <div class="page-btn app-footer">
-      <div class="flex-center">
-        <span>金额</span>
-        <span class="app-price">
-          <span>￥</span>
-          <span class="app-size-40">{{ data.actPrice?parseFloat(data.actPrice):0 }}</span>
+      <div class="flex-center" style="align-items: center; display: flex;">
+        <span style="font-size:40upx; line-height: 1;"></span>
+        <span class="app-price" style="display: flex; align-items: center;">
+          <span style="font-size:40upx; line-height: 1;color:black;">金额{{data.forward==0?'':'-'}}￥</span>
+          <span style="font-size:40upx; line-height: 1;color:black;">{{ data.actPrice?parseFloat(data.actPrice):0 }}</span>
         </span>
       </div>
       <template v-if="data.status == 1">

mallApp/src/pages/order/list.vue

@@ -1,24 +1,21 @@
 <template>
   <view class="order-page">
     <app-tabs :tabs="tabs" :isFixed="true" :currentTab="tabIndex" @change="changeTab" itemWidth="20%"/>
-
-			<view style="margin-left:60upx;margin-top:110upx;padding-bottom:30upx;position: relative;">
-				<DateSelect @selectDateFn="selectDateFn" defaultShowName='时间' />
-        <button class="admin-button-com mini-btn blue" style="position: absolute;right:300upx;top:-8upx;" @click="selGhs()">{{ ghsName==''?'选花店':ghsName }}</button>
-        <button class="admin-button-com mini-btn blue" style="position: absolute;right:80upx;top:-8upx;" @click="resetSearch()">重置搜索</button>
-			</view>
-
-    <block v-if="!$util.isEmpty(list.data)">
-    <view class="pay_list">
-        <OrderItem v-for="(item, index) in list.data" :key="index" :info="item" @click="goToDetail"></OrderItem>
+    <view style="margin-left:60upx;margin-top:110upx;padding-bottom:30upx;position: relative;">
+      <DateSelect @selectDateFn="selectDateFn" defaultShowName='时间' />
+      <button class="admin-button-com mini-btn blue" style="position: absolute;right:300upx;top:-8upx;" @click="selGhs()">{{ ghsName==''?'选花店':ghsName }}</button>
+      <button class="admin-button-com mini-btn blue" style="position: absolute;right:80upx;top:-8upx;" @click="resetSearch()">重置搜索</button>
     </view>
+    <block v-if="!$util.isEmpty(list.data)">
+      <view class="pay_list">
+          <OrderItem v-for="(item, index) in list.data" :key="index" :info="item" @click="goToDetail"></OrderItem>
+      </view>
     </block>
     <block v-else>
-    <view>
-      <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)"/>
-    </view>
+      <view>
+        <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)"/>
+      </view>
     </block>
-
   </view>
 </template>
 <script>

mallApp/src/pages/order/orderItem.vue

@@ -43,13 +43,11 @@
         </view>
       </view>
       <view class="item-price">
-        
-            <view v-if="info.orderPrice == info.actPrice">¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</view>
-            <view v-else>
-              <text style="text-decoration: line-through;color:#847676;">¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</text>
-              <text style="margin-left:10upx;">¥{{ info.actPrice ? parseFloat(info.actPrice):0 }}</text>
-            </view>
-
+          <view v-if="info.orderPrice == info.actPrice">{{info.forward==0?'':'-'}}¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</view>
+          <view v-else>
+            <text style="text-decoration: line-through;color:#847676;">¥{{ info.orderPrice ? parseFloat(info.orderPrice):0 }}</text>
+            <text style="margin-left:10upx;">{{info.forward==0?'':'-'}}¥{{ info.actPrice ? parseFloat(info.actPrice):0 }}</text>
+          </view>
         <text class="iconfont iconxiangyou"></text>
       </view>
     </view>