跳转样式问题
parent
aaa2deef85
commit
73acb0bc09
|
@ -1,17 +1,17 @@
|
|||
var BASE = {
|
||||
/**
|
||||
* @description api请求基础路径
|
||||
*/
|
||||
API_DEV: {
|
||||
common: "http://192.168.0.113:8890",
|
||||
buyer: "http://192.168.0.113:8898",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
},
|
||||
API_PROD: {
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
},
|
||||
};
|
||||
/**
|
||||
* @description api请求基础路径
|
||||
*/
|
||||
API_DEV: {
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
},
|
||||
API_PROD: {
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
},
|
||||
};
|
||||
|
|
|
@ -15,12 +15,12 @@
|
|||
<div class="store-collect">
|
||||
<span class="mr_10" v-if="goodsMsg.data">
|
||||
<router-link :to="'Merchant?id=' + goodsMsg.data.storeId">{{
|
||||
goodsMsg.data.storeName
|
||||
}}</router-link>
|
||||
goodsMsg.data.storeName
|
||||
}}</router-link>
|
||||
</span>
|
||||
<span @click="collect">
|
||||
<Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#666'" />
|
||||
{{ storeCollected ? "已收藏店铺" : "收藏店铺" }}
|
||||
{{ storeCollected? "已收藏店铺": "收藏店铺" }}
|
||||
</span>
|
||||
<span class="ml_10" @click="IMService()">联系客服</span>
|
||||
</div>
|
||||
|
@ -81,8 +81,19 @@ export default {
|
|||
this.$Message.error("请登录后再联系客服");
|
||||
return;
|
||||
}
|
||||
// window.open(
|
||||
// this.IMLink +
|
||||
// "?token=" +
|
||||
// accessToken +
|
||||
// "&id=" +
|
||||
// this.goodsMsg.data.storeId +
|
||||
// "&goodsId=" +
|
||||
// this.goodsMsg.data.goodsId +
|
||||
// "&skuId=" +
|
||||
// this.goodsMsg.data.id
|
||||
// );
|
||||
window.open(
|
||||
this.IMLink +
|
||||
'http://192.168.0.139:8000/' +
|
||||
"?token=" +
|
||||
accessToken +
|
||||
"&id=" +
|
||||
|
|
6
im/.env
6
im/.env
|
@ -4,4 +4,8 @@ VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
|
|||
VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
|
||||
VUE_APP_COMMON=https://common-api.pickmall.cn
|
||||
VUE_APP_WEBSITE_NAME="LiLi IM"
|
||||
VUE_APP_PC_ORDER_URL=https://store-b2b2c.pickmall.cn
|
||||
VUE_APP_PC_ORDER_URL=https://pc-b2b2c.pickmall.cn/
|
||||
VUE_APP_PC_STORE_ORDER_URL=https://store-b2b2c.pickmall.cn/
|
||||
VUE_APP_PC_STORE_ORDER=https://store-b2b2c.pickmall.cn/
|
||||
VUE_APP_PC_USER_ORDER=https://pc-b2b2c.pickmall.cn
|
||||
VUE_APP_PC_STORE_GOODS=https://store-b2b2c.pickmall.cn/
|
|
@ -1,7 +1,11 @@
|
|||
NODE_ENV=development
|
||||
VUE_APP_PREVIEW=true
|
||||
VUE_APP_API_BASE_URL=http://192.168.0.113:8885
|
||||
VUE_APP_WEB_SOCKET_URL=ws://192.168.0.113:8885/lili/webSocket
|
||||
VUE_APP_COMMON=http://192.168.0.113:8890
|
||||
VUE_APP_PC_URL="http://192.168.0.113:10001"
|
||||
VUE_APP_PREVIEW=false
|
||||
VUE_APP_API_BASE_URL=https://im-api.pickmall.cn
|
||||
VUE_APP_WEB_SOCKET_URL=wss://im-api.pickmall.cn/lili/webSocket
|
||||
VUE_APP_COMMON=https://common-api.pickmall.cn
|
||||
VUE_APP_WEBSITE_NAME="LiLi IM"
|
||||
VUE_APP_PC_ORDER_URL=https://pc-b2b2c.pickmall.cn/
|
||||
VUE_APP_PC_STORE_ORDER_URL=https://store-b2b2c.pickmall.cn/
|
||||
VUE_APP_PC_STORE_ORDER=https://store-b2b2c.pickmall.cn/
|
||||
VUE_APP_PC_USER_ORDER=https://pc-b2b2c.pickmall.cn
|
||||
VUE_APP_PC_STORE_GOODS=https://store-b2b2c.pickmall.cn/
|
|
@ -1,12 +1,9 @@
|
|||
<template>
|
||||
<div
|
||||
class="text-message"
|
||||
:class="{
|
||||
left: float == 'left',
|
||||
right: float == 'right',
|
||||
'max-width': !fullWidth,
|
||||
}"
|
||||
>
|
||||
<div class="text-message" :class="{
|
||||
left: float == 'left',
|
||||
right: float == 'right',
|
||||
'max-width': !fullWidth,
|
||||
}">
|
||||
<div v-if="arrow" class="arrow"></div>
|
||||
<pre v-html="html" />
|
||||
</div>
|
||||
|
@ -35,12 +32,12 @@ export default {
|
|||
default: false,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
data () {
|
||||
return {
|
||||
html: "",
|
||||
};
|
||||
},
|
||||
created() {
|
||||
created () {
|
||||
const text = textReplaceLink(
|
||||
this.content,
|
||||
this.float == "right" ? "#ffffff" : "rgb(9 149 208)"
|
||||
|
|
|
@ -70,6 +70,8 @@ export default {
|
|||
}
|
||||
},
|
||||
mounted () {
|
||||
localStorage.setItem('storeFlag', this.toUser.storeFlag)
|
||||
console.log(this.toUser.storeFlag, 'this.toUser.storeFlag');
|
||||
if (this.toUser.storeFlag) {
|
||||
this.getStoreDetail()
|
||||
} else {
|
||||
|
|
|
@ -35,9 +35,9 @@
|
|||
|
||||
<!-- 其它对话消息 -->
|
||||
<div v-else class="message-box record-box" :class="{
|
||||
'direction-rt': item.float == 'right',
|
||||
'checkbox-border': multiSelect.isOpen === true,
|
||||
}">
|
||||
'direction-rt': item.float == 'right',
|
||||
'checkbox-border': multiSelect.isOpen === true,
|
||||
}">
|
||||
<aside v-show="multiSelect.isOpen" class="checkbox-column">
|
||||
<i class="el-icon-success" :class="{ selected: verifyMultiSelect(item.id) }"
|
||||
@click="triggerMultiSelect(item.id)" />
|
||||
|
@ -59,48 +59,63 @@
|
|||
{{ unixToDate(item.createTime, "MM月dd日 hh:mm") }}
|
||||
</span>
|
||||
<!-- 文本消息 -->
|
||||
<div v-if="item.messageType == 'MESSAGE'" class="text-message" :class="{
|
||||
left: item.float == 'left',
|
||||
right: item.float == 'right',
|
||||
}">
|
||||
<div v-if="item.messageType == 'MESSAGE'" style="background-color: #d0e9ff;color: black;"
|
||||
class="text-message" :class="{
|
||||
left: item.float == 'left',
|
||||
right: item.float == 'right',
|
||||
}">
|
||||
<div class="arrow"></div>
|
||||
|
||||
<pre v-html="item.text" />
|
||||
</div>
|
||||
|
||||
<div v-if="item.messageType == 'GOODS' && item.text != null" class="text-message" :class="{
|
||||
left: item.float == 'left',
|
||||
right: item.float == 'right',
|
||||
}">
|
||||
<div v-if="item.messageType == 'GOODS' && item.text != null" class="goodsStyle " :class="{
|
||||
left: item.float == 'left',
|
||||
right: item.float == 'right',
|
||||
}">
|
||||
<div class="base" @click="linkToGoods(item.text.goodsId, item.text.id)">
|
||||
<div>
|
||||
<img :src="item.text.thumbnail" class="image" />
|
||||
</div>
|
||||
<div style="margin-left: 13px">
|
||||
<a> {{ item.text.goodsName }} </a>
|
||||
<div>
|
||||
<span style="color: red;">¥{{ item.text.price }}</span>
|
||||
<div>
|
||||
<div class="goods_name">
|
||||
<el-tooltip class="item" effect="dark" :content="item.text.goodsName" placement="top-start">
|
||||
<a> {{ item.text.goodsName }} </a>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<div class="price">
|
||||
<span>¥{{ item.text.price }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="item.messageType == 'ORDER' && item.text != null" class="text-message" :class="{
|
||||
left: item.float == 'left',
|
||||
right: item.float == 'right',
|
||||
}">
|
||||
<a> 订单号:{{ item.text.sn }} </a>
|
||||
<div v-if="item.messageType == 'ORDER' && item.text != null" class="oderStyle" :class="{
|
||||
left: item.float == 'left',
|
||||
right: item.float == 'right',
|
||||
}">
|
||||
<div class="oedersn">
|
||||
<el-tooltip class="item" effect="dark" :content="item.text.sn" placement="top-start">
|
||||
<a> 订单号:{{ item.text.sn }} </a>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<div class="baseTwo">
|
||||
<img :src="item.text.groupImages" style="height: 100px;width: 100px;margin-top: 10px;" />
|
||||
<span class="orderGoodsName" @click="linkToOrders(item.text.sn)">{{ item.text.groupName }}</span>
|
||||
<span class="orderGoodsTime">{{ item.text.paymentTime }}</span>
|
||||
<span class="orderFlowPrice">
|
||||
订单金额:¥{{ item.text.flowPrice }}
|
||||
</span>
|
||||
<span class="order_status"
|
||||
:style="{ 'color': item.text.orderStatus == 'CANCELLED' || item.text.orderStatus == 'UNPAID' || item.text.orderStatus == ' TAKE' ? '#5a606b' : '#f23030' }">{{
|
||||
item.text.orderStatus == 'CANCELLED' ? '已取消' : item.text.orderStatus == 'UNPAID' ? '未付款' :
|
||||
item.text.orderStatus ==
|
||||
'PAID' ? '已付款' : item.text.orderStatus == 'UNDELIVERED' ? '待发货' : item.text.orderStatus ==
|
||||
'DELIVERED'
|
||||
? '已发货' : item.text.orderStatus == ' COMPLETED' ? '已完成' : item.text.orderStatus == ' TAKE' ?
|
||||
'待校验' : ''
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 图片消息 -->
|
||||
<!-- <image-message
|
||||
v-else-if="item.messageType == 2 && item.file.file_type == 1"
|
||||
:src="item.file.file_url"
|
||||
@contextmenu.native="onCopy(idx, item, $event)"
|
||||
/> -->
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
@ -149,10 +164,10 @@
|
|||
<!-- 消息管理器 -->
|
||||
<transition name="el-fade-in-linear">
|
||||
<TalkSearchRecord v-if="findChatRecord" :params="{
|
||||
talk_type: params.talk_type,
|
||||
receiver_id: params.receiver_id,
|
||||
title: params.nickname,
|
||||
}" @close="findChatRecord = false" />
|
||||
talk_type: params.talk_type,
|
||||
receiver_id: params.receiver_id,
|
||||
title: params.nickname,
|
||||
}" @close="findChatRecord = false" />
|
||||
</transition>
|
||||
|
||||
<!-- 链接信息 -->
|
||||
|
@ -820,6 +835,67 @@ export default {
|
|||
};
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
.order_status {
|
||||
height: 30px;
|
||||
width: 60px;
|
||||
background: #ffeded;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
line-height: 25px;
|
||||
margin-left: 15px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.oderStyle {
|
||||
border: 1px solid #f2f2f2;
|
||||
width: 330px;
|
||||
border-radius: 4px;
|
||||
|
||||
.oedersn {
|
||||
margin: 10px 0 10px 5px;
|
||||
width: 300px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
.goodsStyle {
|
||||
border: 1px solid #f2f2f2;
|
||||
width: 300px;
|
||||
height: 120px;
|
||||
display: flex;
|
||||
border-radius: 4px;
|
||||
|
||||
.goods_name {
|
||||
color: black;
|
||||
width: 150px;
|
||||
font-size: 15px;
|
||||
color: #333333;
|
||||
margin-top: 30px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.image {
|
||||
height: 70px;
|
||||
margin-top: 3px;
|
||||
width: 70px;
|
||||
background-size: cover;
|
||||
margin: 20px;
|
||||
}
|
||||
|
||||
.price {
|
||||
color: #999;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.base {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
|
||||
.orderSn {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
@ -830,7 +906,7 @@ export default {
|
|||
width: 200px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
// white-space: nowrap;
|
||||
position: absolute;
|
||||
margin-top: 10px;
|
||||
margin-left: 10px;
|
||||
|
@ -838,9 +914,14 @@ export default {
|
|||
|
||||
.orderGoodsTime {
|
||||
margin-left: 10px;
|
||||
color: red;
|
||||
color: #999;
|
||||
position: absolute;
|
||||
margin-top: 35px;
|
||||
margin-top: 70px;
|
||||
}
|
||||
|
||||
.orderFlowPrice {
|
||||
color: #999;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.main-box {
|
||||
|
@ -904,26 +985,26 @@ export default {
|
|||
}
|
||||
|
||||
|
||||
.base {
|
||||
margin-top: 5px;
|
||||
height: 120px;
|
||||
display: flex;
|
||||
// .base {
|
||||
// margin-top: 5px;
|
||||
// height: 120px;
|
||||
// display: flex;
|
||||
|
||||
div {
|
||||
width: 100px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
margin-top: 8px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
// div {
|
||||
// width: 100px;
|
||||
// // overflow: hidden;
|
||||
// // text-overflow: ellipsis;
|
||||
// margin-top: 8px;
|
||||
// // white-space: nowrap;
|
||||
// }
|
||||
|
||||
.image {
|
||||
height: 100px;
|
||||
margin-top: 3px;
|
||||
width: 100px
|
||||
}
|
||||
// .image {
|
||||
// height: 100px;
|
||||
// margin-top: 3px;
|
||||
// width: 100px
|
||||
// }
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
.talk-bubble {
|
||||
position: absolute;
|
||||
|
@ -1101,7 +1182,7 @@ export default {
|
|||
}
|
||||
|
||||
@bg-left-color: #f5f5f5;
|
||||
@bg-right-color: #1ebafc;
|
||||
@bg-right-color: #ffffff;
|
||||
|
||||
.text-message {
|
||||
position: relative;
|
||||
|
|
|
@ -7,37 +7,58 @@
|
|||
<dd v-for="item in list" v-infinite-scroll="loadMore">
|
||||
<div class="base">
|
||||
<div>
|
||||
<img :src="item.thumbnail" class="image" />
|
||||
<img style="width: 60px; height: 60px;" :src="item.thumbnail" class="image" />
|
||||
</div>
|
||||
<div style="margin-left: 13px">
|
||||
<a class="goods_name" @click="linkToGoods(item.goodsId, item.id)">{{ item.goodsName }}</a>
|
||||
<div style="margin-top: 8px;">
|
||||
<span style="color: red;">¥{{ item.price }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<el-button class="store-button" type="danger" v-if="item.btnHide == 1" size="mini"
|
||||
@click="submitSendGoodsMessage(item)" plain>发送</el-button>
|
||||
<div class="recent_views">
|
||||
<el-tooltip class="item" effect="dark" :content="item.goodsName" placement="top-start">
|
||||
<a class="goods_name" @click="linkToGoods(item.goodsId, item.id)">{{ item.goodsName }}</a>
|
||||
</el-tooltip>
|
||||
|
||||
<div style="display: flex;">
|
||||
<div style="margin-top: 20px;">
|
||||
<span style="color: red;">¥{{ item.price }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<el-button class="goods_store_button" type="danger" v-if="item.btnHide == 1" size="mini"
|
||||
@click="submitSendGoodsMessage(item)" plain>发送</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="Underline"></div>
|
||||
</dd>
|
||||
|
||||
</dl>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="订单列表" name="orders">
|
||||
<dl>
|
||||
<dd v-for="(item, index) in orderList" v-infinite-scroll="loadMore" :key="index">
|
||||
<div style="margin-bottom: 20px;">
|
||||
<span class="orderSn">订单号:{{ item.sn }}</span>
|
||||
<img :src="item.groupImages" alt=""
|
||||
style="height: 100px; width: 100px;margin-top: 10px; vertical-align: middle; ">
|
||||
<span class="orderGoodsName" @click="linkToOrders(item.sn)"> {{ item.groupName }}</span>
|
||||
<span style="margin-left: 10px; color: red;">{{ item.paymentTime }}</span>
|
||||
<div class="orderBtn">
|
||||
<el-button type="danger" class="store-button" v-if="item.btnHide == 1" size="mini"
|
||||
@click="submitSendOrderMessage(item, index)" plain>发送</el-button>
|
||||
<div class="orderlist">
|
||||
<div class="order_top">
|
||||
<span class="order_sn">订单号:{{ item.sn }}</span>
|
||||
</div>
|
||||
<div class="order_section">
|
||||
<img :src="item.groupImages" alt="">
|
||||
<el-tooltip class="item" effect="dark" :content="item.groupName" placement="top-start">
|
||||
<span class="orderGoodsName" @click="linkToOrders(item.sn)"> {{ item.groupName }}</span>
|
||||
</el-tooltip>
|
||||
<div class="orderBtn">
|
||||
<el-button type="danger" class="store-button" v-if="item.btnHide == 1" size="mini"
|
||||
@click="submitSendOrderMessage(item, index)" plain>发送</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="order_footer">
|
||||
<span> 订单金额: <span style="color: red;">¥{{ item.orderItems[0].goodsPrice }}</span></span>
|
||||
<span class="order_status"
|
||||
:style="{ 'color': item.orderStatus == 'CANCELLED' || item.orderStatus == 'UNPAID' || item.orderStatus == ' TAKE' ? '#5a606b' : '#f23030' }">{{
|
||||
item.orderStatus == 'CANCELLED' ? '已取消' : item.orderStatus == 'UNPAID' ? '未付款' : item.orderStatus ==
|
||||
'PAID' ? '已付款' : item.orderStatus == 'UNDELIVERED' ? '待发货' : item.orderStatus == 'DELIVERED'
|
||||
? '已发货' : item.orderStatus == ' COMPLETED' ? '已完成' : item.orderStatus == ' TAKE' ? '待校验' : ''
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="Underline"></div>
|
||||
</dd>
|
||||
</dl>
|
||||
</el-tab-pane>
|
||||
|
@ -109,11 +130,14 @@ export default {
|
|||
},
|
||||
// 发送订单列表
|
||||
submitSendOrderMessage (item, index) {
|
||||
console.log(item, 'item');
|
||||
const context = {
|
||||
sn: item.sn,
|
||||
groupImages: item.groupImages,
|
||||
paymentTime: item.paymentTime,
|
||||
groupName: item.groupName,
|
||||
flowPrice: item.flowPrice,
|
||||
orderStatus: item.orderStatus
|
||||
}
|
||||
const record = {
|
||||
operation_type: "MESSAGE",
|
||||
|
@ -150,6 +174,92 @@ export default {
|
|||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.order_status {
|
||||
height: 25px;
|
||||
width: 60px;
|
||||
background: #ffeded;
|
||||
margin-right: 20px;
|
||||
text-align: center;
|
||||
line-height: 25px;
|
||||
}
|
||||
|
||||
.Underline {
|
||||
border: 1px solid silver;
|
||||
}
|
||||
|
||||
.recent_views {
|
||||
margin-left: 13px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
width: 260px;
|
||||
}
|
||||
|
||||
.box {
|
||||
width: 400px;
|
||||
|
||||
.top {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.left {
|
||||
float: left;
|
||||
width: 60px;
|
||||
}
|
||||
|
||||
.right {
|
||||
float: right;
|
||||
width: 60px;
|
||||
}
|
||||
|
||||
.bottom {
|
||||
clear: both;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.item {
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
.left .el-tooltip__popper,
|
||||
.right .el-tooltip__popper {
|
||||
padding: 8px 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.Underline {
|
||||
// border: 5px solid red;
|
||||
}
|
||||
|
||||
.orderlist {
|
||||
margin-bottom: 10px;
|
||||
background: #fff;
|
||||
color: #5a606b;
|
||||
}
|
||||
|
||||
.order_top {
|
||||
border-bottom: 1px solid #f2f2f2;
|
||||
|
||||
.order_sn {}
|
||||
}
|
||||
|
||||
.order_section {
|
||||
border-bottom: 1px solid #f2f2f2;
|
||||
height: 100px;
|
||||
|
||||
img {
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.order_footer {
|
||||
border-bottom: 1px solid #f2f2f2;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.orderGoodsName {
|
||||
width: 200px;
|
||||
overflow: hidden;
|
||||
|
@ -158,6 +268,7 @@ export default {
|
|||
position: absolute;
|
||||
margin-left: 10px;
|
||||
margin-top: 10px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.orderSn {
|
||||
|
@ -171,18 +282,13 @@ export default {
|
|||
justify-content: flex-end;
|
||||
margin-right: 15px;
|
||||
position: relative;
|
||||
bottom: 30px;
|
||||
bottom: 55px;
|
||||
}
|
||||
|
||||
.goods_name {
|
||||
text-overflow: -o-ellipsis-lastline;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
|
||||
white-space: nowrap
|
||||
}
|
||||
|
||||
/deep/ .el-tabs__item.is-top:last-child {
|
||||
|
@ -215,9 +321,18 @@ export default {
|
|||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.goods_store_button {
|
||||
background-color: white;
|
||||
border-color: #F56C6C;
|
||||
margin-top: 10px;
|
||||
position: relative;
|
||||
right: 60%;
|
||||
top: 45%;
|
||||
}
|
||||
|
||||
.base {
|
||||
margin-top: 5px;
|
||||
height: 120px;
|
||||
height: 80px;
|
||||
display: flex;
|
||||
|
||||
.price {
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
</div>
|
||||
<div style="margin-left: 13px">
|
||||
<div class="div-zoom">
|
||||
{{ storeInfo.storeName }}
|
||||
<el-tag type="danger" v-if="storeInfo.selfOperated" size="mini">自营</el-tag>
|
||||
<span class="title_left_name"> 店铺名称:</span> <span class="title_right_name">{{ storeInfo.storeName }}</span>
|
||||
<el-tag style="margin-left: 10px;" type="danger" v-if="storeInfo.selfOperated" size="mini">自营</el-tag>
|
||||
</div>
|
||||
<div>
|
||||
联系方式: {{ storeInfo.memberName }}
|
||||
<span class="title_left_name"> 联系方式:</span> <span class="title_right_name">{{ storeInfo.memberName }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<el-button class="store-button" type="danger" @click="linkToStore(storeInfo.id)" size="mini"
|
||||
|
@ -19,22 +19,32 @@
|
|||
</div>
|
||||
</div>
|
||||
<hr class="separate" />
|
||||
<div class="separate">店铺评分: <span>{{ storeInfo.serviceScore }}</span></div>
|
||||
<div class="separate">服务评分: <span>{{ storeInfo.descriptionScore }}</span></div>
|
||||
<div class="separate">物流评分: <span>{{ storeInfo.deliveryScore }}</span></div>
|
||||
|
||||
<div class="separate">店铺评分: <el-rate v-model="storeInfo.serviceScore" disabled show-score text-color="#ff9900"
|
||||
score-template="{value}">
|
||||
</el-rate></div>
|
||||
<div class="separate">服务评分: <el-rate v-model="storeInfo.descriptionScore" disabled show-score text-color="#ff9900"
|
||||
score-template="{value}">
|
||||
</el-rate></div>
|
||||
<div class="separate">物流评分: <el-rate v-model="storeInfo.deliveryScore" disabled show-score text-color="#ff9900"
|
||||
score-template="{value}">
|
||||
</el-rate></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { Tag, button } from 'element-ui'
|
||||
import { Tag, button, rate } from 'element-ui'
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
value: null,
|
||||
colors: ['#99A9BF', '#F7BA2A', '#FF9900']
|
||||
}
|
||||
},
|
||||
components: {
|
||||
"el-tag": Tag,
|
||||
"el-button": button,
|
||||
"el-rate": rate
|
||||
},
|
||||
methods: {
|
||||
},
|
||||
|
@ -49,6 +59,16 @@ export default {
|
|||
</script>
|
||||
|
||||
<style scoped lang="less">
|
||||
.title_left_name {
|
||||
font-size: 12px;
|
||||
color: #a1a6af;
|
||||
}
|
||||
|
||||
.title_right_name {
|
||||
font-size: 12px;
|
||||
color: #343036;
|
||||
}
|
||||
|
||||
.store-button {
|
||||
background-color: white;
|
||||
border-color: #F56C6C;
|
||||
|
@ -73,5 +93,9 @@ export default {
|
|||
|
||||
.separate {
|
||||
margin-top: 8px;
|
||||
// display: inline;
|
||||
display: flex;
|
||||
font-size: 12px;
|
||||
color: #a1a6af;
|
||||
}
|
||||
</style>
|
|
@ -3,6 +3,9 @@ export default {
|
|||
BASE_API_URL: process.env.VUE_APP_API_BASE_URL || "",
|
||||
BASE_WS_URL: process.env.VUE_APP_WEB_SOCKET_URL || "",
|
||||
BASE_COMMON: process.env.VUE_APP_COMMON || "",
|
||||
PC_URL: process.env.VUE_APP_PC_URL || "",
|
||||
STORE_URL:process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:10002",
|
||||
PC_URL: process.env.VUE_APP_PC_URL || "https://pc-b2b2c.pickmall.cn",
|
||||
STORE_URL: process.env.VUE_APP_PC_ORDER_URL || "http://192.168.0.139:8000/",
|
||||
PC_STORE_GOODS: process.env.VUE_APP_PC_STORE_ORDER_URL || '',
|
||||
PC_STORE_ORDER: process.env.VUE_APP_PC_STORE_ORDER || '',
|
||||
PC_USER_ORDER: process.env.VUE_APP_PC_USER_ORDER || '',
|
||||
};
|
||||
|
|
|
@ -25,17 +25,27 @@ Vue.component('face', face)
|
|||
Vue.component('face-null', faceNull)
|
||||
|
||||
Vue.prototype.linkToGoods = function (goodsId, skuId) { // 跳转买家端商品
|
||||
console.log(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`)
|
||||
window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
|
||||
if (localStorage.getItem('storeFlag') == 'false') {
|
||||
window.open(`${config.PC_STORE_GOODS}goods-operation-edit?id=${goodsId}`, '_blank')
|
||||
} else {
|
||||
window.open(`${config.PC_URL}/goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
|
||||
}
|
||||
};
|
||||
Vue.prototype.linkToStore = function (storeId) { // 跳转买家端商品
|
||||
Vue.prototype.linkToStore = function (storeId) { // 跳转商家端商品
|
||||
console.log(`${config.PC_URL}/Merchant?id=${storeId}`)
|
||||
window.open(`${config.PC_URL}/Merchant?id=${storeId}`, '_blank')
|
||||
};
|
||||
// 订单跳转商家订单页面
|
||||
Vue.prototype.linkToOrders = function (sn) { // 跳转买家端订单
|
||||
window.open(`${config.STORE_URL}/order-detail?sn=${sn}`, '_blank')
|
||||
Vue.prototype.linkToOrders = function (sn) {
|
||||
if (localStorage.getItem('storeFlag') == 'false') {
|
||||
// 商家
|
||||
window.open(`${config.PC_STORE_GOODS}order-detail?sn=${sn}`, '_blank')
|
||||
} else {
|
||||
// 用户
|
||||
window.open(`${config.STORE_URL}/OrderDetail?sn=${sn}`, '_blank')
|
||||
}
|
||||
};
|
||||
|
||||
const Instance = new Vue({
|
||||
router,
|
||||
store,
|
||||
|
|
|
@ -1,29 +1,29 @@
|
|||
var BASE = {
|
||||
/**
|
||||
* @description api请求基础路径
|
||||
*/
|
||||
API_DEV: {
|
||||
common: "http://192.168.0.113:8890",
|
||||
buyer: "http://192.168.0.113:8888",
|
||||
seller: "http://192.168.0.113:8889",
|
||||
manager: "http://192.168.0.113:8887"
|
||||
},
|
||||
API_PROD: {
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
},
|
||||
/**
|
||||
* @description // 跳转买家端地址 pc端
|
||||
*/
|
||||
PC_URL: "https://pc-b2b2c.pickmall.cn",
|
||||
/**
|
||||
* @description // 跳转买家端地址 wap端
|
||||
*/
|
||||
WAP_URL: "https://m-b2b2c.pickmall.cn",
|
||||
/**
|
||||
* @description api请求基础路径前缀
|
||||
*/
|
||||
PREFIX: "/manager"
|
||||
};
|
||||
/**
|
||||
* @description api请求基础路径
|
||||
*/
|
||||
API_DEV: {
|
||||
common: "http://192.168.0.113:8890",
|
||||
buyer: "http://192.168.0.113:8888",
|
||||
seller: "http://192.168.0.113:8889",
|
||||
manager: "http://192.168.0.113:8887"
|
||||
},
|
||||
API_PROD: {
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
},
|
||||
/**
|
||||
* @description // 跳转买家端地址 pc端
|
||||
*/
|
||||
PC_URL: "https://pc-b2b2c.pickmall.cn",
|
||||
/**
|
||||
* @description // 跳转买家端地址 wap端
|
||||
*/
|
||||
WAP_URL: "https://m-b2b2c.pickmall.cn",
|
||||
/**
|
||||
* @description api请求基础路径前缀
|
||||
*/
|
||||
PREFIX: "/manager"
|
||||
};
|
||||
|
|
|
@ -3,10 +3,10 @@ var BASE = {
|
|||
* @description api请求基础路径
|
||||
*/
|
||||
API_DEV: {
|
||||
common: "http://192.168.0.113:8890",
|
||||
buyer: "http://192.168.0.113:8888",
|
||||
seller: "http://192.168.0.113:8889",
|
||||
manager: "http://192.168.0.113:8887"
|
||||
common: "https://common-api.pickmall.cn",
|
||||
buyer: "https://buyer-api.pickmall.cn",
|
||||
seller: "https://store-api.pickmall.cn",
|
||||
manager: "https://admin-api.pickmall.cn"
|
||||
},
|
||||
API_PROD: {
|
||||
common: "https://common-api.pickmall.cn",
|
||||
|
|
|
@ -258,7 +258,10 @@ export default {
|
|||
this.$Message.error("请登录后再联系客服");
|
||||
return;
|
||||
}
|
||||
window.open(`${res.result}?token=` + accessToken);
|
||||
// console.log(res.result, 'res.result');
|
||||
// http://192.168.0.139:8000/
|
||||
window.open(`http://192.168.0.139:8000/?token=` + accessToken);
|
||||
// window.open(`${res.result}?token=` + accessToken);
|
||||
},
|
||||
|
||||
// 获取im信息
|
||||
|
|
Loading…
Reference in New Issue