'!'
This commit is contained in:
@@ -1142,32 +1142,42 @@ export default {
|
||||
console.log('to,,,上传的数据',to)
|
||||
let storeID = +to[0]['门店ID']
|
||||
let arr = []
|
||||
let skus = []
|
||||
let currentNameID = to[0]['skuNameID']
|
||||
to.forEach((item,index) => {
|
||||
if(item['skuName新价格(单位:元)']){
|
||||
console.log('item,999999999999',item)
|
||||
arr.push({
|
||||
nameID:+item['skuNameID'],
|
||||
unitPrice:Math.round(Number(item['skuName新价格(单位:元)']) * 100)
|
||||
if(item['skuName新价格(单位:元)'] && item['skuName新价格(单位:元)'] !== item['skuName价格(单位:元)']){
|
||||
let findIndex = arr.findIndex(i => '' + i.nameID === item['skuNameID'])
|
||||
if(findIndex === -1){
|
||||
arr.push({
|
||||
nameID:+item['skuNameID'],
|
||||
unitPrice:Math.round(Number(item['skuName新价格(单位:元)']) * 100),
|
||||
})
|
||||
}else{
|
||||
arr[findIndex].unitPrice = Math.round(Number(item['skuName新价格(单位:元)']) * 100)
|
||||
}
|
||||
}
|
||||
|
||||
if(item['新库存'] !== ''){
|
||||
let findIndex = arr.findIndex(i => '' + i.nameID === item['skuNameID'])
|
||||
if(currentNameID !== item['skuNameID']){
|
||||
// console.log('走的if')
|
||||
skus = []
|
||||
this.currentNameID = item['skuNameID']
|
||||
}
|
||||
// else{
|
||||
// console.log('走的else')
|
||||
// }
|
||||
skus.push({
|
||||
skuID:+item['京西skuID'],
|
||||
stock:+item['新库存'],
|
||||
IsSale:+item['新库存'] === 0 ? -1 : +item['可售状态']
|
||||
})
|
||||
// updateStoreSkus(
|
||||
// item['门店ID'],
|
||||
// arr,
|
||||
// (res) => {
|
||||
// if (res.code === "0") {
|
||||
// // 成功
|
||||
// this.$message({
|
||||
// message: "修改价格成功",
|
||||
// type: "success",
|
||||
// center: true,
|
||||
// });
|
||||
// }
|
||||
// // if (item.id) {
|
||||
// // this.$refs[item.id] && this.$refs[item.id].doClose(); // 关闭
|
||||
// // }
|
||||
// this.getGoods();
|
||||
// },
|
||||
// { causeFlag: 16 }
|
||||
// );
|
||||
if(findIndex === -1){
|
||||
arr.push({
|
||||
nameID:+item['skuNameID'],
|
||||
Skus:skus
|
||||
})
|
||||
}else arr[findIndex].Skus = skus
|
||||
}
|
||||
})
|
||||
// console.log(storeID,'item,999999999999,99999999**********',arr)
|
||||
@@ -1309,76 +1319,81 @@ export default {
|
||||
let excelData = [];
|
||||
res.forEach((skuName) => {
|
||||
// console.log('skuName',skuName)
|
||||
let json = {};
|
||||
json["门店名称"] = skuName.storeName;
|
||||
json["门店ID"] = skuName.storeID;
|
||||
// json["京西skuID"] = sku.id;
|
||||
json["skuNameID"] = skuName.id;
|
||||
json["商品名称"] = skuName.name;
|
||||
// json["Upc"] = skuName.Upc;
|
||||
json["全国中位价(单位:元)"] = (skuName.realMidUnitPrice / 100).toFixed(2) + '';
|
||||
json["skuName价格(单位:元)"] =( skuName.unitPrice / 100).toFixed(2) + '';
|
||||
json['skuName新价格(单位:元)'] = ""
|
||||
// let json = {};
|
||||
// json["门店名称"] = skuName.storeName;
|
||||
// json["门店ID"] = skuName.storeID;
|
||||
// // json["京西skuID"] = sku.id;
|
||||
// json["skuNameID"] = skuName.id;
|
||||
// json["商品名称"] = skuName.name;
|
||||
// // json["Upc"] = skuName.Upc;
|
||||
// json["全国中位价(单位:元)"] = (skuName.realMidUnitPrice / 100).toFixed(2) + '';
|
||||
// json["skuName价格(单位:元)"] =( skuName.unitPrice / 100).toFixed(2) + '';
|
||||
// json['skuName新价格(单位:元)'] = ""
|
||||
|
||||
|
||||
// skuName.skus.forEach((sku) => {
|
||||
// let catName = [];
|
||||
// const catL2 = this.cats.find(
|
||||
// (item) => item.id === skuName.categoryID
|
||||
// );
|
||||
// if (catL2) {
|
||||
// catName.unshift(catL2.name);
|
||||
// if (catL2.parentID) {
|
||||
// const catL1 = this.cats.find(
|
||||
// (item) => item.id === catL2.parentID
|
||||
// );
|
||||
// if (catL1) catName.unshift(catL1.name);
|
||||
// }
|
||||
// }
|
||||
// let json = {};
|
||||
// json["门店名称"] = skuName.storeName;
|
||||
// json["门店ID"] = skuName.storeID;
|
||||
// json["京西skuID"] = sku.id;
|
||||
// json["skuNameID"] = sku.nameID;
|
||||
// json["商品名称"] = skuName.name;
|
||||
// // json["Upc"] = skuName.Upc;
|
||||
// json["全国中位价(单位:元)"] = skuName.realMidUnitPrice / 100;
|
||||
// json["skuName价格(单位:元)"] = skuName.unitPrice / 100;
|
||||
// json['skuName新价格(单位:元)'] = ""
|
||||
// // json["sku后缀名"] = sku.comment;
|
||||
// // json["京西分类"] = catName.join(",");
|
||||
// // json["淘宝闪购skuID"] = sku.ebaiID;
|
||||
// // json["淘宝闪购同步状态"] = sku.ebaiSyncStatus;
|
||||
// // json["京东skuID"] = sku.jdID;
|
||||
// // json["京东同步状态"] = sku.jdSyncStatus;
|
||||
// // json["美团skuID"] = sku.mtwmID;
|
||||
// // json["美团同步状态"] = sku.mtwmSyncStatus;
|
||||
// // // json["京狗skuID"] = sku.jdsID;
|
||||
// // // json["京狗同步状态"] = sku.jdsSyncStatus;
|
||||
// // json["商品规格"] = skuName.unit;
|
||||
// // json["商品库存"] = sku.stock;
|
||||
// // json["商品货架码"] = sku.locationCode && sku.locationCode !== 'EMPTY_VALUE' ? sku.locationCode : '';
|
||||
// // json["价格(单位:分)"] = sku.price;
|
||||
// // json["京西平台价(单位:分)"] = sku.jxPrice;
|
||||
// // json["京东平台价(单位:分)"] = sku.jdPrice;
|
||||
// // json["美团平台价(单位:分)"] = sku.mtwmPrice;
|
||||
// // json["淘宝闪购平台价(单位:分)"] = sku.ebaiPrice;
|
||||
// // json["抖店平台价(单位:分)"] = sku.ybPrice;
|
||||
// // // json["京狗平台价(单位:分)"] = sku.jdsPrice;
|
||||
// // json["规格数值"] = sku.specQuality;
|
||||
// // json["规格单位"] = sku.specUnit;
|
||||
// // json["门店可售状态"] = sku.storeSkuStatus ? "可售" : "不可售";
|
||||
// // json["商品库可售状态"] = sku.status ? "可售" : "不可售";
|
||||
// // json["最后操作时间"] = new Date(sku.updatedAt).toLocaleString();
|
||||
// // json["最后操作人"] = sku.lastOperator;
|
||||
// // json["京东同步标识"] = this.dealSyncStatus(sku.jdSyncStatus);
|
||||
// // json["美团同步标识"] = this.dealSyncStatus(sku.mtwmSyncStatus);
|
||||
// // json["淘宝闪购同步标识"] = this.dealSyncStatus(sku.ebaiSyncStatus);
|
||||
skuName.skus.forEach((sku) => {
|
||||
console.log('sku',sku,'库存',sku.stock)
|
||||
let catName = [];
|
||||
const catL2 = this.cats.find(
|
||||
(item) => item.id === skuName.categoryID
|
||||
);
|
||||
if (catL2) {
|
||||
catName.unshift(catL2.name);
|
||||
if (catL2.parentID) {
|
||||
const catL1 = this.cats.find(
|
||||
(item) => item.id === catL2.parentID
|
||||
);
|
||||
if (catL1) catName.unshift(catL1.name);
|
||||
}
|
||||
}
|
||||
let json = {};
|
||||
json["门店名称"] = skuName.storeName;
|
||||
json["门店ID"] = skuName.storeID;
|
||||
json["skuNameID"] = sku.nameID;
|
||||
json["商品名称"] = skuName.name;
|
||||
json["京西skuID"] = sku.id;
|
||||
json["可售状态"] = sku.storeSkuStatus;
|
||||
// json["Upc"] = skuName.Upc;
|
||||
json["全国中位价(单位:元)"] = skuName.realMidUnitPrice / 100;
|
||||
json["skuName价格(单位:元)"] = skuName.unitPrice / 100;
|
||||
json['skuName新价格(单位:元)'] = ""
|
||||
json['原库存'] = sku.stock
|
||||
json['新库存'] = ''
|
||||
// json["sku后缀名"] = sku.comment;
|
||||
// json["京西分类"] = catName.join(",");
|
||||
// json["淘宝闪购skuID"] = sku.ebaiID;
|
||||
// json["淘宝闪购同步状态"] = sku.ebaiSyncStatus;
|
||||
// json["京东skuID"] = sku.jdID;
|
||||
// json["京东同步状态"] = sku.jdSyncStatus;
|
||||
// json["美团skuID"] = sku.mtwmID;
|
||||
// json["美团同步状态"] = sku.mtwmSyncStatus;
|
||||
// // json["京狗skuID"] = sku.jdsID;
|
||||
// // json["京狗同步状态"] = sku.jdsSyncStatus;
|
||||
// json["商品规格"] = skuName.unit;
|
||||
// json["商品库存"] = sku.stock;
|
||||
// json["商品货架码"] = sku.locationCode && sku.locationCode !== 'EMPTY_VALUE' ? sku.locationCode : '';
|
||||
// json["价格(单位:分)"] = sku.price;
|
||||
// json["京西平台价(单位:分)"] = sku.jxPrice;
|
||||
// json["京东平台价(单位:分)"] = sku.jdPrice;
|
||||
// json["美团平台价(单位:分)"] = sku.mtwmPrice;
|
||||
// json["淘宝闪购平台价(单位:分)"] = sku.ebaiPrice;
|
||||
// json["抖店平台价(单位:分)"] = sku.ybPrice;
|
||||
// // json["京狗平台价(单位:分)"] = sku.jdsPrice;
|
||||
// json["规格数值"] = sku.specQuality;
|
||||
// json["规格单位"] = sku.specUnit;
|
||||
// json["门店可售状态"] = sku.storeSkuStatus ? "可售" : "不可售";
|
||||
// json["商品库可售状态"] = sku.status ? "可售" : "不可售";
|
||||
// json["最后操作时间"] = new Date(sku.updatedAt).toLocaleString();
|
||||
// json["最后操作人"] = sku.lastOperator;
|
||||
// json["京东同步标识"] = this.dealSyncStatus(sku.jdSyncStatus);
|
||||
// json["美团同步标识"] = this.dealSyncStatus(sku.mtwmSyncStatus);
|
||||
// json["淘宝闪购同步标识"] = this.dealSyncStatus(sku.ebaiSyncStatus);
|
||||
|
||||
// excelData.push(json);
|
||||
// });
|
||||
excelData.push(json);
|
||||
excelData.push(json);
|
||||
});
|
||||
// excelData.push(json);
|
||||
});
|
||||
console.log(res,'打印下载表格的数据',excelData)
|
||||
json2Excel(excelData, fileName);
|
||||
});
|
||||
},
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-container class="chatContainer">
|
||||
<div v-if="allUser.length === 0"
|
||||
class="emptyText"
|
||||
>暂无消息~~</div>
|
||||
<!-- <el-container class="chatContainer"> -->
|
||||
<!-- {{ allUserList }} -->
|
||||
<!-- <el-aside width="600px" class="userList">
|
||||
<div v-for="(item,index) in allUserList" :key="index" class="chatItem" @click="queryDetailBut(item)"
|
||||
@@ -26,102 +29,124 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-aside> -->
|
||||
<el-row class="tac" style="width: 500px;">
|
||||
<el-col :span="12">
|
||||
<div v-if="allUser.length !== 0" style="display: flex;">
|
||||
<div style="width: 500px;box-sizing: border-box;">
|
||||
<div
|
||||
v-for="(item,index) in allUser" :key="index"
|
||||
style="display: flex;width: 500px;align-items: center; justify-content: center"
|
||||
@click="queryDetailBut(item,false,'click')"
|
||||
:style="{
|
||||
'backgroundColor':item.userID === '' + currentUser.userID ? 'rgb(244 244 244)' : '',
|
||||
'border-bottom':'1px solid #eee',
|
||||
'padding':'10px'
|
||||
}">
|
||||
<div class="avatar">
|
||||
<img
|
||||
:src="item.vendorID === 1 ? 'https://image.jxc4.com/image/75654ab606494a0efdb0cf7d7ad060d9.png': item.vendorID === 3 ? 'https://image.jxc4.com/image/06a27a6503a6695824bf361ded5f1d45.png' : 'https://image.jxc4.com/image/884664b80ffd2eda64a4aab9f4dc402e.png'" mode="aspectFill" alt=""
|
||||
style="width: 50px;height: 50px;"
|
||||
/>
|
||||
</div>
|
||||
<div style="margin-left: 10px;">
|
||||
<div class="titleText" style="width:300px">
|
||||
{{ item.userID + `【${item.storeInfo ? item.storeInfo.name + '(' + item.storeInfo.id +')' : '' }】` }}
|
||||
</div>
|
||||
<div class="latestMsg">{{ item.latestMsg }}</div>
|
||||
</div>
|
||||
<div style="width: fit-content;white-space: nowrap;margin-left: 10px;">{{ item.latestTime.substring(5) }}</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- <el-menu
|
||||
style="width: 500px;"
|
||||
:default-active="'1'"
|
||||
class="el-menu-vertical-demo">
|
||||
<el-submenu index="1">
|
||||
<template slot="title">
|
||||
<img :src="'https://image.jxc4.com/image/75654ab606494a0efdb0cf7d7ad060d9.png'" style="width: 50px;height: 50px;"></img>
|
||||
<span style="font-size: 32px;font-weight: bold;">【美团】</span>
|
||||
</template>
|
||||
<el-menu-item-group
|
||||
v-for="(item,index) in allUserList['mt']"
|
||||
:key="index"
|
||||
:style="{
|
||||
'backgroundColor':item.userID === '' + currentUser.userID ? 'rgb(244 244 244)' : '',
|
||||
'padding-bottom':'20px',
|
||||
'border-bottom':'1px solid #eee'
|
||||
}">
|
||||
<div style="display: flex;justify-content: center;" @click="queryDetailBut(item)">
|
||||
<div style="" class="avatar">
|
||||
头像
|
||||
<img :src="'https://image.jxc4.com/image/7ab2012bd577035f641d9176cf3372ae.png'">
|
||||
</div>
|
||||
<div>
|
||||
<div class="titleText">
|
||||
{{ item.userID + `【${item.storeInfo ? item.storeInfo.name + '(' + item.storeInfo.id +')' : '' }】` }}
|
||||
</div>
|
||||
<div class="latestMsg">{{ item.latestMsg }}</div>
|
||||
</div>
|
||||
<div>{{ item.latestTime }}</div>
|
||||
</div>
|
||||
</el-menu-item-group>
|
||||
</el-submenu>
|
||||
<el-submenu index="2" >
|
||||
<template slot="title">
|
||||
<img :src="'https://image.jxc4.com/image/6c2f1dfd95890df8ef5e27bde15c4e7f.png'" style="width: 50px;height: 50px;">
|
||||
<span style="font-size: 32px;font-weight: bold;">【淘宝闪购】</span>
|
||||
</template>
|
||||
<el-menu-item-group
|
||||
v-for="(item,index) in allUserList['elm']"
|
||||
:key="index"
|
||||
:style="{
|
||||
'backgroundColor':item.userID === '' + currentUser.userID ? 'rgb(244 244 244)' : '',
|
||||
'padding-bottom':'20px',
|
||||
'border-bottom':'1px solid #eee'
|
||||
}">
|
||||
<div style="display: flex;justify-content: center;" @click="queryDetailBut(item)">
|
||||
<div style="" class="avatar">
|
||||
头像
|
||||
<img :src="'https://image.jxc4.com/image/7ab2012bd577035f641d9176cf3372ae.png'">
|
||||
</div>
|
||||
<div>
|
||||
<div class="titleText">
|
||||
{{ item.userID + `【${item.storeInfo ? item.storeInfo.name + '(' + item.storeInfo.id +')' : '' }】` }}
|
||||
</div>
|
||||
<div class="latestMsg">{{ item.latestMsg }}</div>
|
||||
</div>
|
||||
<div>{{ item.latestTime }}</div>
|
||||
</div>
|
||||
</el-menu-item-group>
|
||||
</el-submenu>
|
||||
<el-submenu index="3">
|
||||
<template slot="title">
|
||||
<img :src="'https://image.jxc4.com/image/884664b80ffd2eda64a4aab9f4dc402e.png'"style="width: 50px;height: 50px;">
|
||||
<span style="font-size: 32px;font-weight: bold;">【京东】</span>
|
||||
</template>
|
||||
<el-menu-item-group
|
||||
v-for="(item,index) in allUserList['jd']"
|
||||
:key="index"
|
||||
:style="{
|
||||
'backgroundColor':item.userID === '' + currentUser.userID ? 'rgb(244 244 244)' : '',
|
||||
'padding-bottom':'20px',
|
||||
'border-bottom':'1px solid #eee'
|
||||
}">
|
||||
<div style="display: flex;justify-content: center;" @click="queryDetailBut(item)">
|
||||
<div style="" class="avatar">
|
||||
<img :src="'https://image.jxc4.com/image/7ab2012bd577035f641d9176cf3372ae.png'">
|
||||
</div>
|
||||
<div>
|
||||
<div class="titleText">
|
||||
{{ item.userID + `【${item.storeInfo ? item.storeInfo.name + '(' + item.storeInfo.id +')' : '' }】` }}
|
||||
</div>
|
||||
<div class="latestMsg">{{ item.latestMsg }}</div>
|
||||
</div>
|
||||
<div>{{ item.latestTime }}</div>
|
||||
</div>
|
||||
</el-menu-item-group>
|
||||
</el-submenu>
|
||||
</el-menu> -->
|
||||
</div>
|
||||
|
||||
<el-menu
|
||||
style="width: 500px;"
|
||||
:default-active="'1'"
|
||||
class="el-menu-vertical-demo">
|
||||
<el-submenu index="1">
|
||||
<template slot="title">
|
||||
<img :src="'https://image.jxc4.com/image/75654ab606494a0efdb0cf7d7ad060d9.png'" style="width: 50px;height: 50px;"></img>
|
||||
<span style="font-size: 32px;font-weight: bold;">【美团】</span>
|
||||
</template>
|
||||
<el-menu-item-group
|
||||
v-for="(item,index) in allUserList['mt']"
|
||||
:key="index"
|
||||
:style="{
|
||||
'backgroundColor':item.userID === '' + currentUser.userID ? 'rgb(244 244 244)' : '',
|
||||
'padding-bottom':'20px',
|
||||
'border-bottom':'1px solid #eee'
|
||||
}">
|
||||
<div style="display: flex;justify-content: center;" @click="queryDetailBut(item)">
|
||||
<div style="" class="avatar">
|
||||
<!-- 头像 -->
|
||||
<img :src="'https://image.jxc4.com/image/7ab2012bd577035f641d9176cf3372ae.png'">
|
||||
</div>
|
||||
<div>
|
||||
<div class="titleText">
|
||||
{{ item.userID + `【${item.storeInfo ? item.storeInfo.name + '(' + item.storeInfo.id +')' : '' }】` }}
|
||||
</div>
|
||||
<div class="latestMsg">{{ item.latestMsg }}</div>
|
||||
</div>
|
||||
<div>{{ item.latestTime }}</div>
|
||||
</div>
|
||||
</el-menu-item-group>
|
||||
</el-submenu>
|
||||
<el-submenu index="2" >
|
||||
<template slot="title">
|
||||
<img :src="'https://image.jxc4.com/image/6c2f1dfd95890df8ef5e27bde15c4e7f.png'" style="width: 50px;height: 50px;">
|
||||
<span style="font-size: 32px;font-weight: bold;">【淘宝闪购】</span>
|
||||
</template>
|
||||
<el-menu-item-group
|
||||
v-for="(item,index) in allUserList['elm']"
|
||||
:key="index"
|
||||
:style="{
|
||||
'backgroundColor':item.userID === '' + currentUser.userID ? 'rgb(244 244 244)' : '',
|
||||
'padding-bottom':'20px',
|
||||
'border-bottom':'1px solid #eee'
|
||||
}">
|
||||
<div style="display: flex;justify-content: center;" @click="queryDetailBut(item)">
|
||||
<div style="" class="avatar">
|
||||
<!-- 头像 -->
|
||||
<img :src="'https://image.jxc4.com/image/7ab2012bd577035f641d9176cf3372ae.png'">
|
||||
</div>
|
||||
<div>
|
||||
<div class="titleText">
|
||||
{{ item.userID + `【${item.storeInfo ? item.storeInfo.name + '(' + item.storeInfo.id +')' : '' }】` }}
|
||||
</div>
|
||||
<div class="latestMsg">{{ item.latestMsg }}</div>
|
||||
</div>
|
||||
<div>{{ item.latestTime }}</div>
|
||||
</div>
|
||||
</el-menu-item-group>
|
||||
</el-submenu>
|
||||
<el-submenu index="3">
|
||||
<template slot="title">
|
||||
<img :src="'https://image.jxc4.com/image/884664b80ffd2eda64a4aab9f4dc402e.png'"style="width: 50px;height: 50px;">
|
||||
<span style="font-size: 32px;font-weight: bold;">【京东】</span>
|
||||
</template>
|
||||
<el-menu-item-group
|
||||
v-for="(item,index) in allUserList['jd']"
|
||||
:key="index"
|
||||
:style="{
|
||||
'backgroundColor':item.userID === '' + currentUser.userID ? 'rgb(244 244 244)' : '',
|
||||
'padding-bottom':'20px',
|
||||
'border-bottom':'1px solid #eee'
|
||||
}">
|
||||
<div style="display: flex;justify-content: center;" @click="queryDetailBut(item)">
|
||||
<div style="" class="avatar">
|
||||
<img :src="'https://image.jxc4.com/image/7ab2012bd577035f641d9176cf3372ae.png'">
|
||||
</div>
|
||||
<div>
|
||||
<div class="titleText">
|
||||
{{ item.userID + `【${item.storeInfo ? item.storeInfo.name + '(' + item.storeInfo.id +')' : '' }】` }}
|
||||
</div>
|
||||
<div class="latestMsg">{{ item.latestMsg }}</div>
|
||||
</div>
|
||||
<div>{{ item.latestTime }}</div>
|
||||
</div>
|
||||
</el-menu-item-group>
|
||||
</el-submenu>
|
||||
</el-menu>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<div class="chatBox">
|
||||
<div class="chatBox" style="margin-left: 20px;border-left: 1px solid #bdbaba;">
|
||||
<div class="chatBoxTitle" v-if="currentUser">{{ currentUser.storeInfo ? currentUser.userID + '【' + currentUser.storeInfo.name + '('+ currentUser.storeInfo.id +')' + '】' : '' }}</div>
|
||||
<div class="chatBoxCenter">
|
||||
<!-- 头像 -->
|
||||
@@ -145,7 +170,7 @@
|
||||
:style="{
|
||||
'text-align':item.msg_source === 1 ? 'right' : 'left'
|
||||
}"
|
||||
@click="jumpOrderDetail(item.order_id)"
|
||||
@click="jumpOrderDetail(item.order_id)"
|
||||
>
|
||||
{{ item.msg_source == 2 ? item.order_id?item.sendType.toUpperCase() + '客户(' + item.order_id +')': item.sendType.toUpperCase() + '客户':
|
||||
currentUser.storeInfo.name
|
||||
@@ -153,14 +178,14 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div :style="{
|
||||
<div :style="{
|
||||
'display':'flex',
|
||||
'justify-content':item.msg_source === 1?'flex-end':'flex-start'
|
||||
}">
|
||||
<!-- 聊天内容 -->
|
||||
<el-card
|
||||
:body-style="{
|
||||
padding:item.msg_type == 2 || item.msg_type == 12 ? '0': '20px'
|
||||
padding:item.msg_type == 2 || item.msg_type == 12 ? '0': '20px'
|
||||
}"
|
||||
:style="{
|
||||
'max-width':'500px',
|
||||
@@ -213,7 +238,7 @@
|
||||
<img :src="item.goodCard.img" alt="缩略图..." width="100%" />
|
||||
<span>{{ item.goodCard.name }}</span>
|
||||
</div>
|
||||
<span class="good_card" @click.stop="viewGood(item,index)">查看商品</span>
|
||||
<span class="good_card" @click.stop="viewGood(item,index)">查看商品</span>
|
||||
</div>
|
||||
|
||||
<!-- 订单卡片 -->
|
||||
@@ -236,10 +261,9 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="chatBoxBottom">
|
||||
<!-- <div>表情符号</div> -->
|
||||
<el-input placeholder="请输入内容......" v-model="sendText" class="input-with-select" type="textarea" style="height: 100px;">
|
||||
@@ -248,11 +272,15 @@
|
||||
<div style="text-align: right;" >
|
||||
<el-button slot="append" type="primary" @click="sendMsg" >发送</el-button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</el-container>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- </el-container> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -309,8 +337,15 @@ export default {
|
||||
// vendorOrgCode: 'vendorOrgCode',
|
||||
AllplateArr: 'AllplateArr',
|
||||
}),
|
||||
allUser(){
|
||||
let mt = this.allUserList.mt
|
||||
let elm = this.allUserList.elm
|
||||
let jd = this.allUserList.jd
|
||||
return mt.concat(elm).concat(jd) || []
|
||||
}
|
||||
},
|
||||
created(){
|
||||
return
|
||||
this.getChatUsersList()
|
||||
// this.platInfo()
|
||||
},
|
||||
@@ -407,7 +442,7 @@ export default {
|
||||
// this.allUserList['mt'] =
|
||||
// this.allUserList[userArr[0]][userArr[1]] = []
|
||||
// console.log('paramsData,Object.keys',i.split(':'),'聊天记录',res[i])
|
||||
console.log('111111111111',this.personalStore)
|
||||
// console.log('111111111111',this.personalStore)
|
||||
res[i].reverse().forEach(element => {
|
||||
let resData = JSON.parse(element)
|
||||
let findIndex = this.allUserList['mt'].findIndex(item => item.userID === resData.userID)
|
||||
@@ -523,10 +558,15 @@ export default {
|
||||
// 查询聊天记录
|
||||
// 查询聊天详情按钮 点击用户列表
|
||||
queryDetailBut:debounce(
|
||||
function name(query,falg) {
|
||||
function name(query,falg,type) {
|
||||
if(type && type === 'click'){
|
||||
console.log('11111111111,,聊天记里',query)
|
||||
if(query.userID === this.currentUser.userID) return // 不用重复点击
|
||||
return
|
||||
}
|
||||
if(query.userID !== this.currentUser.userID) this.chatDetail = [] // 清空聊天记录
|
||||
if(this.detailTimer) clearInterval(this.detailTimer)
|
||||
console.log('query',query)
|
||||
// console.log('query',query)
|
||||
this.currentUser = query
|
||||
// if(query.isNewCreate) {
|
||||
// this.chatDetail = []
|
||||
@@ -569,6 +609,7 @@ export default {
|
||||
|
||||
let res = await getChatDetail(payLoad,isloading)
|
||||
// let res = msgInfo.chatDetail.data // 模拟聊天详情
|
||||
if(JSON.stringify(res) === '{}') return hideLoad()
|
||||
// console.log('查询聊天详情',res)
|
||||
// return
|
||||
// 美团
|
||||
@@ -945,6 +986,17 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.emptyText{
|
||||
width: 80vw;
|
||||
height: 80vh;
|
||||
text-align: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size:40px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/deep/ .el-textarea__inner{
|
||||
height: 100px !important;
|
||||
}
|
||||
|
||||
@@ -481,22 +481,33 @@
|
||||
</el-tab-pane>
|
||||
|
||||
<el-tab-pane label="配送总额" name="deliveryAmount">
|
||||
<div>
|
||||
<h1 style="text-align: center;">达达配送</h1>
|
||||
<div style="display: flex;justify-content: center;align-items: center;border-bottom:1px solid #bfbfbf;padding-bottom: 20px;">
|
||||
|
||||
<div style="margin-right: 10px;font-size: 28px;margin-left: 10px;color:red">{{ '¥' + dadaDeliver.platformBalance }}</div>
|
||||
<el-input placeholder="请输入充值金额" v-model.number="dadaDeliver.amount" style="width: 200px;margin-left: 10px;">
|
||||
<template slot="append" >
|
||||
<div @click="sureRecharge('dada')">充值(元)</div>
|
||||
</template>
|
||||
</el-input>
|
||||
</div>
|
||||
|
||||
<h1 style="text-align: center;">蜂鸟配送</h1>
|
||||
<div style="display: flex;justify-content: center;align-items: center;">
|
||||
<el-select v-model="deliveryType" @change="queryPlatFormAmount">
|
||||
<el-option label="达达" :value="101"></el-option>
|
||||
<el-option label="蜂鸟" :value="103"></el-option>
|
||||
</el-select>
|
||||
<div style="margin-right: 10px;font-size: 28px;margin-left: 10px;color:red">{{ '¥' + platformBalance }}</div>
|
||||
<el-input placeholder="请输入充值金额" v-model.number="amount" style="width: 200px;margin-left: 10px;">
|
||||
<div style="margin-right: 10px;font-size: 28px;margin-left: 10px;color:red">{{ '¥' + fnDeliver.platformBalance }}</div>
|
||||
<el-input placeholder="请输入充值金额" v-model.number="fnDeliver.amount" style="width: 200px;margin-left: 10px;">
|
||||
<template slot="append" >
|
||||
<div @click="sureRecharge">充值(元)</div>
|
||||
<div @click="sureRecharge('fn')">充值(元)</div>
|
||||
</template>
|
||||
</el-input>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="门店聊天" name="storechat">
|
||||
<!-- <el-tab-pane label="门店聊天" name="storechat">
|
||||
<ChatDetail :isGetDetail="isGetDetail"></ChatDetail>
|
||||
</el-tab-pane>
|
||||
</el-tab-pane> -->
|
||||
</el-tabs>
|
||||
|
||||
<el-dialog title="收益统计" :visible.sync="staticStatusShow" width="80%">
|
||||
@@ -691,9 +702,15 @@ export default {
|
||||
totalCount:0
|
||||
},
|
||||
// 配送总金额
|
||||
platformBalance:'0.00', // 查询结果
|
||||
deliveryType:101,
|
||||
amount:0 // 充值金额
|
||||
dadaDeliver:{ // 达达
|
||||
platformBalance:'0.00', // 查询结果
|
||||
// deliveryType:101,
|
||||
amount:0 // 充值金额
|
||||
},
|
||||
fnDeliver:{ // 蜂鸟
|
||||
platformBalance:'0.00', // 查询结果
|
||||
amount:0 // 充值金额
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
@@ -756,7 +773,8 @@ export default {
|
||||
this.getNewFeatures()
|
||||
this.getMtInvoiceRecord()
|
||||
this.getMaterialInfo()
|
||||
this.queryPlatFormAmount(this.deliveryType) // 达达
|
||||
this.queryPlatFormAmount(101) // 达达
|
||||
this.queryPlatFormAmount(103) // 达达
|
||||
},
|
||||
methods: {
|
||||
// 查询平台余额 101_达达 103_蜂鸟
|
||||
@@ -764,15 +782,17 @@ export default {
|
||||
if(vendorID === 101 || vendorID ===103) {
|
||||
let res1 = await queryPlatformBalance({vendorID})
|
||||
// console.log('查询平台余额',res1)
|
||||
this.platformBalance = +res1/100
|
||||
if(vendorID === 101) this.dadaDeliver.platformBalance = +res1/100
|
||||
if(vendorID === 103) this.fnDeliver.platformBalance = +res1/100
|
||||
}
|
||||
},
|
||||
// 确认充值
|
||||
async sureRecharge(){
|
||||
if(!this.amount) return this.$toast('请输入充值金额')
|
||||
async sureRecharge(type){
|
||||
let amount = type === 'dada' ? this.dadaDeliver.amount : this.fnDeliver.amount
|
||||
if(!amount) return this.$toast('请输入充值金额')
|
||||
let form = new FormData()
|
||||
form.append('vendorID',this.currentDialog.vendorID)
|
||||
form.append('amount',this.amount * 100)
|
||||
form.append('vendorID',type === 'dada' ? 101 : 103)
|
||||
form.append('amount',amount * 100)
|
||||
form.append('category','PC') // 链接场景 [PC,H5]
|
||||
// form.append('notifyUrl','https://www.jxc4.com/#/jxstoremanager') //支付宝有,微信没有
|
||||
|
||||
|
||||
Reference in New Issue
Block a user