xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-03 02:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3

Browse Source
This commit is contained in:
Carl 2022-01-24 16:41:33 +08:00
commit ded0f746b0
21 changed files with 399 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rc-busness/assets/css/global.less
View File

@ -4,6 +4,12 @@ body {
line-height: 1.5; line-height: 1.5;
color: #666; color: #666;
} }
div[data-js-modal-menu] {
display:none;
}
aside div[data-js-modal-menu] {
display:block;
}
.el-message-box .el-button--primary{ .el-message-box .el-button--primary{
background-color: #e1001a !important; background-color: #e1001a !important;
color:#fff; color:#fff;
@ -20,12 +26,10 @@ body {
.fade-leave-active { .fade-leave-active {
opacity: 0; opacity: 0;
} }
.ts-no-data { .ts-no-data {
text-align: center; text-align: center;
margin: 3rem 0; margin: 3rem 0;
} }
.ts-mask { .ts-mask {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -37,7 +41,15 @@ body {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 99; 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 { .ts-mask-bg {
background-color: #000; background-color: #000;
opacity: .6; opacity: .6;
@ -53,10 +65,11 @@ input[type=checkbox]{
position:relative; position:relative;
cursor: pointer; cursor: pointer;
border:none; border:none;
border: 1px solid #d7d7d7; //border: 1px solid #d7d7d7;
border-radius: 3px; border-radius: 3px;
width: 1.5rem; width: 1.5rem;
height: 1.5rem; height: 1.5rem;
-webkit-appearance:none;
&:before { &:before {
top: 0; top: 0;
left: 0; left: 0;
@ -323,12 +336,12 @@ picture {
border-radius: .25rem; border-radius: .25rem;
z-index:11; z-index:11;
ul{ ul{
width: 60px; width: 3.75rem;
height: 181px; height: 11.3rem;
background-color: white; background-color: white;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between;
li { li {
width: 100%; width: 100%;
display: flex; display: flex;
@ -350,7 +363,7 @@ picture {
} }
span { span {
font-size: 0.12rem; font-size: .75rem;
} }
.tuntop { .tuntop {
@ -411,7 +424,7 @@ picture {
} }
label { label {
input[type=checkbox] { input[type=checkbox] {
top:.25rem; top:0rem;
} }
} }
.rc-header__nav--primary{ .rc-header__nav--primary{
@ -804,7 +817,11 @@ picture {
margin: 0 auto; margin: 0 auto;
.el-dialog{ .el-dialog{
width: 100%; width: 100%;
}
.el-dialog__body{
max-height:50vh;
overflow-x:hidden;
overflow-y:auto;
} }
} }
#tns2-iw { #tns2-iw {

56
rc-busness/assets/css/index.less
View File

@ -20,6 +20,14 @@
} }
.ts-position-identifier{ .ts-position-identifier{
}
.ts-mobile-player-container {
video {
width:100%;
height:auto;
position: relative;
z-index:2;
}
} }
.ul-zhuan,.ul-dog{ .ul-zhuan,.ul-dog{
li{ li{
@ -83,6 +91,7 @@
} }
li{ li{
margin-top:1.875rem; margin-top:1.875rem;
margin-left:0;
} }
} }
.ts-banner-swiper-container{ .ts-banner-swiper-container{
@ -211,9 +220,29 @@
width: 100%; width: 100%;
height:auto; height:auto;
display: block; display: block;
video{ position:relative;
max-width:100%; z-index:0;
max-height:100%; &: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,20 +254,33 @@
align-items: center; align-items: center;
border: 1px solid #d7d7d7; border: 1px solid #d7d7d7;
border-radius:4px; border-radius:4px;
img{
object-fit: cover;
display: block;
z-index:0;
}
.rc-click{ .rc-click{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
img{
width: 100%;
height: auto;
position:relative;
} }
}
.click-zone{
align-items: center;
display: flex;
flex-direction: column;
img{ img{
width: 10rem; width: 10rem;
height: 10rem; height: 10rem;
object-fit: cover;
display: block;
margin-top: 2.5rem; margin-top: 2.5rem;
} }
}
span{ span{
font-size: 1.125rem; font-size: 1.125rem;
color: #E2001A; color: #E2001A;
@ -348,13 +390,13 @@
// } // }
} }
.active { .active {
font-size: 0.14rem; font-size: .875rem;
img{ img{
border-width: 1px; border-width: 1px;
} }
} }
.unactive { .unactive {
font-size: 0.14rem; font-size: .875rem;
img{ img{
border-width: 1px; border-width: 1px;
} }

3
rc-busness/assets/css/mypersonal.less
View File

@ -253,6 +253,9 @@ ul li ol li em strong i {
width: 440px; width: 440px;
height: 652px; height: 652px;
} }
.ts-crumbs {
padding-left:.25rem;
}
.ts-mypersonal{ .ts-mypersonal{
margin-left:0; margin-left:0;
.rc-column{ .rc-column{

6
rc-busness/assets/css/orderquantity.less
View File

@ -279,7 +279,7 @@
align-items: center; align-items: center;
height: 164px; height: 164px;
.rc-usercenter{ .rc-usercenter{
width: 25%; width: 27%;
em{ em{
font-size: 18px; font-size: 18px;
} }
@ -292,7 +292,7 @@
width: 96px; width: 96px;
height: 96px; height: 96px;
display: block; display: block;
object-fit: contain;
} }
} }
@ -329,7 +329,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
width: 58%; width: 56%;
font-size: 20px; font-size: 20px;
color: #E1001A; color: #E1001A;
font-weight: bold; font-weight: bold;

2
rc-busness/assets/css/search.less
View File

@ -289,7 +289,7 @@ border-radius: 100px;
.rc-bottom{ .rc-bottom{
position: fixed; position: fixed;
background: white; background: white;
height: 617px; height: 21.875rem;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 9; z-index: 9;

1
rc-busness/assets/css/usermember.less
View File

@ -155,6 +155,7 @@ ul li ol li em strong i {
.rc-value{ .rc-value{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
cursor: pointer;
} }
} }

4
rc-busness/assets/css/usertion.less
View File

@ -293,7 +293,7 @@ margin-right: 20px;
//pc端 //pc端
@media screen and (min-width: 768px) and (max-width: 1920px) { @media screen and (min-width: 768px) {
.rc-margin-y--md{ .rc-margin-y--md{
display: none; display: none;
} }
@ -444,7 +444,7 @@ margin-right: 20px;
width: 100%; width: 100%;
margin-left: 16px; margin-left: 16px;
justify-content: end;
} }
.rc-userright { .rc-userright {

BIN
rc-busness/assets/image/btn-close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
rc-busness/assets/image/btn-play.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

2
rc-busness/components/header.vue
View File

@ -304,7 +304,7 @@
<div class="rc-column rc-padding-x--none"> <div class="rc-column rc-padding-x--none">
<ul class="rc-list rc-list--blank rc-list--align rc-btn-offset--top" role="menu"> <ul class="rc-list rc-list--blank rc-list--align rc-btn-offset--top" role="menu">
<li class="rc-list__item"> <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> <em class="rc-screen-reader" v-if="loginornot"></em>
</a> </a>

2
rc-busness/layouts/error.vue
View File

@ -11,7 +11,7 @@
<div v-if='error.statusCode!=404'> <div v-if='error.statusCode!=404'>
<h2>{{ error.statusCode }} 发现未知错误</h2> <h2>{{ error.statusCode }} 发现未知错误</h2>
<div> <div>
<nuxt-link to="/">返回首页</nuxt-link> <a href="/">返回首页</a>
</div> </div>
</div> </div>
</div> </div>

48
rc-busness/pages/index.vue
View File

@ -97,18 +97,17 @@
</div> </div>
</div> </div>
<div class="sw-center" > <div class="sw-center" >
<div class="rc-click" @click="selectproduce(item,index)"> <div class="rc-click">
<div class="uservideo"> <div class="uservideo" @click="playMobileVideo(item)">
<video controls="controls" :poster=item.catimage preload="none"> <img :src="item.catimage">
<source :src= item.video type="video/ogg">
</video>
</div> </div>
<div class='click-zone' @click="selectproduce(item,index)">
<img :src=item.productimage alt=""> <img :src=item.productimage alt="">
<span>{{item.title}}</span> <span>{{item.title}}</span>
<p>{{item.detail}}</p> <p>{{item.detail}}</p>
<em>{{item.price}}</em> <em>{{item.price}}</em>
</div> </div>
</div>
<div class="rc-full-width rc-margin-y--md"> <div class="rc-full-width rc-margin-y--md">
<i @click="selectproduce(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i> <i @click="selectproduce(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i>
</div> </div>
@ -331,18 +330,17 @@
</div> </div>
</div> </div>
<div class="sw-center" > <div class="sw-center" >
<div class="rc-click" @click="selectproduce(item,index)"> <div class="rc-click" >
<div class="uservideo"> <div class="uservideo" @click="playMobileVideo(item)">
<video controls="controls" preload="none" :poster="item.catimage"> <img :src="item.catimage">
<source :src= item.video type="video/ogg">
</video>
</div> </div>
<div class='click-zone' @click="selectproduce(item,index)">
<img :src=item.productimage alt=""> <img :src=item.productimage alt="">
<span>{{item.title}}</span> <span>{{item.title}}</span>
<p>{{item.detail}}</p> <p>{{item.detail}}</p>
<em>{{item.price}}</em> <em>{{item.price}}</em>
</div> </div>
</div>
<div class="rc-full-width rc-margin-y--md"> <div class="rc-full-width rc-margin-y--md">
<i @click="selectproduce(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i> <i @click="selectproduce(item,index)" class="ts-standard-btn ts-standard-btn--two center">立即购买</i>
</div> </div>
@ -694,8 +692,11 @@
</a> </a>
</div> </div>
</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> </div>
@ -752,7 +753,7 @@
fixedHeader:false, fixedHeader:false,
dataLoaded:true, dataLoaded:true,
useraindex:0, useraindex:0,
mobileVideoPlaying:false,
usertitle:'明星猫粮', usertitle:'明星猫粮',
dogtitle:'明星犬粮', dogtitle:'明星犬粮',
processinformation:[], processinformation:[],
@ -1096,7 +1097,7 @@
} }
}, },
catStarProductswiperOption: { catStarProductswiperOption: {
loop: true, //loop: true,
slidesPerView: 'auto', slidesPerView: 'auto',
centeredSlides: true, centeredSlides: true,
speed:1000, speed:1000,
@ -1120,7 +1121,7 @@
} }
}, },
dogStarProductswiperOption: { dogStarProductswiperOption: {
loop: true, //loop: true,
slidesPerView: 'auto', slidesPerView: 'auto',
centeredSlides: true, centeredSlides: true,
speed:1000, speed:1000,
@ -1177,6 +1178,19 @@
window.removeEventListener('scroll', this.scrollToTop); window.removeEventListener('scroll', this.scrollToTop);
}, },
methods:{ 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){ ifAdoid(item,index){
//console.log(index); //console.log(index);
this.userindex=index; this.userindex=index;

20
rc-busness/pages/myorder/usertion.vue
View File

@ -40,18 +40,18 @@
<div class="rc-center"> <div class="rc-center">
<div class="rc-usermain" v-for="(userlist,index) in item.orderDetailList" :key="index"> <div class="rc-usermain" v-for="(userlist,index) in item.orderDetailList" :key="index">
<div class="rc-image"> <div class="rc-image">
<img src="../../static/images/default.jpg" alt="" /> <img :src= userlist.picFile alt="" />
</div> </div>
<div class="rc-right"> <div class="rc-right">
<div class="rc-usercenter"> <div class="rc-usercenter">
<em>{{ userlist.productName }}</em> <em>{{ userlist.productName }}</em>
<div class="rc-userright"> <div class="rc-userright">
<span>规格:{{ item.productId }}</span> <span>规格:{{ userlist.specifications }}</span>
</div> </div>
</div> </div>
<div class="rc-userbottom"> <div class="rc-userbottom">
<span>数量:{{ item.pcs }}件</span> <span>数量:{{ userlist.pcs }}件</span>
<i>￥{{ 10 }}</i> <i>￥{{ userlist.ecPrice }}</i>
<div class="rc-bottom"> <div class="rc-bottom">
<span @click="userpay()">{{customer}}</span> <span @click="userpay()">{{customer}}</span>
</div> </div>
@ -96,7 +96,7 @@
</li> </li>
<li> <li>
<span>下单时间::</span> <span>下单时间::</span>
<i>{{ item.orderDate }}</i> <i>{{ logisticsDate }}</i>
</li> </li>
<li> <li>
<span>付款方式::</span> <span>付款方式::</span>
@ -147,8 +147,12 @@
import Myheader from "~/components/header.vue"; import Myheader from "~/components/header.vue";
import { mapMutations } from "vuex"; import { mapMutations } from "vuex";
import { userin} from "../../ajax/getData"; 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"; import {selectaddress,canceldanhao,generateOrderWX} from "../../ajax/getData";
export default { export default {
data() { data() {
return { return {
@ -276,9 +280,7 @@ if(data){
else if(this.trackingstates==2){ else if(this.trackingstates==2){
this.trackingstates='未发货' this.trackingstates='未发货'
} }
console.log(this.goldmedal[i].orderDate); this.logisticsDate=this.formatConversion(this.goldmedal[i].orderDate)//时间戳
this.logisticsDate=new Date(this.goldmedal[i].orderDate.toLocaleString())//时间戳
console.log(this.logisticsDate);
this.logisticsCompany=this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司 this.logisticsCompany=this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司
this.orderNumber=this.goldmedal[i].orderNumber this.orderNumber=this.goldmedal[i].orderNumber
this.usersalesAmount=this.goldmedal[i].salesAmount; this.usersalesAmount=this.goldmedal[i].salesAmount;

2
rc-busness/pages/personal/discount.vue
View File

@ -41,7 +41,7 @@
</div> </div>
<div class="rc-right"> <div class="rc-right">
<i :style='usercolor'> <i :style='usercolor'>
{{ item.couponName }} {{ item.couponDesc }}
</i> </i>
<div class="rc-userfont"> <div class="rc-userfont">
<strong>有效期</strong> <strong>有效期</strong>

2
rc-busness/pages/personal/mypersonal.vue
View File

@ -3,7 +3,7 @@
<Myheader></Myheader> <Myheader></Myheader>
<!-- <tabs></tabs> --> <!-- <tabs></tabs> -->
<div class="rc-top"></div> <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-layout-container rc-one-column rc-full-width ts-mypersonal">
<div class="rc-column"> <div class="rc-column">
<!-- <div class="rc-title"> <!-- <div class="rc-title">

86
rc-busness/pages/personal/settlement.less
View File

@ -6,13 +6,89 @@ ul li ol li em strong i {
.rc-header { .rc-header {
width: 100%; width: 100%;
} }
.settlement { .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 { .rc-main {
width: 92%; width: 92%;
@ -255,7 +331,7 @@ ul li ol li em strong i {
} }
ul { ul {
width: 25%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;

83
rc-busness/pages/personal/settlement.vue
View File

@ -65,12 +65,12 @@
<span>配送方式:</span> <span>配送方式:</span>
<i>{{ shopprice.price }}</i> <i>{{ shopprice.price }}</i>
</li> </li>
<!--
<li> <li>
<span> 活动促销:</span> <span> 活动促销:</span>
<i>{{ shopprice.distribution }}</i> <i class="ts-right-arr ts-right-arr--two" @click="userget()">{{ curCoupon.couponName }}</i>
</li> </li>
-->
<li> <li>
<span>商品总价:</span> <span>商品总价:</span>
<i class="red">{{ sumPrice }}</i> <i class="red">{{ sumPrice }}</i>
@ -147,12 +147,43 @@
</div> </div>
</div> </div>
</el-dialog> </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> </div>
</template> </template>
<script> <script>
import Myheader from "~/components/header.vue"; 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 tabs from "@/components/tabs.vue";
import myAddress from "~/components/address.vue"; import myAddress from "~/components/address.vue";
import { mapMutations } from "vuex"; import { mapMutations } from "vuex";
@ -170,6 +201,10 @@ export default {
path:'/personal/settlement' path:'/personal/settlement'
} }
], ],
userimage: require("../../assets/image/unused.png"),
curCoupon:{couponName:'未选择可用优惠券'},
drawlist:[],
dialogInfo1:false,
goldmedal: [], goldmedal: [],
dialogAddTitle: "", dialogAddTitle: "",
addressstype: null, addressstype: null,
@ -210,7 +245,6 @@ export default {
// 总价计算 // 总价计算
sumPrice() { sumPrice() {
return this.goldmedal.reduce((pre, cur) => { return this.goldmedal.reduce((pre, cur) => {
console.log(pre);
return pre + cur.buyCount * cur.productPrice; return pre + cur.buyCount * cur.productPrice;
}, 0); }, 0);
}, },
@ -229,6 +263,35 @@ export default {
}); });
this.useraddress = data; 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) { editAddress(item) {
this.dialogAddTitle = "修改收货地址"; this.dialogAddTitle = "修改收货地址";
this.editAddressData = { this.editAddressData = {
@ -331,6 +394,13 @@ export default {
addressDetailInfo: orderAddress[0].detailAddress, 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); postData.push(oneProduct);
}); });
// let postData = [ // let postData = [
@ -405,9 +475,6 @@ export default {
}, },
async canceldanhao(orderNumber) { async canceldanhao(orderNumber) {
let data = await userin(orderNumber); let data = await userin(orderNumber);
console.log(data);
// this.goldmedal=data;
console.log(this.goldmedal);
}, },
}, },
mounted() { mounted() {

20
rc-busness/pages/personal/useraddress.vue
View File

@ -44,23 +44,23 @@
</div> </div>
<div class="rc-usermain" > <div class="rc-usermain" >
<div class="rc-image"> <div class="rc-image">
<img src="../../static/images/default.jpg" alt="" /> <img :src= item.picFile alt="" />
</div> </div>
<div class="rc-right" @click="usertiaozhuan(item)"> <div class="rc-right" @click="usertiaozhuan(item)">
<div class="rc-usercenter"> <div class="rc-usercenter">
<em>{{ item.usereat }}</em> <em>{{ item.productName }}</em>
<div class="rc-userright"> <div class="rc-userright">
<span>规格:{{ item.num }}</span> <span>规格:{{ item.specifications }}</span>
</div> </div>
</div> </div>
<div class="rc-userbottom"> <div class="rc-userbottom">
<span>数量:{{ item.pcs }}件</span> <span>数量:{{ item.pcs }}件</span>
<i>￥10</i> <i>￥{{item.ecPrice}}</i>
</div> </div>
<div class="rc-userbottomm"> <div class="rc-userbottomm">
<i>￥{{ item.userprice }}</i> <i>￥{{ item.ecPrice }}</i>
<span>{{ item.orderstype }}</span> <span>{{ item.pcs }}</span>
<i>￥{{ item.userprice }}</i> <i>￥{{ item.salesAmount }}</i>
</div> </div>
</div> </div>
@ -322,6 +322,12 @@ export default {
this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName; this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName;
this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber; this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber;
this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount; 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 this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
} }
console.log(this.obligation) console.log(this.obligation)

12
rc-busness/pages/personal/usermember.vue
View File

@ -5,13 +5,12 @@
<tabs :crumbs="crumbs"></tabs> <tabs :crumbs="crumbs"></tabs>
<div class="rc-full-width rc-max-width--xl rc-padding-bottom--lg"> <div class="rc-full-width rc-max-width--xl rc-padding-bottom--lg">
<div class="rc-main"> <div class="rc-main">
<div class="rc-center" > <div class="rc-center" >
<van-swipe @change="onChange"> <van-swipe @change="onChange">
<van-swipe-item v-for="(banner, index) in banners" :key="index"> <van-swipe-item v-for="(banner, index) in banners" :key="index">
<img :src="banner.src" class="useraimg"/> <img :src="banner.src" class="useraimg"/>
</van-swipe-item> </van-swipe-item>
</van-swipe> </van-swipe>
<!-- <img :src='userimage' /> --> <!-- <img :src='userimage' /> -->
</div> </div>
<div class="rc-order"> <div class="rc-order">
@ -21,15 +20,12 @@
<span>距离升级还差:{{ rcvalue }} </span> <span>距离升级还差:{{ rcvalue }} </span>
<div class="block"> <div class="block">
<div class="r-block" ref="userblock"></div> <div class="r-block" ref="userblock"></div>
<!-- <el-slider v-model="value" range show-stops :max="10"> </el-slider> --> <!-- <el-slider v-model="value" range show-stops :max="10"> </el-slider> -->
</div> </div>
<div class="rc-value"> <div class="rc-value">
<span>新手铲屎官</span> <span class="rc-styled-link" @click="onChange(0)">新手铲屎官</span>
<span>资深铲屎官</span> <span class="rc-styled-link" @click="onChange(1)">资深铲屎官</span>
<span>金牌铲屎官</span> <span class="rc-styled-link" @click="onChange(2)">金牌铲屎官</span>
</div> </div>
</div> </div>
<div class="rc-layout-container"> <div class="rc-layout-container">

11
rc-busness/pages/productdetails/producted.vue
View File

@ -4,7 +4,7 @@
<Myheader></Myheader> <Myheader></Myheader>
<div class="rc-top"></div> <div class="rc-top"></div>
<tabs :crumbs="crumbs"></tabs> <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="rc-top"></div>
<div <div
class=" class="
@ -147,7 +147,7 @@
</div> </div>
</div> </div>
<div class="rc-main"> <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> <div><i class="ts-row-title">商品数量：</i></div>
<img <img
src="../../assets/image/userjian.png" src="../../assets/image/userjian.png"
@ -209,6 +209,7 @@
<Myfooter v-on:litentop="showmesg"></Myfooter> <Myfooter v-on:litentop="showmesg"></Myfooter>
</div> </div>
<el-dialog :visible.sync="dialogInfo1" @close="userclose" class="pop_coupon"> <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="rs-dis">
<div <div
class="rc-discount" class="rc-discount"
@ -226,7 +227,7 @@
<i> <i>
{{ item.couponDesc }} {{ item.couponDesc }}
</i> </i>
<div> <div v-show="item.validTo">
<span>有效期</span> <span>有效期</span>
<em>{{ item.validTo }}</em> <em>{{ item.validTo }}</em>
</div> </div>
@ -528,9 +529,7 @@ export default {
userlist.filter((item) => { userlist.filter((item) => {
item.productCodes = item.productCodes.split(","); item.productCodes = item.productCodes.split(",");
item.productCodes.forEach((element) => { item.productCodes.forEach((element) => {
if (element == this.productCode && item.activityId !== 10) { if (element == this.curItem.productCode && item.activityId !== 10) {
console.log(element);
console.log(this.productCode);
menualist.push(item); menualist.push(item);
} }
}); });

28
rc-busness/static/js/date.js Normal file
View 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;
}
}