线下线上

hdApp/src/admin/billing/affirm.vue

@@ -40,23 +40,29 @@
 					</view>
 				</view>
 				<view class="module-com input-line-wrap">
-					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 						<view class="tui-title ">客户</view>
-						<view class="tui-input" v-if="clientInfo.id" @click="showCustomer = true">{{ clientInfo.name }}</view>
-						<view class="tui-placeholder" style="width: 100%" v-else @click="showCustomer = true">请选择客户</view>
+						<view class="tui-input" v-if="clientInfo.id">{{ clientInfo.name }}</view>
+						<view class="tui-placeholder" style="width: 100%" v-else>游客</view>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title ">付款方式</view>
-						<button class="admin-button-com mini-btn" :class="payType==res.id?'blue':'default'" 
-						style="margin-right: 10upx" @tap="payType=res.id"  v-for="(res,i) in getDictionariesInfo.htPayWayOption" :key="i">
-							{{ res.name }}
-						</button>
+						<view class="tui-title">结账方式</view>
+						<button @tap="hasPay = 1" class="admin-button-com middle" :class="hasPay == 1 ? 'blue' : 'default'">线下</button>
+						<button @click="hasPay = 2" class="admin-button-com middle" :class="hasPay == 2 ? 'blue' : 'default'">欠款</button>
+					</tui-list-cell>
+
+					<tui-list-cell class="line-cell" :arrow="true" v-if="hasPay == 1">
+						<div class="tui-title">线下方式</div>
+						<picker mode="selector" :value="payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
+						<input v-model="payWay" name="payWay" type="text" hidden />
+						<div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
+						</picker>
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title ">包装费</view>
-						<input type="number" placeholder="人工和材料费，选填" @input="countAllPrices()" v-model="packingMoney" placeholder-class="tui-placeholder">
+						<input type="number" placeholder="包装和资材费" @input="countAllPrices()" v-model="packingMoney" placeholder-class="tui-placeholder">
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
@@ -136,12 +142,15 @@ export default {
 			packingMoney:'',//包装费
 			freight:'',//运费
 			modifyPrice:0,//真实金额
-			payType:0,//支付类型
+			payWay:0,//支付类型
 			clientInfo: '',//客户信息
 			showCustomer: false,
 			sendType:1,
 			discountIndex:0,
-			discount:['打折','95折','9折','85折','8折','75折','7折','65折','6折']
+			discount:['打折','95折','9折','85折','8折','75折','7折','65折','6折'],
+			payWayList:[{name:"员工微信",id:0},{name:"员工支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
+			payWayindex:0,
+			hasPay:1
 		};
 	},
 	onLoad() {
@@ -228,11 +237,11 @@ export default {
 				packingFee:packingFee,
 				sendCost:this.freight,
 				customId:this.clientInfo.id,
-				payWay:this.payType,
+				payWay:this.payWay,
 				sendType:this.sendType,
 				modifyPrice: this.modifyPrice,
 				product:JSON.stringify(product),
-				hasPay:1
+				hasPay:this.hasPay
 			};
 			let that = this;
 			uni.showModal({

hdApp/src/admin/order/workOrder.vue

@@ -34,12 +34,12 @@
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">收款方式</view>
-            <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">已收款</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
             <button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">记欠款</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1 && form.fromType == 3">
-            <view class="tui-title">收款渠道</view>
+            <view class="tui-title">线下渠道</view>
             <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
               <input v-model="form.payWay" name="payWay" type="text" hidden />
               <view style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</view>
@@ -114,7 +114,7 @@ export default {
       },
       goodsPrice:'',
 			payWayindex:0,
-			payWayList:[{name:"本机微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
+			payWayList:[{name:"员工微信",id:0},{name:"员工支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
       kindListData:[],
       kindSelectedData:{},
       currentImgData:[],