收款工具

components/cm-module/receipt/receipt-details.vue

@@ -41,7 +41,7 @@
 					剩余应收：<text class="text">￥{{ order.surplusAmount | NumFormat }}</text>
 				</view>
 				<view class="list-title-b-item ">
-					待审金额：<text class="text">￥{{ order.receiptAmount | NumFormat }}</text>
+					待审金额：<text class="text">￥{{ order.unCheckAmount | NumFormat }}</text>
 				</view>
 			</view>
 			<view class="list-title-b">

pages/relation/ordinary/examine-detail.vue

@@ -83,8 +83,15 @@
 						<view class="list-title-b">进度：<text
 								:style="{ color: formatColor(receiptInfo.receiptStatus) }">{{ receiptInfo.receiptStatusText }}</text>
 						</view>
-						<view class="list-title-b">确认人：<text class="text">正大单</text></view>
-						<view class="list-title-b">确认时间：<text class="text">{{ receiptInfo.confirmDate }}</text></view>
+						<view class="list-title-b">
+							确认人：
+							<text class="text">
+								{{ receiptInfo.confirmUserName ? receiptInfo.confirmUserName : '无' }}
+							</text>
+						</view>
+						<view class="list-title-b">
+							确认时间：<text class="text">{{ receiptInfo.confirmDate }}</text>
+						</view>
 					</view>
 				</view>
 				<view class="section-tips">注：款项和订单已确认关联,等待审核</view>

pages/relation/ordinary/index.vue

@@ -354,6 +354,7 @@ export default {
 						} else {
 							if (this.orderList.length < 3) {
 								this.pullUpOn = true
+								this.loadding = false
 							} else {
 								this.pullUpOn = false
 								this.loadding = false

pages/relation/refund/detail.vue

@@ -94,7 +94,7 @@
 									订单金额：<text class="text">￥{{ order.mainOrder.payTotalFee | NumFormat }}</text>
 								</view>
 								<view class="list-title-b-item ">
-									已收金额：<text class="text">￥{{ order.mainOrder.paidAmount | NumFormat }}</text>
+									已退金额：<text class="text">￥{{ order.shopRefundAmount | NumFormat }}</text>
 								</view>
 							</view>
 						</view>

pages/relation/refund/index.vue

@@ -79,7 +79,7 @@
 						v-model="listQuery.keyword"
 						confirm-type="search"
 						@confirm="subMitSearch"
-						placeholder="请输入供应商名称"
+						placeholder="搜索关键词(供应商名称/订单ID)"
 					/>
 					<text class="iconfont icon-sousuo"></text>
 				</view>
@@ -138,7 +138,7 @@
 											订单金额：<text class="text">￥{{ order.mainOrder.payTotalFee | NumFormat }}</text>
 										</view>
 										<view class="list-title-b-item ">
-											已收金额：<text class="text">￥{{ order.mainOrder.paidAmount | NumFormat }}</text>
+											已退金额：<text class="text">￥{{ order.shopRefundAmount | NumFormat }}</text>
 										</view>
 									</view>
 								</view>
@@ -284,6 +284,7 @@ export default {
 						} else {
 							if (this.orderList.length < 3) {
 								this.pullUpOn = true
+								this.loadding = false
 							} else {
 								this.pullUpOn = false
 								this.loadding = false

pages/relation/return/index.vue

@@ -293,6 +293,7 @@ export default {
 						} else {
 							if (this.orderList.length < 3) {
 								this.pullUpOn = true
+								this.loadding = false
 							} else {
 								this.pullUpOn = false
 								this.loadding = false

pages/relation/return/list.vue

@@ -127,7 +127,7 @@
 					<input 
 						class="input" 
 						:class="modal ? 'show' : 'none'"
-						type="number" 
+						type="text" 
 						placeholder="请输入口头约定佣金(必填)" 
 						@blur="changeNumber($event)" 
 						v-model="confirmParams.verbalAmount"