Merge branch 'master' of http://git.echepei.com/tire-platform/tire_parts_shop_applets

pages/views/salesSlip/index.vue

@@ -66,7 +66,7 @@
 						<view style="margin-bottom: 20rx;">
 							支付方式：<text style="color: #C4C4C4;">
 <!--              {{item.payType && item.payType.indexOf('01') != -1?'扫码支付':'微信支付'}}-->
-              {{ item.receivableType ? item.receivableType : '' }}
+              {{ item.businessSource === '额度支付' ? '额度支付' : (item.receivableType ? item.receivableType : '') }}
             </text>
 						</view>
 						<view>

pages/views/salesSlip/orderDetails.vue

@@ -201,7 +201,8 @@
 				})
 			} else {
 				appDetail({
-					id: onLoad.id
+					id: onLoad.id,
+          ordNo: onLoad.orderNo
 				}).then(res => {
 					this.form = res.data
 					this.form.orderItemsList.map(item => {
@@ -430,4 +431,4 @@
 		margin-bottom: 10rpx;
 		align-items: flex-end;
 	}
-</style>
+</style>