Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/home/workbench.vue

@@ -32,7 +32,6 @@
 				</navigator>
 			</div>
 		</div>
-
 		<div class="module-com order-wrap">
 			<div class="total-blo">
 				<div class="total-list"> 
@@ -49,7 +48,7 @@
 				</div>
 			</div>
 			<div style="text-align:center;padding-bottom:12upx;color:#666666;font-size:25upx;">
-				<text>实收总计 {{countStat.actTotalCount}}笔 ¥{{countStat.actTotalIncome}}</text>
+				<text style="margin-right:10upx;">实收总计 {{countStat.actTotalCount}}笔 ¥{{countStat.actTotalIncome}}</text> | 今日欠款 ¥{{todayDebt}} | 总欠款 ¥{{}}
 			</div>
 		</div>
 

hdPad/src/pages/home/components/settlePop.vue

@@ -1,23 +1,15 @@
 <template>
     <view class="app-select_customer">
         <view class="select-left">
-
             <view class="select-item_box">
-                <view class="title">来源</view>
-                <view class="item-list_box">
-                    <view :key="item.id" @tap="changeFromType(item.id)" v-for="item in fromTypeList" :class="[form.fromType===item.id?'active':'']"> {{item.name}} </view>     
-                </view>
-            </view>
-
-            <view class="select-item_box">
-                <view class="title">付款类型</view>
+                <view class="title">结账方式</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changeHasPay(item.id)" v-for="item in hasPayList" :class="[form.hasPay===item.id?'active':'']"> {{item.name}} </view>    
                 </view>
             </view>
             
             <view class="select-item_box" v-if="form.hasPay == 1">
-                <view class="title">付款方式</view>
+                <view class="title">收款方式</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changePayWay(item.id)" v-for="item in payWayList" :class="[form.payWay===item.id?'active':'']"> {{item.name}} </view>  
                 </view>
@@ -94,16 +86,14 @@ export default {
                 remark:'',
                 sendCost:0,
                 modifyPrice:0,
-                getStaffName:'',
-                fromType:1
+                getStaffName:''
             },
             proceeds: '0',
-            hasPayList:[ { name:'扫码', id:0, }, { name:'其它', id:1, }],
+            hasPayList:[ { name:'待付款', id:0, }, { name:'已付款', id:1, }],
             payWayList:[ { name:'微信', id:0 }, { name:'支付宝', id:1 }, { name:'现金', id:4 }, { name:'银行卡', id:5 },{name:'其它',id:9} ],
             currentInputType:'proceeds',
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
-            fromTypeList:[{name:'门店',id:1},{name:'美团',id:4}],
             getStaffList:[]
         };
     },
@@ -169,9 +159,6 @@ export default {
         changeHasPay(val){
             this.form.hasPay = val
         },
-        changeFromType(val){
-            this.form.fromType = val
-        },
         changeCheck(val){
             this.checkType = val
             this.fillType = val