theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan
2020-07-31 09:40:18 +08:00
parent b9b8384011 cdd0105acb
commit 2ec14481fd
28 changed files with 795 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pages/index/index.vue
View File

@@ -19,7 +19,7 @@
<scroll-view style="width:100%;height:100%" scroll-y="true">
<view class="box">
<!-- <indexad style="width:690rpx"></indexad> -->
<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code"></u-swiper>
<u-swiper mode="dot" :list="indexImageSwiper" name="adv_code" @click="clickFImage"></u-swiper>
<view class="list">
<view>
<videoItem v-for="item in articleList.filter((_, index) => !(index&1))" :key="item.article_id" :item="item"
@@ -36,7 +36,7 @@
<swiper-item>
<scroll-view style="width:100%;height:100%" scroll-y="true">
<view class="box">
<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
<view class="list">
<view>
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
@@ -283,6 +283,28 @@
url: '/pageB/follow/index'
});
},
clickFImage(index) {
const item = this.indexImageSwiper[index];
console.log(item);
this.activityLink({ type: item.url_type, id: item.info_id });
},
clickSImage(index) {
const item = this.zhiboImageSwiper[index];
console.log(item);
this.activityLink({ type: item.url_type, id: item.info_id });
},
activityLink({ type, id }) {
if(type == 0) return false;
// type 1 商品详情页, 2 店铺详情页
const url = type == 1 ? 'pageB/sdetails/index' : 'pageC/merchant/index';
let params = { id: id };
// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
if(type == 1) Object.assign(params, { type: 1 });
this.$u.route({
url: url,
params: params
})
},
},
}
</script>

81
pages/mine/index.vue
View File

