shish 3 سال پیش
والد
کامیت
987f69e3e6

+ 0 - 7
ghsPad/src/pages/home/components/cashConsole.vue

@@ -4,9 +4,6 @@
 	 <view class="active" 
 	 <view class="active" 
  style="background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;" 
  style="background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;" 
  @click="goSettleCommit">结算</view>
  @click="goSettleCommit">结算</view>
-	 <view class="active" 
- style="position:fixed;left:36upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:15upx;" 
- @click="gatheringFn()">收款</view>
     <view class="active" @click="clearItemFn">清空</view>
     <view class="active" @click="clearItemFn">清空</view>
 	<view class="active" @click="closeFn">取消</view>
 	<view class="active" @click="closeFn">取消</view>
 
 
@@ -167,10 +164,6 @@ export default {
 				}
 				}
 			})
 			})
 		},
 		},
-		gatheringFn(){
-			this.$util.hitVoice()
-			this.$refs.gatheringRef.open('center')
-		},
 		payFinish(){
 		payFinish(){
 			this.$util.hitVoice()
 			this.$util.hitVoice()
 			this.$refs.toPayRef.close()
 			this.$refs.toPayRef.close()

+ 1 - 1
ghsPad/src/pages/home/components/settlePop.vue

@@ -124,7 +124,7 @@ export default {
             },
             },
             proceeds: '0',
             proceeds: '0',
             hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'现金', id:3, }, { name:'更多', id:1, }],
             hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'现金', id:3, }, { name:'更多', id:1, }],
-            payWayList:[ { name:'店员微信', id:0 }, { name:'支付宝', id:1 },{name:'其它',id:9} ],
+            payWayList:[ { name:'员工微信', id:0 }, { name:'员工支付宝', id:1 },{name:'银行卡',id:5} ],
             currentInputType:'proceeds',
             currentInputType:'proceeds',
             totalMoney: 0,
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],

+ 1 - 1
hdPad/src/pages/home/components/settlePop.vue

@@ -124,7 +124,7 @@ export default {
             },
             },
             proceeds: '0',
             proceeds: '0',
             hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'现金', id:3, }, { name:'更多', id:1, }],
             hasPayList:[ { name:'扫码', id:0, },{ name:'欠款', id:2, },{ name:'现金', id:3, }, { name:'更多', id:1, }],
-            payWayList:[ { name:'店员微信', id:0 }, { name:'支付宝', id:1 },{name:'其它',id:9} ],
+            payWayList:[ { name:'员工微信', id:0 }, { name:'员工支付宝', id:1 },{name:'银行卡',id:5} ],
             currentInputType:'proceeds',
             currentInputType:'proceeds',
             totalMoney: 0,
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],