Merge branch 'master' into minus

ghsApp/src/admin/stat/kdIncome.vue

@@ -30,6 +30,15 @@
 							</t-td>
 						</t-tr>
 
+						<t-tr v-if="Number(payCodeIncome)>0">
+							<t-td align="center">
+								<view style="font-weight:bold;color:red;font-size:30upx;">
+									以上收入还要减掉收款码收入的 ￥{{ payCodeIncome }}
+								</view>
+							</t-td>
+						</t-tr>
+						
+
 						<view v-if="!$util.isEmpty(staffAmountList)">
 							<t-tr>
 								<t-td></t-td>
@@ -129,6 +138,7 @@ export default {
 			},
 			profile:[],
 			totalIncome:0,
+			payCodeIncome:0,
 			showDetailPop:false,
 			detailItem:[],
 			staffAmountList:[]
@@ -181,6 +191,7 @@ export default {
 				uni.hideLoading()
 				that.profile = res.data.list||[]
 				that.totalIncome = res.data.totalIncome
+				that.payCodeIncome = res.data.payCodeIncome ? parseFloat(res.data.payCodeIncome) : 0
 				that.staffAmountList = res.data.staffAmountList
 			})
 		}

ghsApp/src/admin/stat/profit.vue

@@ -32,6 +32,15 @@
 								<view style="font-weight:bold;color:black;font-size:32upx;">利润 ¥{{profit.balance||0}}</view>
 							</t-td>
 						</t-tr>
+						<block v-if="Number(profit.payCodeIncome)>0">
+							<t-tr>
+								<t-td align="center">
+									<view style="font-weight:bold;color:red;font-size:30upx;">
+										以上利润还要减掉收款码收入的 ￥{{ profit.payCodeIncome }}
+									</view>
+								</t-td>
+							</t-tr>
+						</block>
 						<block v-if="profit.wastagePrice && Number(profit.wastagePrice)>0">
 							<t-tr>
 								<t-td align="center">

mallApp/src/pages/home/recent.vue

@@ -31,6 +31,9 @@
                     <view class="popup-item" @click="getRechargeList(item)">
                       <text>充值记录</text>
                     </view>
+                    <view class="popup-item" @click="toPay(item)">
+                      <text>付款</text>
+                    </view>
                     <view class="popup-item" @click="hideMoreOptions()">
                       <text>取消</text>
                     </view>
@@ -209,6 +212,10 @@ export default {
     hideMoreOptions() {
       this.activePopupIndex = -1;
     },
+    toPay(item){
+      this.hideMoreOptions()
+      this.pageTo({ url:'/pages/pay/index?account='+item.shopId+'&hdId='+item.id+'&hdName='+item.name+'&store=0&fromType=3'})
+    },
     getRechargeList(item){
       this.hideMoreOptions()
       this.pageTo({ url:'/pages/recharge/list?account='+item.shopId+'&hdId='+item.id+'&hdName='+item.name})

mallApp/src/pages/pay/index.vue

@@ -172,7 +172,8 @@
 					needSend: this.tabIndex == 0 ? '0' : '1',
 					prePrice: this.amount,
 					payWay: this.form.payWay,
-					payPassword:this.modalForm.payPassword
+					payPassword:this.modalForm.payPassword,
+					repeat:1
 				}
 				if (this.tabIndex == 1) {
 					let deliveryForm = this.$refs.appDelivery.form ? this.$refs.appDelivery.form : {}