结账

ghsApp/src/admin/billing/affirm.vue

@@ -244,7 +244,7 @@ export default {
       autoLoad: false,
       isBilling: true,
       staffList:[],
-			payWayList:[{name:"客服微信",id:0},{name:"现金",id:4},{name:"支付宝",id:1},{name:"银行卡",id:5}],
+			payWayList:[{name:"员工微信",id:0},{name:"现金",id:4},{name:"支付宝",id:1},{name:"银行卡",id:5}],
 			payWayindex:0,
       form: {
         shopId: "",

ghsApp/src/pages.json

@@ -322,7 +322,7 @@
 			"root": "pagesGys",
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "待结订单", "enablePullDownRefresh": true } },
-				{ "path": "details", "style": { "navigationBarTitleText": "结账单", "enablePullDownRefresh": true } }
+				{ "path": "details", "style": { "navigationBarTitleText": "待结订单", "enablePullDownRefresh": true } }
 			]
 		},
 		{

ghsApp/src/pagesGys/details.vue

@@ -43,7 +43,12 @@
 					<view class="num_bx">
 						<view class="flex">金额：{{selectTotalAmount}}</view>
 						<view class="flex">实付：<input @focus="modifyPrice = null" v-model="modifyPrice" type="digit"/></view>
-						<view class="flex">减免：{{(selectTotalAmount - modifyPrice).toFixed(2)}}</view>
+						<view class="flex">优惠：{{(selectTotalAmount - modifyPrice).toFixed(2)}}</view>
+						<view class="flex">支付：
+							<picker mode="selector" :value="payWay" :range="payWayList" range-key="name" @change="changePayWayFn" class="tui-input" >
+							<div style="border:1upx solid #CCCCCC;width:300upx;height:70upx;line-height:70upx;">{{ payWayData.name }}</div>
+							</picker>
+						</view>
 					</view>
 				</view>
 			</template>
@@ -72,7 +77,10 @@ export default {
 			modifyPrice:0,
 			searchTime:'',
 			startTime:'',
-			endTime:''
+			endTime:'',
+			payWayData:{name:"员工微信",id:0},
+			payWayList:[{name:"员工微信",id:0},{name:"现金",id:4},{name:"支付宝",id:1},{name:"银行卡",id:5}],
+			payWay:0
 		};
 	},
 	onPullDownRefresh() {
@@ -125,6 +133,11 @@ export default {
 		}
 	},
 	methods: {
+		changePayWayFn(e) {
+			let info = this.payWayList[e.detail.value]
+			this.payWay = info.id
+			this.payWayData = info
+		},
 		selectDateFn(val){
 			this.searchTime = val.searchTime
 			this.startTime = val.startTime
@@ -185,7 +198,6 @@ export default {
 			}
 		},
 		confirmClear(val) {
-			//取消
 			if(val.index == 0){
 				this.showClearModel = false
 				return false
@@ -201,15 +213,15 @@ export default {
 			let ids = this.selectList.map(ele => {
 				return {id:ele.id};
 			});
-			let parameter = {
+			let params = {
 				id:JSON.stringify(ids),
 				ghsId:this.ghsInfo.id,
-				modifyPrice:this.modifyPrice
+				modifyPrice:this.modifyPrice,
+				payWay:this.payWay
 			}
 			let that = this;
-
 			that.$util.confirmModal({content:'确认提交？'},() => {
-				clearOrderApi(parameter).then(ret=>{
+				clearOrderApi(params).then(ret=>{
 					if(ret.code == 1){
 						that.pageTo({url:'/common/success', type: 2,query:{titleType:1}})
 					}