Commit 62120fce authored by zhengke's avatar zhengke

修改积分

parent 6d7055fc
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
.list_item p._num{ .list_item p._num{
color: #999999; color: #999999;
} }
.detailsLeftHot li{
cursor: pointer;
}
</style> </style>
<template> <template>
<div class="detailsLeftHot"> <div class="detailsLeftHot">
...@@ -58,7 +61,7 @@ ...@@ -58,7 +61,7 @@
</el-col> </el-col>
</el-row> </el-row>
<ul v-if="showList==1"> <ul v-if="showList==1">
<li class="list_item" v-for="item in dataList"> <li class="list_item" v-for="item in dataList" @click="goDetail(item.id)">
<div> <div>
<img :src="getImgUrl(item.images)" alt=""> <img :src="getImgUrl(item.images)" alt="">
</div> </div>
...@@ -67,7 +70,7 @@ ...@@ -67,7 +70,7 @@
</li> </li>
</ul> </ul>
<ul v-else> <ul v-else>
<li class="list_item" v-for="item in dataList"> <li class="list_item" v-for="item in dataList" @click="goDetail2(item.Id)">
<div> <div>
<img :src="getImgUrl(item.Images)" alt=""> <img :src="getImgUrl(item.Images)" alt="">
</div> </div>
...@@ -96,7 +99,6 @@ export default { ...@@ -96,7 +99,6 @@ export default {
} }
this.apiJavaPost( this.apiJavaPost(
"/api/goodsMarket/getGoodsList",msg,res => { "/api/goodsMarket/getGoodsList",msg,res => {
console.log(res,'resssss');
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
} else { } else {
...@@ -125,6 +127,13 @@ export default { ...@@ -125,6 +127,13 @@ export default {
} }
},null) },null)
}, },
//跳转详情页面
goDetail: function (id) {
this.$emit('getChildInfo',id)
},
goDetail2(id){
this.$router.push({ path: 'productDetail', query: {id: id}})
}
},mounted(){ },mounted(){
if(this.showList==1){ if(this.showList==1){
this.getList(); this.getList();
......
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<p class="_price">售价<span class="jifen">¥ <span>{{detail.price}}</span> {{detail.priceUnit === 1 ? '现金' : '积分'}}</span></p> <p class="_price">售价<span class="jifen">¥ <span>{{detail.price}}</span> {{detail.priceUnit === 1 ? '现金' : '积分'}}</span></p>
<div class="_numbers"> <div class="_numbers">
<span class="_numbers_name">数量</span> <span class="_numbers_name">数量</span>
<el-input-number v-model="numbers" :min="1" :max="detail.quota === 0 ? '' : detail.quota" size="mini"></el-input-number> <el-input-number v-model="numbers" :min="1" :max="detail.quota === 0 ? 0 : detail.quota" size="mini"></el-input-number>
</div> </div>
<div class="pd_quota"> <div class="pd_quota">
限购数量:{{detail.quota}} 限购数量:{{detail.quota}}
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
</el-row> </el-row>
<el-row class="pd_bottom_detail" :gutter="20"> <el-row class="pd_bottom_detail" :gutter="20">
<el-col :span="5"> <el-col :span="5">
<detailsLeftHot v-if="detail.type" :Type="detail.type" :showList="1" /> <detailsLeftHot v-if="detail.type" :Type="detail.type" :showList="1" v-on:getChildInfo='getChildInfo'/>
</el-col> </el-col>
<el-col :span="19" class="pd_bottom_detail_right"> <el-col :span="19" class="pd_bottom_detail_right">
<el-row> <el-row>
...@@ -295,7 +295,6 @@ export default { ...@@ -295,7 +295,6 @@ export default {
detail.deImgArr = deImgArr detail.deImgArr = deImgArr
this.detail = detail; this.detail = detail;
this.isActivityType = detail.isActivityType; this.isActivityType = detail.isActivityType;
console.log(detail,'detailsss');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -309,6 +308,10 @@ export default { ...@@ -309,6 +308,10 @@ export default {
}else{ }else{
this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}}) this.$router.push({name: 'confirOrder', query: { id: this.id, num: this.numbers}})
} }
},
getChildInfo(val){
this.id = val;
this.getDetail();
} }
},mounted(){ },mounted(){
this.getDetail() this.getDetail()
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
color: #333333; color: #333333;
width:229px; width:229px;
height:241px; height:241px;
cursor: pointer;
} }
.commodity .small:last-child{ .commodity .small:last-child{
width:230px; width:230px;
...@@ -38,9 +37,6 @@ ...@@ -38,9 +37,6 @@
} }
.commodity .small ._detais{ .commodity .small ._detais{
color: #999999; color: #999999;
}
.commodity .medium{
} }
.commodity .medium{ .commodity .medium{
padding: 29px ; padding: 29px ;
...@@ -62,7 +58,6 @@ ...@@ -62,7 +58,6 @@
.medium{ .medium{
width:344px; width:344px;
height:240px; height:240px;
cursor: pointer;
} }
.com_BigDiv{ .com_BigDiv{
min-height:480px;border-right:1px solid #ECECEC; min-height:480px;border-right:1px solid #ECECEC;
...@@ -73,11 +68,14 @@ ...@@ -73,11 +68,14 @@
.r_item_btmBox{ .r_item_btmBox{
min-height: 135px; min-height: 135px;
} }
.comCanClick{
cursor: pointer;
}
</style> </style>
<template> <template>
<el-row class="commodity"> <el-row class="commodity">
<el-col :span="10" class="com_BigDiv"> <el-col :span="10" class="com_BigDiv">
<div @click="goDetail(item.Id)" class="info" v-if="index==0" v-for="(item,index) in message" :key="index"> <div @click="goDetail(item.Id)" class="info" :class="{'comCanClick':item.Id}" v-if="index==0" v-for="(item,index) in message" :key="index">
<div> <div>
<img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt> <img class="com_bigImg" :src="getImgUrl(message[0].Images)" alt>
</div> </div>
...@@ -88,7 +86,7 @@ ...@@ -88,7 +86,7 @@
<el-col :span="14"> <el-col :span="14">
<el-row> <el-row>
<el-col :span="8" class="small" v-if="index>0&&index<4" v-for="(item,index) in message" :key="index"> <el-col :span="8" class="small" v-if="index>0&&index<4" v-for="(item,index) in message" :key="index">
<div @click="goDetail(item.Id)"> <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
<div class="r_item_img_box"> <div class="r_item_img_box">
<img :src="getImgUrl(item.Images)" alt> <img :src="getImgUrl(item.Images)" alt>
</div> </div>
...@@ -99,7 +97,7 @@ ...@@ -99,7 +97,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12" class="medium f" v-if="index>3" v-for="(item,index) in message" :key="index"> <el-col :span="12" class="medium f" v-if="index>3" v-for="(item,index) in message" :key="index">
<div @click="goDetail(item.Id)"> <div @click="goDetail(item.Id)" :class="{'comCanClick':item.Id}">
<div class="r_item_btmBox"> <div class="r_item_btmBox">
<img :src="getImgUrl(item.Images)" alt> <img :src="getImgUrl(item.Images)" alt>
</div> </div>
...@@ -126,11 +124,14 @@ export default { ...@@ -126,11 +124,14 @@ export default {
}, },
//跳转详情页面 //跳转详情页面
goDetail: function (id) { goDetail: function (id) {
this.$router.push({ path: 'productDetail', query: {id: id}}) console.log(id);
if(id){
this.$router.push({ path: 'productDetail', query: {id: id}})
}
}, },
},mounted(){ },mounted(){
console.log(this.message,'messagess');
} }
}; };
</script> </script>
...@@ -91,12 +91,14 @@ ...@@ -91,12 +91,14 @@
border: 1px solid rgba(236, 236, 236, 1); border: 1px solid rgba(236, 236, 236, 1);
border-left: none; border-left: none;
border-top: none; border-top: none;
cursor: pointer;
} }
.integralHomeV2 .class .item:nth-child(1),.integralHomeV2 .class .item:nth-child(6){ .integralHomeV2 .class .item:nth-child(1),.integralHomeV2 .class .item:nth-child(6){
border-left: 1px solid rgba(236, 236, 236, 1); border-left: 1px solid rgba(236, 236, 236, 1);
} }
.integralHomeV2 .class .item img{ .integralHomeV2 .class .item img{
max-height: 150px; max-height: 150px;
max-width:100%;
} }
.integralHomeV2 .class .item ._name{ .integralHomeV2 .class .item ._name{
font-size:12px; font-size:12px;
...@@ -211,12 +213,12 @@ ...@@ -211,12 +213,12 @@
</el-row> </el-row>
<el-row> <el-row>
<div class="clearfix"> <div class="clearfix">
<div class="info item" v-for="item in list"> <div class="info item" v-for="item in list" @click="goDetail(item.id)">
<div> <div>
<img src="../../../../assets/img/img-01.png" alt> <img :src="item.images.split(',')[0]" alt>
</div> </div>
<p class="_name">出行必备物品</p> <p class="_name">{{item.name}}</p>
<p class="_detais">699积分抢兑</p> <p class="_detais">{{item.price}}</p>
</div> </div>
</div> </div>
</el-row> </el-row>
...@@ -234,7 +236,7 @@ export default { ...@@ -234,7 +236,7 @@ export default {
data(){ data(){
return{ return{
StorageInfo: {}, StorageInfo: {},
list: [1,2,3,4,5,6,7,8,9,10], list: [],
dataList:[], dataList:[],
score:0, score:0,
} }
...@@ -254,11 +256,12 @@ export default { ...@@ -254,11 +256,12 @@ export default {
this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{ this.apiJavaPost('/api/goodsMarket/getActivityClassifyGoods',{},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList = res.data.data; this.dataList = res.data.data;
console.log(this.dataList,'sssssss');
var num=0; var num=0;
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
if(x.list.length<6){ if(x.list.length<6){
num=6-x.list.length; num=6-x.list.length;
}else{
num=0;
} }
var obj = { var obj = {
Description:'', Description:'',
...@@ -288,10 +291,36 @@ export default { ...@@ -288,10 +291,36 @@ export default {
this.Error(res.data.message); this.Error(res.data.message);
} }
}); });
} },
// 获取列表
getScoreList: function () {
var msg = {
ranks: '',
type: '',
pageSize: 10,
pageIndex: 1,
}
this.apiJavaPost(
"/api/goodsMarket/getGoodsList",msg,
res => {
if (res.data.resultCode === 1) {
this.list = res.data.data.pageData;
console.log(this.list,'list');
} else {
this.Error(res.data.message);
}
},
null
);
},
//跳转详情页面
goDetail: function (id) {
this.$router.push({ path: 'productDetail', query: {id: id}})
},
},mounted(){ },mounted(){
this.getScore(); this.getScore();
this.getActivesList(); this.getActivesList();
this.getScoreList();
} }
} }
</script> </script>
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