'!'
This commit is contained in:
@@ -67,6 +67,14 @@
|
||||
@click="sumitSearch"
|
||||
style="width: 100px;"
|
||||
>查找</el-button>
|
||||
<br>
|
||||
<div v-if="isShowFilter" style="margin-top: 20px;">
|
||||
<el-switch
|
||||
v-model="isFilterStoreSku"
|
||||
active-text="门店商品"
|
||||
inactive-text="平台商品">
|
||||
</el-switch>
|
||||
</div>
|
||||
</div>
|
||||
<div class="del">
|
||||
<el-button
|
||||
@@ -236,7 +244,7 @@ import { computedName } from '@/utils'
|
||||
/* eslint-disable */
|
||||
export default {
|
||||
name: 'DiaPickSkus',
|
||||
props: ['diaSkuShow', 'catLevel1', 'catLevel2', 'type', 'max', 'reqApi', 'type','skuNameList'],
|
||||
props: ['diaSkuShow', 'catLevel1', 'catLevel2', 'type', 'max', 'reqApi', 'type','skuNameList','storeList'],
|
||||
data() {
|
||||
return {
|
||||
catProps: {
|
||||
@@ -254,7 +262,8 @@ export default {
|
||||
vendFactor:null,
|
||||
pricePercentage:null, // 活动折扣
|
||||
isExd: false,
|
||||
orginalVendorFac:null
|
||||
orginalVendorFac:null,
|
||||
isFilterStoreSku:false
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@@ -278,6 +287,11 @@ export default {
|
||||
})
|
||||
return catData
|
||||
},
|
||||
isShowFilter(){
|
||||
let flag = false
|
||||
if(this.storeList && this.storeList.length === 1) flag = true
|
||||
return flag
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
vendFactor(val){
|
||||
@@ -286,6 +300,9 @@ export default {
|
||||
this.setActPriceByVendor()
|
||||
}
|
||||
},
|
||||
isFilterStoreSku(val){
|
||||
if(val) this.getGoods()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
@@ -361,7 +378,16 @@ export default {
|
||||
if (+this.categoryID !== -1) json.categoryID = +this.categoryID[this.categoryID.length - 1]
|
||||
if (+this.categoryID === -1 && !this.keyword && !this.nameID && !this.skuID) json.pageSize = 50
|
||||
json.status = -1
|
||||
|
||||
// if(this.isFilterStoreSku) json.storeIDs = JSON.stringify(this.storeList)
|
||||
let url = `v2/sku/GetSkuNamesNew`
|
||||
if(this.isFilterStoreSku){
|
||||
url = `v2/store/sku/GetStoresSkus`
|
||||
json.storeIDs = JSON.stringify(this.storeList)
|
||||
json.isFocus = true
|
||||
}
|
||||
|
||||
|
||||
if (this.reqApi) {
|
||||
url = `v2/store/sku/GetStoresSkus`
|
||||
json.storeIDs = JSON.stringify([102919])
|
||||
|
||||
@@ -629,6 +629,7 @@
|
||||
:diaSkuShow="diaSkuShow"
|
||||
:catLevel1="catLevel1"
|
||||
:catLevel2="catLevel2"
|
||||
:storeList="storeList"
|
||||
@confirmSkus="confirmSkus"
|
||||
@handleClose="handleClose"
|
||||
></DiaSkusPick>
|
||||
|
||||
@@ -30,31 +30,43 @@
|
||||
</div>
|
||||
</el-aside> -->
|
||||
<div v-if="allUser.length !== 0" style="display: flex;">
|
||||
<!-- <el-badge value="new" style=" margin-top: 10px; margin-right: 40px;" :hidden="false">
|
||||
<span >门店聊天</span>
|
||||
</el-badge> -->
|
||||
<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;"
|
||||
/>
|
||||
<template v-for="(item,index) in allUser">
|
||||
<el-badge
|
||||
:value="+item.NewMessageNum"
|
||||
:max="99"
|
||||
style=" margin-top: 10px; margin-right: 40px;" :hidden="false"
|
||||
>
|
||||
<!-- <span >门店聊天</span> -->
|
||||
<div
|
||||
: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'
|
||||
}">
|
||||
<!-- NewMessageNum -->
|
||||
<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>
|
||||
<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-badge>
|
||||
</template>
|
||||
|
||||
<!-- <el-menu
|
||||
style="width: 500px;"
|
||||
@@ -153,8 +165,8 @@
|
||||
<div v-for="(item,index) in chatDetail" :key="index"
|
||||
class="chatDetail-item"
|
||||
:style="{
|
||||
'flex-direction':item.msg_source == 1?'row-reverse':'',
|
||||
'text-align':item.msg_source == 1?'right':'',
|
||||
'flex-direction':item.msg_source == 1 ? 'row-reverse':'',
|
||||
'text-align':item.msg_source == 1 ? 'right':'',
|
||||
'margin':'20px',
|
||||
'padding':'20px',
|
||||
}">
|
||||
@@ -1000,4 +1012,10 @@ export default {
|
||||
/deep/ .el-textarea__inner{
|
||||
height: 100px !important;
|
||||
}
|
||||
|
||||
.sendText{
|
||||
width: 100%;
|
||||
height: 100px;
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
@@ -483,15 +483,15 @@
|
||||
<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>
|
||||
<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;">
|
||||
@@ -505,9 +505,14 @@
|
||||
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<!-- <el-tab-pane label="门店聊天" name="storechat">
|
||||
<el-tab-pane name="storechat">
|
||||
<span slot="label">
|
||||
<el-badge value="new" style=" margin-top: 10px; margin-right: 40px;" :hidden="false">
|
||||
<span >门店聊天</span>
|
||||
</el-badge>
|
||||
</span>
|
||||
<ChatDetail :isGetDetail="isGetDetail"></ChatDetail>
|
||||
</el-tab-pane> -->
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
<el-dialog title="收益统计" :visible.sync="staticStatusShow" width="80%">
|
||||
|
||||
Reference in New Issue
Block a user