mirror of
https://gitee.com/lab1024/smart-admin.git
synced 2025-10-02 18:26:38 +08:00
Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3
This commit is contained in:
Carl
commit
ded0f746b0
@ -4,6 +4,12 @@ body {
|
||||
line-height: 1.5;
|
||||
color: #666;
|
||||
}
|
||||
div[data-js-modal-menu] {
|
||||
display:none;
|
||||
}
|
||||
aside div[data-js-modal-menu] {
|
||||
display:block;
|
||||
}
|
||||
.el-message-box .el-button--primary{
|
||||
background-color: #e1001a !important;
|
||||
color:#fff;
|
||||
@ -20,12 +26,10 @@ body {
|
||||
.fade-leave-active {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.ts-no-data {
|
||||
text-align: center;
|
||||
margin: 3rem 0;
|
||||
}
|
||||
|
||||
.ts-mask {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
@ -37,7 +41,15 @@ body {
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
z-index: 99;
|
||||
|
||||
.ts-mask-close{
|
||||
position:absolute;
|
||||
top:1rem;
|
||||
right:1rem;
|
||||
width:1rem;
|
||||
height:1rem;
|
||||
background: url("../image/btn-close.png") center center no-repeat;
|
||||
background-size:contain;
|
||||
}
|
||||
.ts-mask-bg {
|
||||
background-color: #000;
|
||||
opacity: .6;
|
||||
@ -53,10 +65,11 @@ input[type=checkbox]{
|
||||
position:relative;
|
||||
cursor: pointer;
|
||||
border:none;
|
||||
border: 1px solid #d7d7d7;
|
||||
//border: 1px solid #d7d7d7;
|
||||
border-radius: 3px;
|
||||
width: 1.5rem;
|
||||
height: 1.5rem;
|
||||
-webkit-appearance:none;
|
||||
&:before {
|
||||
top: 0;
|
||||
left: 0;
|
||||
@ -323,12 +336,12 @@ picture {
|
||||
border-radius: .25rem;
|
||||
z-index:11;
|
||||
ul{
|
||||
width: 60px;
|
||||
height: 181px;
|
||||
width: 3.75rem;
|
||||
height: 11.3rem;
|
||||
background-color: white;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
justify-content: space-between;
|
||||
li {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
@ -350,7 +363,7 @@ picture {
|
||||
}
|
||||
|
||||
span {
|
||||
font-size: 0.12rem;
|
||||
font-size: .75rem;
|
||||
}
|
||||
|
||||
.tuntop {
|
||||
@ -411,7 +424,7 @@ picture {
|
||||
}
|
||||
label {
|
||||
input[type=checkbox] {
|
||||
top:.25rem;
|
||||
top:0rem;
|
||||
}
|
||||
}
|
||||
.rc-header__nav--primary{
|
||||
@ -804,7 +817,11 @@ picture {
|
||||
margin: 0 auto;
|
||||
.el-dialog{
|
||||
width: 100%;
|
||||
|
||||
}
|
||||
.el-dialog__body{
|
||||
max-height:50vh;
|
||||
overflow-x:hidden;
|
||||
overflow-y:auto;
|
||||
}
|
||||
}
|
||||
#tns2-iw {
|
||||
|
||||
@ -20,6 +20,14 @@
|
||||
}
|
||||
.ts-position-identifier{
|
||||
|
||||
}
|
||||
.ts-mobile-player-container {
|
||||
video {
|
||||
width:100%;
|
||||
height:auto;
|
||||
position: relative;
|
||||
z-index:2;
|
||||
}
|
||||
}
|
||||
.ul-zhuan,.ul-dog{
|
||||
li{
|
||||
@ -83,6 +91,7 @@
|
||||
}
|
||||
li{
|
||||
margin-top:1.875rem;
|
||||
margin-left:0;
|
||||
}
|
||||
}
|
||||
.ts-banner-swiper-container{
|
||||
@ -211,9 +220,29 @@
|
||||
width: 100%;
|
||||
height:auto;
|
||||
display: block;
|
||||
video{
|
||||
max-width:100%;
|
||||
max-height:100%;
|
||||
position:relative;
|
||||
z-index:0;
|
||||
&:before{
|
||||
content:"";
|
||||
background:#000;
|
||||
opacity:.6;
|
||||
position:absolute;
|
||||
width:100%;
|
||||
height:100%;
|
||||
left:0;
|
||||
top:0;
|
||||
z-index:1;
|
||||
}
|
||||
&:after{
|
||||
content:"";
|
||||
position:absolute;
|
||||
top:0;
|
||||
left:0;
|
||||
width:100%;
|
||||
height:100%;
|
||||
background:url("../image/btn-play.png") center center no-repeat;
|
||||
background-size:90px 90px;
|
||||
z-index:2;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -225,19 +254,32 @@
|
||||
align-items: center;
|
||||
border: 1px solid #d7d7d7;
|
||||
border-radius:4px;
|
||||
img{
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
z-index:0;
|
||||
}
|
||||
.rc-click{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
img{
|
||||
width: 100%;
|
||||
height: auto;
|
||||
position:relative;
|
||||
}
|
||||
}
|
||||
img{
|
||||
width: 10rem;
|
||||
height: 10rem;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
margin-top: 2.5rem;
|
||||
.click-zone{
|
||||
align-items: center;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
img{
|
||||
width: 10rem;
|
||||
height: 10rem;
|
||||
margin-top: 2.5rem;
|
||||
}
|
||||
}
|
||||
span{
|
||||
font-size: 1.125rem;
|
||||
@ -348,13 +390,13 @@
|
||||
// }
|
||||
}
|
||||
.active {
|
||||
font-size: 0.14rem;
|
||||
font-size: .875rem;
|
||||
img{
|
||||
border-width: 1px;
|
||||
}
|
||||
}
|
||||
.unactive {
|
||||
font-size: 0.14rem;
|
||||
font-size: .875rem;
|
||||
img{
|
||||
border-width: 1px;
|
||||
}
|
||||
|
||||
@ -253,6 +253,9 @@ ul li ol li em strong i {
|
||||
width: 440px;
|
||||
height: 652px;
|
||||
}
|
||||
.ts-crumbs {
|
||||
padding-left:.25rem;
|
||||
}
|
||||
.ts-mypersonal{
|
||||
margin-left:0;
|
||||
.rc-column{
|
||||
|
||||
@ -279,7 +279,7 @@
|
||||
align-items: center;
|
||||
height: 164px;
|
||||
.rc-usercenter{
|
||||
width: 25%;
|
||||
width: 27%;
|
||||
em{
|
||||
font-size: 18px;
|
||||
}
|
||||
@ -288,12 +288,12 @@
|
||||
border: 1px solid #D8D8D8;
|
||||
margin-left: 40px;
|
||||
|
||||
img {
|
||||
width: 96px;
|
||||
height: 96px;
|
||||
display: block;
|
||||
|
||||
}
|
||||
img {
|
||||
width: 96px;
|
||||
height: 96px;
|
||||
display: block;
|
||||
object-fit: contain;
|
||||
}
|
||||
}
|
||||
|
||||
.rc-right {
|
||||
@ -329,7 +329,7 @@
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 58%;
|
||||
width: 56%;
|
||||
font-size: 20px;
|
||||
color: #E1001A;
|
||||
font-weight: bold;
|
||||
|
||||
@ -289,7 +289,7 @@ border-radius: 100px;
|
||||
.rc-bottom{
|
||||
position: fixed;
|
||||
background: white;
|
||||
height: 617px;
|
||||
height: 21.875rem;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 9;
|
||||
|
||||
@ -152,10 +152,11 @@ ul li ol li em strong i {
|
||||
|
||||
|
||||
}
|
||||
.rc-value{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.rc-value{
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
.usermember{
|
||||
|
||||
@ -293,7 +293,7 @@ margin-right: 20px;
|
||||
|
||||
|
||||
//pc端
|
||||
@media screen and (min-width: 768px) and (max-width: 1920px) {
|
||||
@media screen and (min-width: 768px) {
|
||||
.rc-margin-y--md{
|
||||
display: none;
|
||||
}
|
||||
@ -444,7 +444,7 @@ margin-right: 20px;
|
||||
|
||||
width: 100%;
|
||||
margin-left: 16px;
|
||||
|
||||
justify-content: end;
|
||||
|
||||
}
|
||||
.rc-userright {
|
||||
|
||||
BIN
rc-busness/assets/image/btn-close.png
Normal file
BIN
rc-busness/assets/image/btn-close.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
BIN
rc-busness/assets/image/btn-play.png
Normal file
BIN
rc-busness/assets/image/btn-play.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
@ -304,7 +304,7 @@
|
||||
<div class="rc-column rc-padding-x--none">
|
||||
<ul class="rc-list rc-list--blank rc-list--align rc-btn-offset--top" role="menu">
|
||||
<li class="rc-list__item">
|
||||
<a class="rc-list__link rc-icon ts-login--xs rc-iconography--xs" role="menuitem" href="javascript:void();" @click="turnlogin">
|
||||
<a class="rc-list__link rc-icon ts-login--xs rc-iconography--xs" role="menuitem" @click="turnlogin">
|
||||
个人中心
|
||||
<em class="rc-screen-reader" v-if="loginornot"></em>
|
||||
</a>
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
<div v-if='error.statusCode!=404'>
|
||||
<h2>{{ error.statusCode }} 发现未知错误</h2>
|
||||
<div>
|
||||
<nuxt-link to="/">返回首页</nuxt-link>
|
||||
<a href="/">返回首页</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -97,17 +97,16 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="sw-center" >
|
||||
<div class="rc-click" @click="selectproduce(item,index)">
|
||||
<div class="uservideo">
|
||||
<video controls="controls" :poster=item.catimage preload="none">
|
||||
<source :src= item.video type="video/ogg">
|
||||
</video>
|
||||
<div class="rc-click">
|
||||
<div class="uservideo" @click="playMobileVideo(item)">
|
||||
<img :src="item.catimage">
|
||||
</div>
|
||||
<div class='click-zone' @click="selectproduce(item,index)">
|
||||
<img :src=item.productimage alt="">
|
||||
<span>{{item.title}}</span>
|
||||
<p>{{item.detail}}</p>
|
||||
<em>{{item.price}}</em>
|
||||
</div>
|
||||
|
||||
<img :src=item.productimage alt="">
|
||||
<span>{{item.title}}</span>
|
||||
<p>{{item.detail}}</p>
|
||||
<em>{{item.price}}</em>
|
||||
</div>
|
||||
<div class="rc-full-width rc-margin-y--md">
|
||||
<i @click="selectproduce(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i>
|
||||
@ -331,17 +330,16 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="sw-center" >
|
||||
<div class="rc-click" @click="selectproduce(item,index)">
|
||||
<div class="uservideo">
|
||||
<video controls="controls" preload="none" :poster="item.catimage">
|
||||
<source :src= item.video type="video/ogg">
|
||||
</video>
|
||||
<div class="rc-click" >
|
||||
<div class="uservideo" @click="playMobileVideo(item)">
|
||||
<img :src="item.catimage">
|
||||
</div>
|
||||
<div class='click-zone' @click="selectproduce(item,index)">
|
||||
<img :src=item.productimage alt="">
|
||||
<span>{{item.title}}</span>
|
||||
<p>{{item.detail}}</p>
|
||||
<em>{{item.price}}</em>
|
||||
</div>
|
||||
|
||||
<img :src=item.productimage alt="">
|
||||
<span>{{item.title}}</span>
|
||||
<p>{{item.detail}}</p>
|
||||
<em>{{item.price}}</em>
|
||||
</div>
|
||||
<div class="rc-full-width rc-margin-y--md">
|
||||
<i @click="selectproduce(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i>
|
||||
@ -694,8 +692,11 @@
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="ts-mask ts-mobile-player-container" v-show="mobileVideoPlaying">
|
||||
<div class="ts-mask-bg"></div>
|
||||
<div class="ts-mask-close" @click="closeMobileVideo"></div>
|
||||
<video controls="controls" ref="mobile-video-player"></video>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
@ -752,7 +753,7 @@
|
||||
fixedHeader:false,
|
||||
dataLoaded:true,
|
||||
useraindex:0,
|
||||
|
||||
mobileVideoPlaying:false,
|
||||
usertitle:'明星猫粮',
|
||||
dogtitle:'明星犬粮',
|
||||
processinformation:[],
|
||||
@ -1096,7 +1097,7 @@
|
||||
}
|
||||
},
|
||||
catStarProductswiperOption: {
|
||||
loop: true,
|
||||
//loop: true,
|
||||
slidesPerView: 'auto',
|
||||
centeredSlides: true,
|
||||
speed:1000,
|
||||
@ -1120,7 +1121,7 @@
|
||||
}
|
||||
},
|
||||
dogStarProductswiperOption: {
|
||||
loop: true,
|
||||
//loop: true,
|
||||
slidesPerView: 'auto',
|
||||
centeredSlides: true,
|
||||
speed:1000,
|
||||
@ -1177,6 +1178,19 @@
|
||||
window.removeEventListener('scroll', this.scrollToTop);
|
||||
},
|
||||
methods:{
|
||||
playMobileVideo(item){
|
||||
let videoPath=item.video;
|
||||
let player = this.$refs['mobile-video-player'];
|
||||
let _self = this;
|
||||
player.src=videoPath;
|
||||
player.play();
|
||||
this.mobileVideoPlaying = true;
|
||||
},
|
||||
closeMobileVideo(){
|
||||
this.mobileVideoPlaying = false;
|
||||
let player = this.$refs['mobile-video-player'];
|
||||
player.pause();
|
||||
},
|
||||
ifAdoid(item,index){
|
||||
//console.log(index);
|
||||
this.userindex=index;
|
||||
|
||||
@ -40,18 +40,18 @@
|
||||
<div class="rc-center">
|
||||
<div class="rc-usermain" v-for="(userlist,index) in item.orderDetailList" :key="index">
|
||||
<div class="rc-image">
|
||||
<img src="../../static/images/default.jpg" alt="" />
|
||||
<img :src= userlist.picFile alt="" />
|
||||
</div>
|
||||
<div class="rc-right">
|
||||
<div class="rc-usercenter">
|
||||
<em>{{ userlist.productName }}</em>
|
||||
<div class="rc-userright">
|
||||
<span>规格:{{ item.productId }}</span>
|
||||
<span>规格:{{ userlist.specifications }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rc-userbottom">
|
||||
<span>数量:{{ item.pcs }}件</span>
|
||||
<i>￥{{ 10 }}</i>
|
||||
<span>数量:{{ userlist.pcs }}件</span>
|
||||
<i>￥{{ userlist.ecPrice }}</i>
|
||||
<div class="rc-bottom">
|
||||
<span @click="userpay()">{{customer}}</span>
|
||||
</div>
|
||||
@ -96,7 +96,7 @@
|
||||
</li>
|
||||
<li>
|
||||
<span>下单时间::</span>
|
||||
<i>{{ item.orderDate }}</i>
|
||||
<i>{{ logisticsDate }}</i>
|
||||
</li>
|
||||
<li>
|
||||
<span>付款方式::</span>
|
||||
@ -147,8 +147,12 @@
|
||||
import Myheader from "~/components/header.vue";
|
||||
import { mapMutations } from "vuex";
|
||||
import { userin} from "../../ajax/getData";
|
||||
import MyFooter from '~/components/rc-footer.vue'
|
||||
import MyFooter from '~/components/rc-footer.vue';
|
||||
import Vue from 'vue';
|
||||
let vm = new Vue();
|
||||
import formatConversion from '../../static/js/date'
|
||||
import {selectaddress,canceldanhao,generateOrderWX} from "../../ajax/getData";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@ -276,9 +280,7 @@ if(data){
|
||||
else if(this.trackingstates==2){
|
||||
this.trackingstates='未发货'
|
||||
}
|
||||
console.log(this.goldmedal[i].orderDate);
|
||||
this.logisticsDate=new Date(this.goldmedal[i].orderDate.toLocaleString())//时间戳
|
||||
console.log(this.logisticsDate);
|
||||
this.logisticsDate=this.formatConversion(this.goldmedal[i].orderDate)//时间戳
|
||||
this.logisticsCompany=this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司
|
||||
this.orderNumber=this.goldmedal[i].orderNumber
|
||||
this.usersalesAmount=this.goldmedal[i].salesAmount;
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
</div>
|
||||
<div class="rc-right">
|
||||
<i :style='usercolor'>
|
||||
{{ item.couponName }}
|
||||
{{ item.couponDesc }}
|
||||
</i>
|
||||
<div class="rc-userfont">
|
||||
<strong>有效期</strong>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<Myheader></Myheader>
|
||||
<!-- <tabs></tabs> -->
|
||||
<div class="rc-top"></div>
|
||||
<tabs :crumbs="crumbs" :crumbStyle="`padding-left:0;`"></tabs>
|
||||
<tabs :crumbs="crumbs"></tabs>
|
||||
<div class="rc-layout-container rc-one-column rc-full-width ts-mypersonal">
|
||||
<div class="rc-column">
|
||||
<!-- <div class="rc-title">
|
||||
|
||||
@ -6,13 +6,89 @@ ul li ol li em strong i {
|
||||
.rc-header {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.settlement {
|
||||
|
||||
}
|
||||
|
||||
.rc-discount {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
img {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.rc-contair {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.rc-left {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #e1001a;
|
||||
width: 34%;
|
||||
float: left;
|
||||
height: 100%;
|
||||
i {
|
||||
font-style: normal;
|
||||
font-size: 12px;
|
||||
}
|
||||
span {
|
||||
font-size: 26px;
|
||||
}
|
||||
strong {
|
||||
font-style: normal;
|
||||
font-size: 12px;
|
||||
display: block;
|
||||
margin-top: 8px;
|
||||
}
|
||||
}
|
||||
.rc-right {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 5px 10px;
|
||||
justify-content: center;
|
||||
height: 100%;
|
||||
i {
|
||||
font-style: normal;
|
||||
font-size: 16px;
|
||||
color: #e1001a;
|
||||
}
|
||||
.rc-main {
|
||||
color: #999999;
|
||||
font-size: 12px;
|
||||
}
|
||||
span {
|
||||
display: block;
|
||||
margin-top: 2px;
|
||||
}
|
||||
em {
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
.rc-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-right: 10px;
|
||||
span {
|
||||
width: 72px;
|
||||
height: 25px;
|
||||
background: #e2001a;
|
||||
text-align: center;
|
||||
line-height: 25px;
|
||||
font-size: 12px;
|
||||
color: #ffffff;
|
||||
margin-bottom: 8px;
|
||||
border-radius: 100px;
|
||||
margin-right: 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.rc-main {
|
||||
width: 92%;
|
||||
@ -255,7 +331,7 @@ ul li ol li em strong i {
|
||||
}
|
||||
|
||||
ul {
|
||||
width: 25%;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
@ -65,12 +65,12 @@
|
||||
<span>配送方式:</span>
|
||||
<i>{{ shopprice.price }}</i>
|
||||
</li>
|
||||
<!--
|
||||
|
||||
<li>
|
||||
<span> 活动促销:</span>
|
||||
<i>{{ shopprice.distribution }}</i>
|
||||
<i class="ts-right-arr ts-right-arr--two" @click="userget()">{{ curCoupon.couponName }}</i>
|
||||
</li>
|
||||
-->
|
||||
|
||||
<li>
|
||||
<span>商品总价:</span>
|
||||
<i class="red">{{ sumPrice }}</i>
|
||||
@ -147,12 +147,43 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :visible.sync="dialogInfo1" class="pop_coupon">
|
||||
<div class="ts-no-data" v-if="drawlist.length<=0">您还没有优惠券，可在商品的详情页面中领取</div>
|
||||
<div class="rs-dis">
|
||||
<div
|
||||
class="rc-discount"
|
||||
v-for="(item, index) in drawlist"
|
||||
:key="index"
|
||||
>
|
||||
<img :src="userimage" alt="" />
|
||||
<div class="rc-contair">
|
||||
<div class="rc-left">
|
||||
<div v-if="item.couponAmount">
|
||||
<i>￥</i><span>{{ item.couponAmount }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rc-right">
|
||||
<i>
|
||||
{{ item.couponDesc }}
|
||||
</i>
|
||||
<div v-show="item.validTo">
|
||||
<span>有效期</span>
|
||||
<em>{{ item.validTo }}</em>
|
||||
</div>
|
||||
<div class="rc-footer">
|
||||
<span @click="pickCoupon(item)">立即使用</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Myheader from "~/components/header.vue";
|
||||
import { userin, memberAddress, generateOrderWX } from "../../ajax/getData";
|
||||
import { userin, memberAddress, generateOrderWX, getdraw } from "../../ajax/getData";
|
||||
import tabs from "@/components/tabs.vue";
|
||||
import myAddress from "~/components/address.vue";
|
||||
import { mapMutations } from "vuex";
|
||||
@ -170,6 +201,10 @@ export default {
|
||||
path:'/personal/settlement'
|
||||
}
|
||||
],
|
||||
userimage: require("../../assets/image/unused.png"),
|
||||
curCoupon:{couponName:'未选择可用优惠券'},
|
||||
drawlist:[],
|
||||
dialogInfo1:false,
|
||||
goldmedal: [],
|
||||
dialogAddTitle: "",
|
||||
addressstype: null,
|
||||
@ -210,7 +245,6 @@ export default {
|
||||
// 总价计算
|
||||
sumPrice() {
|
||||
return this.goldmedal.reduce((pre, cur) => {
|
||||
console.log(pre);
|
||||
return pre + cur.buyCount * cur.productPrice;
|
||||
}, 0);
|
||||
},
|
||||
@ -229,6 +263,35 @@ export default {
|
||||
});
|
||||
this.useraddress = data;
|
||||
},
|
||||
userget(){
|
||||
let user = this.$store.state.userInfo;
|
||||
if (user) {
|
||||
this.userdraw(user.data.mobile);
|
||||
this.dialogInfo1 = true;
|
||||
} else {
|
||||
this.$router.push({
|
||||
path: "/userlogin/login",
|
||||
});
|
||||
}
|
||||
},
|
||||
//获取用户领取的优惠券
|
||||
async userdraw(mobile) {
|
||||
let data = await getdraw(mobile);
|
||||
let _self = this;
|
||||
if (data) {
|
||||
//TODO check status = 0
|
||||
this.drawlist=[];
|
||||
data.data.forEach((item) => {
|
||||
if(item.status==0) {
|
||||
_self.drawlist.push(item);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
pickCoupon(item){
|
||||
this.curCoupon = item;
|
||||
this.dialogInfo1 = false;
|
||||
},
|
||||
editAddress(item) {
|
||||
this.dialogAddTitle = "修改收货地址";
|
||||
this.editAddressData = {
|
||||
@ -331,6 +394,13 @@ export default {
|
||||
addressDetailInfo: orderAddress[0].detailAddress,
|
||||
},
|
||||
};
|
||||
if(this.curCoupon.couponId) {
|
||||
oneProduct.couponId = this.curCoupon.couponId;
|
||||
oneProduct.couponTypeId = this.curCoupon.couponTypeId;
|
||||
oneProduct.couponName = this.curCoupon.couponName;
|
||||
oneProduct.couponCode = this.curCoupon.couponCode;
|
||||
oneProduct.couponAmount = (this.curCoupon.couponAmount?this.curCoupon.couponAmount:this.curCoupon.discount);
|
||||
}
|
||||
postData.push(oneProduct);
|
||||
});
|
||||
// let postData = [
|
||||
@ -405,9 +475,6 @@ export default {
|
||||
},
|
||||
async canceldanhao(orderNumber) {
|
||||
let data = await userin(orderNumber);
|
||||
console.log(data);
|
||||
// this.goldmedal=data;
|
||||
console.log(this.goldmedal);
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
|
||||
@ -44,23 +44,23 @@
|
||||
</div>
|
||||
<div class="rc-usermain" >
|
||||
<div class="rc-image">
|
||||
<img src="../../static/images/default.jpg" alt="" />
|
||||
<img :src= item.picFile alt="" />
|
||||
</div>
|
||||
<div class="rc-right" @click="usertiaozhuan(item)">
|
||||
<div class="rc-usercenter">
|
||||
<em>{{ item.usereat }}</em>
|
||||
<em>{{ item.productName }}</em>
|
||||
<div class="rc-userright">
|
||||
<span>规格:{{ item.num }}</span>
|
||||
<span>规格:{{ item.specifications }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rc-userbottom">
|
||||
<span>数量:{{ item.pcs }}件</span>
|
||||
<i>￥10</i>
|
||||
<i>￥{{item.ecPrice}}</i>
|
||||
</div>
|
||||
<div class="rc-userbottomm">
|
||||
<i>￥{{ item.userprice }}</i>
|
||||
<span>{{ item.orderstype }}</span>
|
||||
<i>￥{{ item.userprice }}</i>
|
||||
<i>￥{{ item.ecPrice }}</i>
|
||||
<span>{{ item.pcs }}</span>
|
||||
<i>￥{{ item.salesAmount }}</i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -322,6 +322,12 @@ export default {
|
||||
this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName;
|
||||
this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber;
|
||||
this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
|
||||
// this.useralllist[i].picFile = this.goldmedal[i].picFile; //图片路径
|
||||
// this.useralllist[i].productName=this.goldmedal[i].productName;//商品名称
|
||||
// this.useralllist[i].ecPrice=this.goldmedal[i].ecPrice//第一个的单价
|
||||
// this.useralllist[i].pcs=this.goldmedal[i].pcs//数量
|
||||
|
||||
|
||||
this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
|
||||
}
|
||||
console.log(this.obligation)
|
||||
|
||||
@ -4,46 +4,42 @@
|
||||
<div class="rc-top"></div>
|
||||
<tabs :crumbs="crumbs"></tabs>
|
||||
<div class="rc-full-width rc-max-width--xl rc-padding-bottom--lg">
|
||||
<div class="rc-main">
|
||||
|
||||
<div class="rc-center" >
|
||||
<van-swipe @change="onChange">
|
||||
<van-swipe-item v-for="(banner, index) in banners" :key="index">
|
||||
<img :src="banner.src" class="useraimg"/>
|
||||
</van-swipe-item>
|
||||
</van-swipe>
|
||||
<!-- <img :src='userimage' /> -->
|
||||
</div>
|
||||
<div class="rc-order">
|
||||
<span>当前等级：{{userorder}}</span>
|
||||
</div>
|
||||
<div class="rc-cordd">
|
||||
<span>距离升级还差:{{ rcvalue }} </span>
|
||||
<div class="block">
|
||||
<div class="r-block" ref="userblock"></div>
|
||||
|
||||
<!-- <el-slider v-model="value" range show-stops :max="10"> </el-slider> -->
|
||||
|
||||
|
||||
</div>
|
||||
<div class="rc-value">
|
||||
<span>新手铲屎官</span>
|
||||
<span>资深铲屎官</span>
|
||||
<span>金牌铲屎官</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rc-layout-container">
|
||||
<div class="usermember rc-column" v-for="(item,index) in newlist" :key="index">
|
||||
<div class="rc-image">
|
||||
<img :src="item.catimage" alt="" />
|
||||
<div class="rc-main">
|
||||
<div class="rc-center" >
|
||||
<van-swipe @change="onChange">
|
||||
<van-swipe-item v-for="(banner, index) in banners" :key="index">
|
||||
<img :src="banner.src" class="useraimg"/>
|
||||
</van-swipe-item>
|
||||
</van-swipe>
|
||||
<!-- <img :src='userimage' /> -->
|
||||
</div>
|
||||
<div class="rc-userorder">
|
||||
<em>{{item.title}}</em>
|
||||
<span>{{item.usereat}}</span>
|
||||
<div class="rc-order">
|
||||
<span>当前等级：{{userorder}}</span>
|
||||
</div>
|
||||
<div class="rc-cordd">
|
||||
<span>距离升级还差:{{ rcvalue }} </span>
|
||||
<div class="block">
|
||||
<div class="r-block" ref="userblock"></div>
|
||||
<!-- <el-slider v-model="value" range show-stops :max="10"> </el-slider> -->
|
||||
</div>
|
||||
<div class="rc-value">
|
||||
<span class="rc-styled-link" @click="onChange(0)">新手铲屎官</span>
|
||||
<span class="rc-styled-link" @click="onChange(1)">资深铲屎官</span>
|
||||
<span class="rc-styled-link" @click="onChange(2)">金牌铲屎官</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="rc-layout-container">
|
||||
<div class="usermember rc-column" v-for="(item,index) in newlist" :key="index">
|
||||
<div class="rc-image">
|
||||
<img :src="item.catimage" alt="" />
|
||||
</div>
|
||||
<div class="rc-userorder">
|
||||
<em>{{item.title}}</em>
|
||||
<span>{{item.usereat}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Myfooter></Myfooter>
|
||||
@ -246,17 +242,17 @@ data(){
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
onChange(index){
|
||||
console.log(index);
|
||||
if(index==0){
|
||||
this.newlist=this.newlista;
|
||||
}else if(index==1){
|
||||
this.newlist=this.senior
|
||||
}else if(index==2){
|
||||
this.newlist=this.goldmedal
|
||||
}
|
||||
console.log(this.newlist)
|
||||
}
|
||||
onChange(index){
|
||||
console.log(index);
|
||||
if(index==0){
|
||||
this.newlist=this.newlista;
|
||||
}else if(index==1){
|
||||
this.newlist=this.senior
|
||||
}else if(index==2){
|
||||
this.newlist=this.goldmedal
|
||||
}
|
||||
console.log(this.newlist)
|
||||
}
|
||||
|
||||
},
|
||||
components:{
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<Myheader></Myheader>
|
||||
<div class="rc-top"></div>
|
||||
<tabs :crumbs="crumbs"></tabs>
|
||||
<div class="online" id="fixed-catbar-seperator"></div>
|
||||
<div class="online" id="fixed-catbar-seperator rc-margin--none"></div>
|
||||
<div class="rc-top"></div>
|
||||
<div
|
||||
class="
|
||||
@ -147,7 +147,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="rc-main">
|
||||
<div class="rc-produnnum">
|
||||
<div class="rc-produnnum" v-if="(userbuy && curItem.leftAllotment>0)">
|
||||
<div><i class="ts-row-title">商品数量：</i></div>
|
||||
<img
|
||||
src="../../assets/image/userjian.png"
|
||||
@ -209,6 +209,7 @@
|
||||
<Myfooter v-on:litentop="showmesg"></Myfooter>
|
||||
</div>
|
||||
<el-dialog :visible.sync="dialogInfo1" @close="userclose" class="pop_coupon">
|
||||
<div class="ts-no-data" v-if="usernewlist.length<=0">您还没有优惠券，可在商品的详情页面中领取</div>
|
||||
<div class="rs-dis">
|
||||
<div
|
||||
class="rc-discount"
|
||||
@ -226,7 +227,7 @@
|
||||
<i>
|
||||
{{ item.couponDesc }}
|
||||
</i>
|
||||
<div>
|
||||
<div v-show="item.validTo">
|
||||
<span>有效期</span>
|
||||
<em>{{ item.validTo }}</em>
|
||||
</div>
|
||||
@ -528,9 +529,7 @@ export default {
|
||||
userlist.filter((item) => {
|
||||
item.productCodes = item.productCodes.split(",");
|
||||
item.productCodes.forEach((element) => {
|
||||
if (element == this.productCode && item.activityId !== 10) {
|
||||
console.log(element);
|
||||
console.log(this.productCode);
|
||||
if (element == this.curItem.productCode && item.activityId !== 10) {
|
||||
menualist.push(item);
|
||||
}
|
||||
});
|
||||
|
||||
28
rc-busness/static/js/date.js
Normal file
28
rc-busness/static/js/date.js
Normal file
@ -0,0 +1,28 @@
|
||||
|
||||
//时间戳转化成格式时间
|
||||
import Vue from 'vue';
|
||||
Vue.prototype.formatConversion = function (te){
|
||||
if(te == ''){
|
||||
return '';
|
||||
}else if(te.length == 10){
|
||||
var time = new Date(te * 1000); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
|
||||
var y = time.getFullYear();
|
||||
var m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
|
||||
var d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
|
||||
var h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
|
||||
var mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
|
||||
var s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
|
||||
var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s;
|
||||
return timedate;
|
||||
}else{
|
||||
var time = new Date(te);
|
||||
var y = time.getFullYear();
|
||||
var m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1;
|
||||
var d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate();
|
||||
var h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours();
|
||||
var mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes();
|
||||
var s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds();
|
||||
var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s;
|
||||
return timedate;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user