@@ -7,7 +7,7 @@
<view class="info-left">
<view class="user-nickname">{{ userInfo.member_nickname }}</view>
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
<img src="/static/image/mine/13.png" />
<image src="/static/image/mine/13.png"></image>
<view class="rank-title">{{ userInfo.member_grade_name }}</view>
</view>
</view>
@@ -47,32 +47,32 @@
<view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')">
<view>查看全部订单</view>
<img src="/static/image/mine/21.png" />
<image src="/static/image/mine/21.png"></image>
</view>
</view>
<view class="content">
<view @click="toOtherPage('/order/Index?current=1')">
<img src="/static/image/mine/6.png" />
<image src="/static/image/mine/6.png"></image>
<view>待支付</view>
</view>
<view @click="toOtherPage('/order/Index?current=2')">
<img src="/static/image/mine/14.png" />
<image src="/static/image/mine/14.png"></image>
<view>已取消</view>
</view>
<view @click="toOtherPage('/order/Index?current=3')">
<img src="/static/image/mine/2.png" />
<image src="/static/image/mine/2.png"></image>
<view>待收货</view>
</view>
<view @click="toOtherPage('/order/Index?current=4')">
<img src="/static/image/mine/1.png" />
<image src="/static/image/mine/1.png"></image>
<view>试穿试送</view>
</view>
<view @click="toOtherPage('/order/Index?current=5')">
<img src="/static/image/mine/3.png" />
<image src="/static/image/mine/3.png"></image>
<view>待评价</view>
</view>
<view @click="toOtherPage('/order/Index?current=6')">
<img src="/static/image/mine/9.png" />
<image src="/static/image/mine/9.png"></image>
<view>售后</view>
</view>
</view>
@@ -81,19 +81,19 @@
<view class="title">我的工具</view>
<view class="content">
<view @click="toOtherPage('/tool/SendWash')">
<img src="/static/image/mine/20.png" />
<image src="/static/image/mine/20.png"></image>
<view>送洗</view>
</view>
<view @click="toOtherPage('/tool/Manicure')">
<img src="/static/image/mine/19.png" />
<image src="/static/image/mine/19.png"></image>
<view>美甲</view>
</view>
<view @click="toOtherPage('/tool/MineHistory')">
<img src="/static/image/mine/18.png" />
<image src="/static/image/mine/18.png"></image>
<view>足迹</view>
</view>
<view @click="toOtherPage('/tool/MineCoupon')">
<img src="/static/image/mine/25.png" />
<image src="/static/image/mine/25.png"></image>
<view>优惠券</view>
</view>
</view>
@@ -102,19 +102,19 @@
<view class="title">更多工具</view>
<view class="content">
<view @click="toOtherPage('/more/Address')">
<img src="/static/image/mine/17.png" />
<image src="/static/image/mine/17.png"></image>
<view>收货地址</view>
</view>
<view @click="toOtherPage('/more/AfterSalesHelp')">
<img src="/static/image/mine/9.png" />
<image src="/static/image/mine/9.png"></image>
<view>售后政策</view>
</view>
<view @click="toOtherPage('/more/MineHelp')">
<img src="/static/image/mine/16.png" />
<image src="/static/image/mine/16.png"></image>
<view>使用帮助</view>
</view>
<view @click="toOtherPage('/more/Complaints')">
<img src="/static/image/mine/15.png" />
<image src="/static/image/mine/15.png"></image>
<view>投诉意见</view>
</view>
</view>
@@ -189,10 +189,11 @@ export default {
border-radius: 13rpx;
align-items: center;
padding: 0 17rpx 0 10rpx;
> img {
> image {
margin-right: 9rpx;
width: 20rpx;
height: 22rpx;
flex-shrink: 0;
}
.rank-title {
font-size: 16rpx;
@@ -240,7 +241,13 @@ export default {
}
}
.mine-container {
@mixin common-mine($content-padding-top, $content-padding-bottom, $image-height) {
@mixin image-size($image-width, $image-height) {
> image {
width: $image-width !important;
height: $image-height !important;
}
}
@mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) {
box-sizing: border-box;
width: 690rpx;
background: rgba(255,255,255,1);
@@ -270,9 +277,11 @@ export default {
display: flex;
> view {
text-align: center;
> img {
> image {
width: $image-width;
height: $image-height;
margin-bottom: 15rpx;
flex-shrink: 0;
}
> view {
font-size: 22rpx;
@@ -285,31 +294,50 @@ export default {
@include common-mine(
$content-padding-top: 22rpx,
$content-padding-bottom: 30rpx,
$image-height: 36rpx
$image-height: 36rpx,
$image-width: 36rpx,
);
.title {
justify-content: space-between;
.more {
display: flex;
align-items: center;
> img {
> image {
width: 19rpx;
height: 19rpx;
margin-left: 10rpx;
flex-shrink: 0;
}
}
}
.content {
justify-content: space-between;
> view {
text-align: center;
};
> view:nth-child(1){
@include image-size($image-width: 33rpx, $image-height: 36rpx);
}
> view:nth-child(2){
@include image-size($image-width: 39rpx, $image-height: 33rpx);
}
> view:nth-child(3){
@include image-size($image-width: 41rpx, $image-height: 33rpx);
}
> view:nth-child(4){
@include image-size($image-width: 40rpx, $image-height: 35rpx);
}
> view:nth-child(5){
@include image-size($image-width: 37rpx, $image-height: 37rpx);
}
> view:nth-child(6){
@include image-size($image-width: 33rpx, $image-height: 35rpx);
}
}
}
.tool {
@include common-mine(
$content-padding-top: 8rpx,
$content-padding-bottom: 25rpx,
$image-height: 71rpx
$image-height: 71rpx,
$image-width: 71rpx,
);
.content {
> view:not(:last-child) {
@@ -321,7 +349,8 @@ export default {
@include common-mine(
$content-padding-top: 8rpx,
$content-padding-bottom: 48rpx,
$image-height: 71rpx
$image-height: 71rpx,
$image-width: 71rpx,
);
.content {
> view:not(:last-child) {

41
pages/shop/index.vue
View File

@@ -43,7 +43,9 @@
<pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
<!-- 拼团列表 -->
<group></group>
<image class="lingquan"></image>
<view class="activity-view">
<image class="lingquan" :src="activityInfo.adv_code" @click="activityLink({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
</view>
<youhq></youhq>
<list ref="recommendGoods"></list>
<view class="cart" @click="toCartPage">
@@ -89,6 +91,7 @@ export default {
seckillTime: {}, // 秒杀时间
// couponGroupList: [], // 优惠券拼团分类
pinTuanPush: {}, // 拼团推荐
activityInfo: {},
}
},
onLoad() {
@@ -98,6 +101,7 @@ export default {
this.getRecommendedSpike();
this.getSpikeList();
this.getPinTuanPush();
this.getStoreActivity();
},
methods: {
sousuo() {
@@ -170,6 +174,25 @@ export default {
url: '/pageC/classify/index'
});
},
getStoreActivity() {
this.$u.api.getStoreActivity().then(res => {
if(res.errCode == 0) {
this.activityInfo = res.data;
}
})
},
activityLink({ type, id }) {
if(type == 0 || type == 2) return false;
// type 1 商品详情页, 2 店铺详情页
const url = type == 1 ? 'pageB/sdetails/index' : '';
let params = { id: id };
// type: 1 // 商品详情 1普通 2拼团 3秒杀 4优惠券
if(type == 1) Object.assign(params, { type: 1 });
this.$u.route({
url: url,
params: params
})
},
},
}
</script>
@@ -251,13 +274,15 @@ export default {
}
}
}
.lingquan {
width: 750rpx;
height: 177rpx;
margin-left: -33rpx;
margin-top: 29rpx;
background-color: #ececec;
}
.activity-view {
padding: 20rpx 30rpx;
text-align: center;
.lingquan {
background-color: #ececec;
width: 688rpx;
height: 138rpx;
}
}
.cart {
z-index: 9;
position: fixed;