|
|
@@ -7,6 +7,28 @@
|
|
|
<div class="acea-row row-between row-bottom cart-left">
|
|
|
<div class="left-top">
|
|
|
<div v-if="checkOut == 0" class="cart">
|
|
|
+ <div v-if="staffInfo" class="title acea-row row-middle">
|
|
|
+ <div class="picture">
|
|
|
+ <img :src="staffInfo.avatar" v-if="staffInfo.avatar" />
|
|
|
+ <img src="../../assets/images/yonghu.png" alt="" v-else />
|
|
|
+ </div>`
|
|
|
+ <div class="text">
|
|
|
+ <div class="textCon line1">
|
|
|
+ <div class="text-wrap">
|
|
|
+ <div class="name-wrap">
|
|
|
+ <span class="name">{{ staffInfo.name || '请选择员工'}}</span>
|
|
|
+ <!-- <span v-if="userInfo.phone" class="phone mr10">手机号：{{ userInfo.phone }}</span> -->
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="switchs" trigger="click" @click="changeStaff(1)">
|
|
|
+ <a href="javascript:void(0)">
|
|
|
+ 选择员工
|
|
|
+ <Icon type="ios-arrow-down"></Icon>
|
|
|
+ </a>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div v-if="userInfo" class="title acea-row row-middle">
|
|
|
<div class="picture" @click="getUserDetail">
|
|
|
<img :src="userInfo.avatar" />
|
|
|
@@ -552,6 +574,10 @@
|
|
|
<div class="sure_btn" @click="checkUser()">确定</div>
|
|
|
</div>
|
|
|
</Modal>
|
|
|
+ <Modal v-model="modalStaff" :mask-closable="false" :scrollable="true" closable footer-hide title="员工列表"
|
|
|
+ width="950" class-name="user-modal">
|
|
|
+ <staffList v-if="modalStaff" ref="users" :uid="staffInfo.uid || 0" @getUserId="getStaffId"></staffList>
|
|
|
+ </Modal>
|
|
|
<!-- 会员详情-->
|
|
|
<user-details ref="userDetails" @operation="operation"></user-details>
|
|
|
</div>
|
|
|
@@ -564,7 +590,7 @@
|
|
|
import productAttr from "./components/productAttr";
|
|
|
import recharge from "@/components/recharge";
|
|
|
import activityCard from "@/components/activityCard";
|
|
|
- import userDetails from "@/components/userDetail/userDetails";
|
|
|
+ import userDetails from "@/components/userDetail/userDetails"; import staffList from "@/components/staffList";
|
|
|
import settleDrawer from "@/components/settleDrawer";
|
|
|
import "../../assets/js/core.js";
|
|
|
import {
|
|
|
@@ -611,9 +637,14 @@
|
|
|
activityCard,
|
|
|
userDetails,
|
|
|
settleDrawer,
|
|
|
+ staffList,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ modalStaff:false,
|
|
|
+ staffInfo: {
|
|
|
+ avatar: ''
|
|
|
+ },
|
|
|
formItem: {
|
|
|
price: 0,
|
|
|
},
|
|
|
@@ -894,6 +925,13 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ changeStaff() {
|
|
|
+ this.modalStaff = true;
|
|
|
+ },
|
|
|
+ getStaffId(e) {
|
|
|
+ this.modalStaff = false;
|
|
|
+ this.staffInfo = e
|
|
|
+ },
|
|
|
reloadList() {
|
|
|
this.reloading = true;
|
|
|
this.limitTemp = this.goodFrom.limit;
|
|
|
@@ -1305,7 +1343,11 @@
|
|
|
return this.$Message.error("您付款金额不足");
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
this.createOrder.tourist_uid = this.userInfo.touristId;
|
|
|
+ if(this.staffInfo.id){
|
|
|
+ this.createOrder.sale_uid = this.staffInfo.id
|
|
|
+ }
|
|
|
if (this.activityFrom.type == 5) {
|
|
|
this.createOrder.cart_id = [this.seckillOrderId];
|
|
|
this.createOrder.new = 1;
|
|
|
@@ -1315,7 +1357,9 @@
|
|
|
if (this.payType == "") {
|
|
|
this.createOrder.auth_code=payNum
|
|
|
}
|
|
|
- console.log( this.createOrder,' this.createOrder')
|
|
|
+ if (this.payType=='yue') {
|
|
|
+ this.createOrder.userCode=payNum
|
|
|
+ }
|
|
|
cashierCreate(this.userInfo.uid, this.createOrder)
|
|
|
.then((res) => {
|
|
|
console.log(res,'返回res')
|
|
|
@@ -3305,6 +3349,7 @@
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
height: 100%;
|
|
|
+ padding-top: 27px;
|
|
|
// max-width: 500px;
|
|
|
|
|
|
.title {
|
|
|
@@ -3553,7 +3598,7 @@
|
|
|
height: 90px;
|
|
|
background: rgba(255, 119, 0, 0.05);
|
|
|
border-radius: 10px;
|
|
|
- margin: 27px 24px 24px;
|
|
|
+ margin: 0px 24px 24px;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
flex-wrap: nowrap;
|
