Commit 18f61794 by chenyu

update: update

parent 51d594aa
......@@ -265,11 +265,11 @@ export default {
path: '/allCustomers',
},
{
name: '会员详情',
name: '客户详情',
path: '/customerDetail?memberId=' + this.$route.query.memberId || '',
},
{
name: '会员门店消费',
name: '客户门店消费',
path: '',
},
],
......
<template>
<div class="page-content">
<v-nav :navpath="navpath"></v-nav>
<photo-album :member-id="memberId" :from="from"/>
<photo-album :member-id="memberId" :from="from" />
<vue-gic-footer style="padding-bottom:80px"></vue-gic-footer>
</div>
</template>
......@@ -15,7 +15,7 @@ export default {
vNav,
photoAlbum
},
data () {
data() {
return {
navpath: [
{
......@@ -23,8 +23,8 @@ export default {
path: ''
},
{
name: '会员详情',
path: ''
name: '客户详情',
path: '/customerDetail?memberId=' + this.$route.query.memberId || '',
},
{
name: "相册",
......@@ -33,31 +33,13 @@ export default {
],
memberId: '',
from: ''
}
};
},
created() {
let from = this.$route.query.from;
let memberId = this.$route.query.memberId;
this.memberId = memberId;
this.from = from;
switch (from) {
case '0':
// 微信会员
this.navpath[1] = {
name: '会员详情',
path: `/wechatmemberDetail?memberId=${memberId}`
}
break;
case '1':
// 微信总量
this.navpath[1] = {
name: '会员详情',
path: `/wechatTotalDetail?memberId=${memberId}`
}
break
default:
this.navpath.splice(1, 1);
}
}
}
</script>
......
......@@ -28,8 +28,8 @@ export default {
path: ''
},
{
name: '会员详情',
path: ''
name: '客户详情',
path: '/customerDetail?memberId=' + this.$route.query.memberId || '',
},
{
name: "相册",
......@@ -45,7 +45,6 @@ export default {
let from = this.$route.query.from;
let memberId = this.$route.query.memberId;
let folderId = this.$route.query.folderId;
this.from = from;
this.memberId = memberId;
this.folderId = folderId;
await this.getImgList()
......@@ -60,24 +59,6 @@ export default {
path: ''
})
}
switch (from) {
case '0':
// 微信会员
this.navpath[1] = {
name: '会员详情',
path: `/wechatmemberDetail?memberId=${memberId}`
}
break;
case '1':
// 微信总量
this.navpath[1] = {
name: '会员详情',
path: `/wechatTotalDetail?memberId=${memberId}`
}
break
default:
this.navpath.splice(1, 1);
}
},
methods: {
getImgList() {
......
......@@ -45,7 +45,7 @@ export default {
path: '/posmembers'
},
{
name: '会员详情',
name: '客户详情',
path: ''
}
],
......
......@@ -446,7 +446,7 @@ export default {
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path: "/customerDetail?memberId=" + this.$route.query.memberId || ""
},
{
......
......@@ -330,7 +330,7 @@ export default {
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path: "/customerDetail?memberId=" + this.$route.query.memberId || ""
},
{
......
......@@ -65,71 +65,71 @@
<div class="w-15">实付款</div>
<div class="w-15">交易状态</div>
</div>
<div
class="mTop20 member-table-txt"
v-for="(item, index) in memberData"
:key="index"
v-if="memberData && memberData.length > 0"
>
<div class="orderheader">
<div class="headerinfo">订单编号: {{ item.orderNumber }}</div>
<div class="headerinfo">下单时间:{{ item.createTime }}</div>
<div class="headerinfo">收件人: {{ item.buyerName }}</div>
<div class="headerinfo">手机号码:{{ item.buyerPhone }}</div>
<div class="headerinfo">收货地址:{{ item.addressInfo }}</div>
</div>
<template v-for="(item, index) in memberData">
<div
class="record-table"
:style="{height: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
class="mTop20 member-table-txt"
:key="index"
v-if="memberData && memberData.length > 0"
>
<div class="record-flex70">
<div
class="record-tablecontent"
v-for="(list, index) in item.orderItemList"
:key="index"
>
<div class="w-43">
<div style="display: flex;flex-wrap: wrap;align-items: center">
<div style="flex: 0 0 60px">
<img
width="60"
height="60"
:src="list.mallProImageUrl"
alt=""
>
</div>
<div style="flex: 1;margin-left: 5px">
<div class="font14 break">{{ list.mallProName }}</div>
<div class="mTop10 font14 member-goods-txt">{{ list.mallProSkuAttr | mallname}}</div>
<div class="orderheader">
<div class="headerinfo">订单编号: {{ item.orderNumber }}</div>
<div class="headerinfo">下单时间:{{ item.createTime }}</div>
<div class="headerinfo">收件人: {{ item.buyerName }}</div>
<div class="headerinfo">手机号码:{{ item.buyerPhone }}</div>
<div class="headerinfo">收货地址:{{ item.addressInfo }}</div>
</div>
<div
class="record-table"
:style="{height: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div class="record-flex70">
<div
class="record-tablecontent"
v-for="(list, iindex) in item.orderItemList"
:key="iindex"
>
<div class="w-43">
<div style="display: flex;flex-wrap: wrap;align-items: center">
<div style="flex: 0 0 60px">
<img
width="60"
height="60"
:src="list.mallProImageUrl"
alt=""
>
</div>
<div style="flex: 1;margin-left: 5px">
<div class="font14 break">{{ list.mallProName }}</div>
<div class="mTop10 font14 member-goods-txt">{{ list.mallProSkuAttr | mallname}}</div>
</div>
</div>
</div>
<div class="w-14">{{ list.mallProPrice }}</div>
<div class="w-21">{{ list.mallProNumber }}</div>
<div class="w-21">{{ list.refundPrice }}</div>
</div>
<div class="w-14">{{ list.mallProPrice }}</div>
<div class="w-21">{{ list.mallProNumber }}</div>
<div class="w-21">{{ list.refundPrice }}</div>
</div>
</div>
<div
class="width15 talign font14 borderight"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div class="posrelative">{{ item.payAmount }}
<div class="posabsolute">(含快递¥{{ item.orderItemFreight }})</div>
<div
class="width15 talign font14 borderight"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div class="posrelative">{{ item.payAmount }}
<div class="posabsolute">(含快递¥{{ item.orderItemFreight }}</div>
</div>
</div>
<div
class="width15 font14 talign"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div v-if="item.orderStep == 0">交易关闭</div>
<div v-if="item.orderStep == 1">等待买家付款</div>
<div v-if="item.orderStep == 2">买家已付款</div>
<div v-if="item.orderStep == 3">已发货</div>
<div v-if="item.orderStep == 4">交易完成</div>
</div>
</div>
<div
class="width15 font14 talign"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div v-if="item.orderStep == 0">交易关闭</div>
<div v-if="item.orderStep == 1">等待买家付款</div>
<div v-if="item.orderStep == 2">买家已付款</div>
<div v-if="item.orderStep == 3">已发货</div>
<div v-if="item.orderStep == 4">交易完成</div>
</div>
</div>
</div>
</template>
<div
style="text-align: center; font-size: 14px;"
v-if="memberData && memberData.length == 0"
......@@ -191,7 +191,7 @@ export default {
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path: "/customerDetail?memberId=" + this.$route.query.memberId || ""
},
{
......
......@@ -252,7 +252,7 @@ export default {
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path:"/customerDetail?memberId=" + this.$route.query.memberId || ""
},
{
......
......@@ -322,7 +322,7 @@ export default {
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path: "/customerDetail?memberId=" + this.$route.query.memberId
},
{
......
......@@ -122,7 +122,7 @@ export default ({
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path: "/customerDetail?memberId=" + this.$route.query.memberId
},
{
......
......@@ -223,7 +223,7 @@ export default {
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path: "/customerDetail?memberId=" + this.$route.query.memberId
},
{
......
......@@ -72,7 +72,7 @@ export default {
path: "/wechatmembers"
},
{
name: "会员详情",
name: "客户详情",
path: ""
}
],
......
......@@ -34,70 +34,71 @@
<div class="w-15">实付款</div>
<div class="w-15">订单类型</div>
</div>
<div
class="mTop20 member-table-txt"
v-for="(item, index) in memberData"
:key="index"
v-if="memberData && memberData.length > 0"
>
<div class="orderheader">
<div class="headerinfo">订单编号: {{ item.orderNumber }}</div>
<div class="headerinfo">下单时间:{{ item.createTime }}</div>
<div class="headerinfo">收件人: {{ item.buyerName }}</div>
<div class="headerinfo">手机号码:{{ item.buyerPhone }}</div>
<div class="headerinfo">收货地址:{{ item.addressInfo }}</div>
</div>
<template v-for="(item, index) in memberData">
<div
class="record-table"
:style="{height: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
class="mTop20 member-table-txt"
:key="index"
v-if="memberData && memberData.length > 0"
>
<div class="record-flex70">
<div
class="record-tablecontent"
v-for="(list, index) in item.orderItemList"
:key="index"
>
<div class="w-43">
<div style="display: flex;flex-wrap: wrap;align-items: center">
<div style="flex: 0 0 60px">
<img
width="60"
height="60"
:src="list.mallProImageUrl"
alt=""
>
</div>
<div style="flex: 1;margin-left: 5px">
<div class="font14 break">{{ list.mallProName }}</div>
<div class="mTop10 font14 member-goods-txt">{{ list.mallProSkuAttr }}</div>
<div class="orderheader">
<div class="headerinfo">订单编号: {{ item.orderNumber }}</div>
<div class="headerinfo">下单时间:{{ item.createTime }}</div>
<div class="headerinfo">收件人: {{ item.buyerName }}</div>
<div class="headerinfo">手机号码:{{ item.buyerPhone }}</div>
<div class="headerinfo">收货地址:{{ item.addressInfo }}</div>
</div>
<div
class="record-table"
:style="{height: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div class="record-flex70">
<div
class="record-tablecontent"
v-for="(list, iindex) in item.orderItemList"
:key="iindex"
>
<div class="w-43">
<div style="display: flex;flex-wrap: wrap;align-items: center">
<div style="flex: 0 0 60px">
<img
width="60"
height="60"
:src="list.mallProImageUrl"
alt=""
>
</div>
<div style="flex: 1;margin-left: 5px">
<div class="font14 break">{{ list.mallProName }}</div>
<div class="mTop10 font14 member-goods-txt">{{ list.mallProSkuAttr }}</div>
</div>
</div>
</div>
<div class="w-14">{{ list.mallProPrice }}</div>
<div class="w-21">{{ list.mallProNumber }}</div>
<div class="w-21">{{ 0 > list.payAmount ? list.payAmount : '--' }}</div>
</div>
<div class="w-14">{{ list.mallProPrice }}</div>
<div class="w-21">{{ list.mallProNumber }}</div>
<div class="w-21">{{ list.payAmount < 0 ? list.payAmount : '--' }}</div>
</div>
</div>
<div
class="width15 talign font14 borderight"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div class="posrelative">{{ item.payAmount }}
<div class="posabsolute">(¥{{ item.orderItemFreight }})</div>
<div
class="width15 talign font14 borderight"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div class="posrelative">{{ item.payAmount }}
<div class="posabsolute">(¥{{ item.orderItemFreight }}</div>
</div>
</div>
<div
class="width15 font14 talign"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div v-if="item.orderStatus == 1">购买</div>
<div v-if="item.orderStatus == 2">退款</div>
<div v-if="item.orderStatus == 4">退换货</div>
<!-- <div v-if="item.orderStep == 3">已发货</div>
<div v-if="item.orderStep == 4">交易完成</div> -->
</div>
</div>
<div
class="width15 font14 talign"
:style="{lineHeight: item.orderItemList ? (80*item.orderItemList.length) + 'px': ''}"
>
<div v-if="item.orderStatus == 1">购买</div>
<div v-if="item.orderStatus == 2">退款</div>
<div v-if="item.orderStatus == 4">退换货</div>
<!-- <div v-if="item.orderStep == 3">已发货</div>
<div v-if="item.orderStep == 4">交易完成</div> -->
</div>
</div>
</div>
</template>
<div
style="text-align: center; font-size: 14px;"
......@@ -160,7 +161,7 @@ export default {
path: "/allCustomers"
},
{
name: "会员详情",
name: "客户详情",
path: "/customerDetail?memberId=" + this.$route.query.memberId || ""
},
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment