负数订单

hdApp/src/admin/order/detail.vue

@@ -79,9 +79,8 @@
       <view class="module-com order-msg">
         <view class="module-tit">
           <text>订单信息</text>
-          <block v-if="orderInfo.payStatus == 1">
-            <text style="float:right;color: #3385ff;font-weight:normal;" v-if="orderInfo.onlinePay ==2 || orderInfo.payWay == 3" @click.stop="goRefund()">发起售后</text>
-            <text style="float:right;color: #3385ff;font-weight:normal;" v-else @click.stop="goRefund()">发起售后</text>
+          <block v-if="orderInfo.payStatus == 1 && orderInfo.forward == 0">
+            <text style="float:right;color: #3385ff;font-weight:normal;" @click.stop="goRefund()">发起售后</text>
           </block>
         </view>
         <view class="module-det">

hdApp/src/admin/order/refund.vue

@@ -263,8 +263,7 @@ export default {
 			uni.navigateBack({delta: 1});
 		},
 		askRefund(){
-			this.minusOrderRefund = 0
-			if(this.orderInfo.payWay == 3 && Number(this.refundMoney)>Number(this.orderInfo.remainDebtPrice)){
+			if(this.orderInfo.payWay == 3 && Number(this.orderInfo.remainDebtPrice)>0 && Number(this.refundMoney)>Number(this.orderInfo.remainDebtPrice)){
 				//如果退款金额大于剩余欠款，则提醒走开负数订单方式退款
 				this.$util.confirmModal({content:'售后金额超过剩余欠款，只能开负数订单方式售后'},() => {
 					this.minusOrderRefund = 1

hdApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -32,7 +32,7 @@
 								</view>
 								<view class="table-row table-row-extra" v-if="!$util.isEmpty(item.remark)">
 									<view class="table-cell cell-extra" :colspan="5">
-										<view class="remark-text">备注：{{ item.remark }}</view>
+										<view class="remark-text">{{ item.remark }}</view>
 									</view>
 								</view>
 							</view>
@@ -198,7 +198,7 @@
 					gap: 2upx;
 					
 					.remark-text {
-						color: #27c325;
+						color: #989494;
 					}
 				}
 			}