Commit b3decc88 by 谢中龙

修改商品个人中心

parent 17b4c47c
...@@ -184,6 +184,7 @@ Component({ ...@@ -184,6 +184,7 @@ Component({
this.triggerEvent('skuselect', { this.triggerEvent('skuselect', {
skuId: this.data.skuId, skuId: this.data.skuId,
count: this.data.proNum, count: this.data.proNum,
selectSku : this.data.skuText
}) })
this.setData({ this.setData({
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id // 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应 // app.js 中brandId 修改为对应
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre const PROJECT_ENV = 'dev' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 : //仅生产环境时 配置 :
//3001 3001 , wx313ec36b710125d4 有直播 //3001 3001 , wx313ec36b710125d4 有直播
//2006 泰华 , wx40fec8944623c8b3 有直播 //门户 wx833d5ece112fc3fd //2006 泰华 , wx40fec8944623c8b3 有直播 //门户 wx833d5ece112fc3fd
...@@ -26,7 +26,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门 ...@@ -26,7 +26,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2002 巴黎贝甜 wx21968cb3a486d4ab //2002 巴黎贝甜 wx21968cb3a486d4ab
//2014 包小姐与鞋先生 wxa00302e2f53dd9c5 //2014 包小姐与鞋先生 wxa00302e2f53dd9c5
const BRANCH_ID = 1002 const BRANCH_ID = 1001
const isMall = true const isMall = true
// const needMock = '' // // const needMock = '' //
...@@ -121,7 +121,6 @@ const prod_brand_config = { ...@@ -121,7 +121,6 @@ const prod_brand_config = {
contactUsPluginId: '78353bb39251a60b473f3d4ae81b1c39', contactUsPluginId: '78353bb39251a60b473f3d4ae81b1c39',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
hasKeFu : false,//是否有客服功能
hasLiveVideo: true,//是否有直播功能 hasLiveVideo: true,//是否有直播功能
orderingMustOpenCard: true, orderingMustOpenCard: true,
canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮 canRefundDaysAfterDelivery: 15,//发货后多少天之内可显示申请退款按钮
......
...@@ -25,7 +25,11 @@ wxService.page({ ...@@ -25,7 +25,11 @@ wxService.page({
currentShareContent: null, currentShareContent: null,
fromZc: false, fromZc: false,
scene:'', //触点参数 scene:'', //触点参数
autoplay : true autoplay : true,
showCouponList : false,
goodsCouponList : [],
promotionModal : false,
promotionList : [],
}, },
handelToHome() { handelToHome() {
wx.reLaunch({ wx.reLaunch({
...@@ -36,7 +40,6 @@ wxService.page({ ...@@ -36,7 +40,6 @@ wxService.page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log('productInfo----options-----', options)
if (options && options.id) { if (options && options.id) {
this.data.productId = options.id; this.data.productId = options.id;
this.setData({ this.setData({
...@@ -78,11 +81,166 @@ wxService.page({ ...@@ -78,11 +81,166 @@ wxService.page({
}).finally(() => { }).finally(() => {
wx.hideLoading() wx.hideLoading()
}) })
} }
}, },
//弹出活动
onTapToActivityList(){
this.setData({
promotionModal : true,
});
},
//关闭果冻
onTapClosePromotion(){
this.setData({
promotionModal : false,
});
},
//领券弹出层
onTapToGetCoupon(){
this.setData({
showCouponList : true,
});
},
//关闭领券弹出层
onTapCloseGetCoupon(){
this.setData({
showCouponList : false,
});
},
//获取商品参数的领取优惠券活动
getGoodsCouponActivityList(){
wxService.post(`/marketing/couponActivitySet/findProductIdVerifyActivity?productId=${this.data.productId}`).then(res => {
if(res){
let list = res.data.data ? res.data.data : [];
list.forEach(item => {
if(item.couponType == 2){
item.couponTypeDesc = '包邮券';
item.moneyText = parseFloat(item.faceAmount/10/10).toFixed(1);
}
else {
if(item.type == 1){
item.couponTypeDesc = '抵用券';
item.moneyText = parseFloat(item.faceAmount/10/10).toFixed(1);
}
else if(item.type == 2){
item.couponTypeDesc = '折扣券';
item.moneyText = parseFloat(item.faceAmount/10).toFixed(1);
}
else if(item.type == 3){
item.couponTypeDesc = '定额券';
item.moneyText = parseFloat(item.faceAmount/10/10).toFixed(1);
}
}
item.startTime = item.startTime ? item.startTime.substring(0,10) : '';
item.endTime = item.endTime ? item.endTime.substring(0,10) : '';
item.effectDay = item.effectDay ? item.effectDay : 0;
item.expiratedDay = item.expiratedDay ? item.expiratedDay : '';
//dateType 1 表示绝对日期 2表示相对日期
item.dateType = 1;
item.dateDesc = '';
if(item.expiratedDay){
item.dateType = 2;
let effectDay = item.effectDay == 0 ? '领取后即生效' : `领取后${item.effectDay}天生效`;
let expiratedDay = `${item.expiratedDay}天后失效`;
item.dateDesc = [effectDay,expiratedDay].join(',');
}
});
this.data.goodsCouponList = list;
this.setData({
goodsCouponList : this.data.goodsCouponList,
})
}
})
},
//确定领取优惠券
onTapSureGetCoupon(e){
const { memberId } = wx.getStorageSync('_baseUserInfo');
if(!memberId){
wx.showToast({
title: '请先登录',
icon : 'none'
});
return ;
}
wx.showLoading({
title: '领取中..',
});
let item = e.currentTarget.dataset.item;
wxService.post(`/coupon/coupon/draw`,{
couponSettingId : item.id,
memberId : memberId,
}).then(res => {
wx.hideLoading();
if(res.data.result == 0){
wx.showToast({
title: '领取成功',
});
// this.setLocalStorageByKey(couponSettingId);
}
})
},
//设置每天只能领取一次限制
setLocalStorageByKey(couponSettingId){
let getCouponData = wx.getStorageSync('getCouponData');
let key = `${couponSettingId}_d_${this.getCurrentYearMonDay()}`;
if(!getCouponData){
getCouponData = {};
getCouponData[key] = true;
wx.setStorageSync('getCouponData',getCouponData);
}
else{
//先设置进去
getCouponData[key] = true;
wx.setStorageSync('getCouponData',getCouponData);
//获取今天的当前也的key
let expiredAllKey = [];
for(let k in getCouponData){
let expiredKey = k.split('_d_')[1];
if(parseInt(expiredKey) < parseInt(this.getCurrentYearMonDay())){
expiredAllKey.push(k);
}
}
//移除今天一起的过期key
expiredAllKey.forEach(item => {
delete getCouponData[item];
});
}
},
//是否已经领取了
todayHasGot(couponSettingId){
let getCouponData = wx.getStorageSync('getCouponData');
let key = `${couponSettingId}_d_${this.getCurrentYearMonDay()}`;
if(!dialogInfo){
return false;
}
if(dialogInfo[key]){
return true
}
return false;
},
//获取当前年月日
getCurrentYearMonDay(){
let da = new Date();
return `${da.getFullYear()}${da.getMonth()}${da.getDate()}`;
},
// 立即开通plus // 立即开通plus
openPlus(){ openPlus(){
...@@ -96,14 +254,17 @@ wxService.page({ ...@@ -96,14 +254,17 @@ wxService.page({
addCart: function (event) { addCart: function (event) {
this.setData({ this.setData({
btnText : '加入购物车',
showSkuPopup: true, showSkuPopup: true,
showSkuPopupType: 'cart' showSkuPopupType: 'cart'
}) })
// 商品加入购物车 // 商品加入购物车
// xm_bi.Event.stat("skuAddToCart", { "amount":"666","skuId":'abcd1234'}); // xm_bi.Event.stat("skuAddToCart", { "amount":"666","skuId":'abcd1234'});
}, },
goBuy: function (event) { goBuy: function (event) {
this.setData({ this.setData({
btnText : '立即购买',
showSkuPopup: true, showSkuPopup: true,
showSkuPopupType: 'buy' showSkuPopupType: 'buy'
}) })
...@@ -169,6 +330,8 @@ wxService.page({ ...@@ -169,6 +330,8 @@ wxService.page({
this.data.productId = this.options.id; this.data.productId = this.options.id;
} }
//获取优惠券领取活动列表
this.getGoodsCouponActivityList();
this.getProInfo() this.getProInfo()
this.getOpenStatus() this.getOpenStatus()
this.data.currentShareContent = null; this.data.currentShareContent = null;
...@@ -342,13 +505,17 @@ wxService.page({ ...@@ -342,13 +505,17 @@ wxService.page({
skuId skuId
} }
var selectSkuName = [] let selectSku = event.detail.selectSku ? event.detail.selectSku : [];
for (let i in event.detail.selectSku) { // var selectSkuName = []
selectSkuName.push(event.detail.selectSku[i].name) // for (let i in event.detail.selectSku) {
} // selectSkuName.push(event.detail.selectSku[i].name)
var selectSkuStr = selectSkuName.join(',') // }
// var selectSkuStr = selectSkuName.join(',')
let selectSkuName = selectSku.join(',');
this.setData({ this.setData({
selectSkuName: selectSkuStr selectSkuName: selectSkuName
}) })
if (this.data.showSkuPopupType == 'cart') { if (this.data.showSkuPopupType == 'cart') {
......
...@@ -40,34 +40,32 @@ ...@@ -40,34 +40,32 @@
</view> </view>
<view class="product-detail-wrap"> <view class="product-detail-wrap">
<view class="product-price"> <view class="pro-new-price">
<view class="price-wrap"> <view class="price-text">
<view class="price-icon" wx:if="{{memberLevel}}">会员专享价</view> <view class="price-icon" wx:if="{{memberLevel}}">会员专享价</view>
<text class="price">¥{{ productInfo.minActivityPrice? utils.numberFormat(productInfo.minActivityPrice / 100):utils.numberFormat(productInfo.minSalePrice / 100) }}</text> <view class="price">
<text>¥</text>
<label>{{productInfo.minActivityPrice? utils.numberFormat(productInfo.minActivityPrice / 100):
utils.numberFormat(productInfo.minSalePrice / 100)}}
</label>
</view>
<text wx:if="{{productInfo.minActivityPrice}}" class="sale-price">¥{{utils.numberFormat(productInfo.minSalePrice / 100)}}</text> <text wx:if="{{productInfo.minActivityPrice}}" class="sale-price">¥{{utils.numberFormat(productInfo.minSalePrice / 100)}}</text>
<!-- <text class="cost-price">¥888</text> -->
</view> </view>
<button <view class="rg-share">
wx:if="{{!currentHasUserInfo}}" <button wx:if="{{!currentHasUserInfo}}" bindgetuserinfo="_getUserInfo" data-jflag="false" open-type='getUserInfo' hover-class="btn-hover">
bindgetuserinfo="_getUserInfo" <image src="https://img3.bigaka.com/prd/3001/202005/20200515/30017e386f8c-0650-4df6-bf2e-cd4c69b50d4a.png" mode="widthFix"></image>
data-jflag="false" </button>
open-type='getUserInfo' <image wx:if="{{currentHasUserInfo}}" bindtap="onTapShare" src="https://img3.bigaka.com/prd/3001/202005/20200515/30017e386f8c-0650-4df6-bf2e-cd4c69b50d4a.png" mode="widthFix"></image>
hover-class="btn-hover"
>
<image class="share-img" src="/assets/imgs/7_1_0/08_22/share.png" />
<text class="share-text">分享</text>
</button>
<view wx:if="{{currentHasUserInfo}}" class="share-wrap" bindtap="onTapShare">
<image class="share-img" src="/assets/imgs/7_1_0/08_22/share.png" />
<text class="share-text">分享</text>
</view> </view>
</view> </view>
<view class="product-name"> <!-- 商品名称 -->
{{productInfo.productName}} <view class="product-name">{{productInfo.productName}}</view>
</view> <!-- 商品价格和库存 -->
<view class="product-desc"> <view class="product-desc">
{{productInfo.productStatusDesc}} <text>{{productInfo.productStatusDesc}}</text>
<text>剩余:<text class="surplus-number">{{productInfo.stock}}</text>件</text>
</view> </view>
<!-- plus 购买状态 -->
<view class="member-price" wx:if="{{openPlusStatus}}"> <view class="member-price" wx:if="{{openPlusStatus}}">
<view class="member-price-info"> <view class="member-price-info">
<image <image
...@@ -77,23 +75,48 @@ ...@@ -77,23 +75,48 @@
}}</text> }}</text>
<!-- <text class="reduce-price">本次立减¥60</text> --> <!-- <text class="reduce-price">本次立减¥60</text> -->
</view> </view>
<view class="open" bindtap="openPlus"> <!-- <view class="open" bindtap="openPlus">
<text class="open-text">立即开通</text> <text class="open-text">立即开通</text>
<image class="big-arrow" src="/assets/imgs/big-arrow-right.png" /> <image class="big-arrow" src="/assets/imgs/big-arrow-right.png" />
</view> -->
</view>
</view>
<view class="gray-line" />
<!-- 分隔item -->
<view class="activity-list clear-box">
<view class="activity-list-item clear-box" bindtap="addCart">
<label>规格</label>
<view class="right-ac-info clear-box">
<view class="coupon-flex">
<label>{{selectSkuName ? '已选:' + selectSkuName : '请选择规格'}}</label>
</view>
<image src="/assets/imgs/arrow-right.png"></image>
</view> </view>
</view> </view>
<view class="choose-wrap" bindtap="addCart"> <view class="activity-list-item clear-box" bindtap="onTapToGetCoupon" wx:if="{{goodsCouponList.length > 0}}">
{{selectSkuName ? '已选:' + selectSkuName : '请选择规格'}} <label>领券</label>
<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right-sku.png" mode="widthFix" /> <view class="right-ac-info clear-box">
<view class="coupon-flex">
<view class="ac-coupon-item clear-box"
wx:for="{{goodsCouponList}}"
wx:key="*this"
wx:for-index="idx"
wx:if="{{idx < 2}}"
wx:for-item="item">{{item.name}}</view>
</view>
<image src="/assets/imgs/arrow-right.png"></image>
</view>
</view> </view>
<!-- <view class="choose-wrap"> <view class="activity-list-item clear-box" bindtap="onTapToActivityList">
支持快递配送</view> --> <label>促销</label>
<view class="surplus"> <view class="right-ac-info clear-box">
剩余: <view class="coupon-flex">
<text class="surplus-number">{{productInfo.stock}}</text> <view class="ac-pro-item clear-box">满100减50元</view>
</view>
<image src="/assets/imgs/arrow-right.png"></image>
</view>
</view> </view>
</view> </view>
<view class="gray-line" /> <view class="gray-line" />
...@@ -129,20 +152,20 @@ ...@@ -129,20 +152,20 @@
<view>首页</view> <view>首页</view>
</navigator>--> </navigator>-->
<view bindtap="handelToHome" class='get-formId--btn footer-icon'> <view bindtap="handelToHome" class='get-formId--btn footer-icon'>
<image src="/assets/imgs/7_1_0/home_un-red.png" mode="widthFix" /> <image src="https://img3.bigaka.com/prd/3001/202005/20200515/3001d2cb3e2c-dfc5-4ffe-be3a-476e54ada266.png" mode="widthFix" />
<view>首页</view> <view>首页</view>
</view> </view>
</form> </form>
<form class='get-formId' bindsubmit="nav" report-submit name='nav'> <form class='get-formId' bindsubmit="nav" report-submit name='nav'>
<navigator class='get-formId--btn footer-icon' open-type="navigate" style="opacity:1;" url="/pages/cart/cart"> <navigator class='get-formId--btn footer-icon' open-type="navigate" style="opacity:1;" url="/pages/cart/cart">
<image class="contact-share-img" src="/assets/imgs/7_1_0/cart_un-red.png" /> <image class="contact-share-img" src="https://img3.bigaka.com/prd/3001/202005/20200515/300129a296ad-03d8-4021-963a-3736e74d34ba.png" />
<view class="add-car-text">购物车</view> <view class="add-car-text">购物车</view>
</navigator> </navigator>
</form> </form>
<form class='get-formId' bindsubmit="nav" report-submit name='home' wx:if="{{hasKeFu}}"> <form class='get-formId' bindsubmit="nav" report-submit name='home' wx:if="{{hasKeFu}}">
<button class="get-formId--btn footer-icon" open-type="contact" session-from="udesk|{{udesk.nick_name}}|{{udesk.avatar}}|customer^{{udesk.customer_info}}" <button class="get-formId--btn footer-icon" open-type="contact" session-from="udesk|{{udesk.nick_name}}|{{udesk.avatar}}|customer^{{udesk.customer_info}}"
send-message-title="{{productInfo.productName}}" show-message-card="true" send-message-img="{{productInfo.indexUrl}}"> send-message-title="{{productInfo.productName}}" show-message-card="true" send-message-img="{{productInfo.indexUrl}}">
<image src="/assets/imgs/7_1_0/bottom-kefu-red.png" mode="widthFix"></image> <image src="https://img3.bigaka.com/prd/3001/202005/20200515/30015d78ddef-9f81-4b04-8f18-408cc4909eba.png" mode="widthFix"></image>
<view class="tab-text">客服</view> <view class="tab-text">客服</view>
</button> </button>
</form> </form>
...@@ -202,4 +225,88 @@ ...@@ -202,4 +225,88 @@
<!--goHome--> <!--goHome-->
<!--<go-home/>--> <!--<go-home/>-->
<!-- 领券 -->
<view class="coupon-activity-modal {{showCouponList ? 'active' : ''}}" bindtap="onTapCloseGetCoupon"></view>
<view class="coupon-activity-content {{showCouponList ? 'active' : ''}}">
<view class="coupon-header">领券</view>
<view class="content-body">
<view class="content-body-item"
wx:for="{{goodsCouponList}}"
wx:key="*this"
wx:for-index="idx"
wx:for-item="item">
<view class="coupon-price">
<view class="top-price" wx:if="{{item.type != 2}}">
<text>¥</text>
<label>{{item.moneyText}}</label>
</view>
<view class="top-price" wx:if="{{item.type == 2}}">
<label>{{item.moneyText}}</label>
<text>折</text>
</view>
<view class="top-price">{{item.couponTypeDesc}}</view>
</view>
<!-- 中间布局 -->
<view class="coupon-detail">
<view class="coupon-t">{{item.name}}</view>
<view wx:if="{{item.dateType == 1}}">{{item.startTime}} 至 {{item.endTime}}</view>
<view wx:if="{{item.dateType == 2}}">{{item.dateDesc}}</view>
</view>
<!-- 右边按钮 -->
<view class="right-btn">
<button wx:if="{{!currentHasUserInfo}}" bindgetuserinfo="_getUserInfo" data-jflag="false" open-type='getUserInfo' hover-class="btn-hover">
<view>立即领取</view>
</button>
<view wx:if="{{currentHasUserInfo}}" data-item="{{item}}" bindtap="onTapSureGetCoupon">立即领取</view>
</view>
</view>
</view>
<view class="content-footer">
<view class="footer-btn" bindtap="onTapCloseGetCoupon">完成</view>
</view>
</view>
<!-- 促销活动 -->
<view class="coupon-activity-modal {{promotionModal ? 'active' : ''}}" bindtap="onTapClosePromotion"></view>
<view class="coupon-activity-content {{promotionModal ? 'active' : ''}}">
<view class="coupon-header">商品参与促销活动</view>
<view class="content-body">
<view class="promition-item">
<view class="promotions-name">
<view class="promotion-type">满减满折</view>
<view class="pro-title">6.6~6.12每满200-15</view>
</view>
<!-- <image src="/assets/imgs/arrow-right.png" mode="aspectFit"></image> -->
</view>
<view class="promition-item">
<view class="promotions-name">
<view class="promotion-type">一口价</view>
<view class="pro-title">6.6~6.12每满200-15</view>
</view>
<image src="/assets/imgs/arrow-right.png" mode="aspectFit"></image>
</view>
<view class="promition-item">
<view class="promotions-name">
<view class="promotion-type">限时折扣</view>
<view class="pro-title">6.6~6.12每满200-15</view>
</view>
<!-- <image src="/assets/imgs/arrow-right.png" mode="aspectFit"></image> -->
</view>
<view class="promition-item">
<view class="promotions-name">
<view class="promotion-type">限时调价</view>
<view class="pro-title">6.6~6.12每满200-15</view>
</view>
<!-- <image src="/assets/imgs/arrow-right.png" mode="aspectFit"></image> -->
</view>
<view class="promition-item">
<view class="promotions-name">
<view class="promotion-type">限时抢购</view>
<view class="pro-title">6.6~6.12每满200-15</view>
</view>
<image src="/assets/imgs/arrow-right.png" mode="aspectFit"></image>
</view>
</view>
<view class="content-footer">
<view class="footer-btn" bindtap="onTapClosePromotion">完成</view>
</view>
</view>
\ No newline at end of file
...@@ -28,6 +28,34 @@ page{ ...@@ -28,6 +28,34 @@ page{
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.pro-new-price{
display: flex;
justify-content: space-between;
align-items: center;
position: relative;
}
.pro-new-price .price-text{
flex: 1;
display: flex;
align-items: center;
}
.pro-new-price .rg-share{
position: absolute;
width: 120rpx;
height: 60rpx;
right: -16rpx;
top: 0;
}
.pro-new-price .rg-share image{
width: 120rpx;
}
.dots{ .dots{
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -53,6 +81,7 @@ page{ ...@@ -53,6 +81,7 @@ page{
.product-detail-wrap{ .product-detail-wrap{
padding: 0 16rpx 0 24rpx; padding: 0 16rpx 0 24rpx;
margin-top: 17rpx; margin-top: 17rpx;
padding-bottom: 10rpx;
} }
.price-icon{ .price-icon{
display: inline-block; display: inline-block;
...@@ -67,10 +96,20 @@ page{ ...@@ -67,10 +96,20 @@ page{
vertical-align: middle; vertical-align: middle;
} }
.price{ .price{
font-size: 36rpx; color: #cb3c3c;
color: #333333; display: flex;
vertical-align: middle; align-items: center;
}
.price text{
font-size: 22rpx;
}
.price label{
font-size: 40rpx;
font-weight: bold;
} }
.cost-price{ .cost-price{
text-decoration:line-through; text-decoration:line-through;
font-size: 24rpx; font-size: 24rpx;
...@@ -97,13 +136,16 @@ page{ ...@@ -97,13 +136,16 @@ page{
} }
.product-name{ .product-name{
color: #333333; color: #333333;
font-size: 40rpx; font-size: 36rpx;
margin-top: 16rpx; margin-top: 16rpx;
} }
.product-desc{ .product-desc{
color: #808080; color: #808080;
font-size: 28rpx; font-size: 28rpx;
margin-top: 11rpx; margin-top: 11rpx;
display: flex;
align-items: center;
justify-content: space-between;
} }
.member-price{ .member-price{
background-color: rgba(192, 154, 116, 0.07); background-color: rgba(192, 154, 116, 0.07);
...@@ -272,4 +314,310 @@ page{ ...@@ -272,4 +314,310 @@ page{
} }
.scroll-tips-text { .scroll-tips-text {
margin: 20rpx 0; margin: 20rpx 0;
}
.clear-box{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.activity-list{
width: 100%;
height: auto;
background: #ffffff;
padding: 0 20rpx;
}
.activity-list .activity-list-item{
border-bottom: solid 1rpx #dddddd;
padding: 30rpx;
font-size: 24rpx;
color: #333333;
display: flex;
align-items: center;
}
.activity-list .activity-list-item:last-child{
border-bottom: none;
}
.activity-list .activity-list-item:active{
opacity: 0.7;
}
.activity-list .activity-list-item .right-ac-info{
flex: 1;
display: flex;
align-items: center;
justify-content: flex-end;
}
.activity-list .activity-list-item .right-ac-info .ac-coupon-item{
width: 160rpx;
height: auto;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding: 4rpx 10rpx;
color: #cb3c3c;
font-size: 20rpx;
border-radius: 4rpx;
margin-right: 15rpx;
background-image: url(https://img3.bigaka.com/prd/3001/202005/20200515/300127cf838a-ef78-4214-b473-9b85d463abbb.png);
background-size: contain;
background-repeat: no-repeat;
background-position: center;
font-weight: bold;
text-align: center;
}
.activity-list .activity-list-item .right-ac-info .ac-pro-item{
width: 160rpx;
height: auto;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding: 4rpx 10rpx;
color: #cb3c3c;
font-size: 20rpx;
border-radius: 4rpx;
margin-right: 15rpx;
background-image: url(https://img3.bigaka.com/prd/3001/202005/20200515/3001e0c1a67f-4ac7-46d8-8018-e4c4d78d9c90.png);
background-size: contain;
background-repeat: no-repeat;
background-position: center;
font-weight: bold;
text-align: center;
}
.activity-list .activity-list-item .right-ac-info .coupon-flex{
display: flex;
flex: 1;
align-items: center;
padding-left: 20rpx;
}
.activity-list .activity-list-item .right-ac-info image{
width: 16rpx;
height: 24rpx;
}
.activity-list .activity-list-item:last-child{
margin-bottom: 0;
}
.coupon-activity-modal{
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
transform: translateY(100%);
opacity: 0;
transition: opacity 200ms;
z-index: 98;
/* transition: all 0.3s; */
}
.coupon-activity-modal.active {
opacity: 1;
transform: translateY(0);}
.coupon-activity-content.active {
opacity: 1;
transform: translateY(0);}
.coupon-activity-content{
position: fixed;
z-index: 99;
width: 100%;
bottom: 0;
left: 0;
height: 70vh;
background: #ffffff;
transform: translateY(100%);
transition: all 0.3s;
display: flex;
opacity: 0;
flex-direction: column;
}
.coupon-activity-content .coupon-header{
height: 8vh;
display: flex;
align-items: center;
justify-content: center;
font-size: 28rpx;
color: #333333;
}
.coupon-activity-content .content-body{
flex: 1;
height: 50vh;
box-sizing: border-box;
-webkit-box-sizing: border-box;
padding: 20rpx 30rpx;
overflow: hidden;
overflow-y: auto;
position: relative;
}
.coupon-activity-content .content-body .content-body-item{
width: 100%;
height: 12vh;
box-sizing: border-box;
-webkit-box-sizing: border-box;
background-position: center;
background-size: 100%;
padding: 20rpx 140rpx;
margin-bottom: 20rpx;
position: relative;
background-image: url(https://img3.bigaka.com/prd/3001/202005/20200515/3001532008bb-42f7-4bea-8611-b482f2137d2d.png);
}
.coupon-activity-content .content-body .content-body-item .coupon-price{
position: absolute;
top: 0;
left: 0;
height: 12vh;
width: 140rpx;
color: #cb3c3c;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.coupon-activity-content .content-body .content-body-item .coupon-price .top-price{
font-size: 22rpx;
}
.coupon-activity-content .content-body .content-body-item .coupon-price .top-price text{
font-size: 22rpx;
}
.coupon-activity-content .content-body .content-body-item .coupon-price .top-price label{
font-size: 36rpx;
font-weight: bold;
}
.coupon-activity-content .content-body .content-body-item .right-btn{
position: absolute;
top: 0;
right: 0;
height: 12vh;
width: 140rpx;
display: flex;
justify-content: center;
align-items: center;
}
.coupon-activity-content .content-body .content-body-item .right-btn view{
width: 110rpx;
height: 40rpx;
background: #cb3c3c;
color: #ffffff;
font-size: 22rpx;
border-radius: 20rpx;
display: flex;
align-items: center;
justify-content: center;
}
.coupon-activity-content .content-body .content-body-item .right-btn view:active{
opacity: 0.7;
}
.coupon-activity-content .content-body .content-body-item .coupon-detail{
display: flex;
flex-direction: column;
justify-content: space-around;
align-items: space-around;
font-size: 24rpx;
color: #cb3c3c;
height: 100%;
}
.coupon-activity-content .content-body .content-body-item .coupon-detail .coupon-t{
font-size: 32rpx;
font-weight: bold;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.coupon-activity-content .content-footer{
flex: 0;
min-height: 12vh;
max-height: 12vh;
display: flex;
align-items: center;
justify-content: center;
}
.coupon-activity-content .content-footer .footer-btn{
width: 70vw;
height: 6vh;
background: #D8D8D8;
color: #000000;
display: flex;
align-items: center;
justify-content: center;
border-radius: 3vh;
}
.coupon-activity-content .content-footer .footer-btn:active{
opacity: 0.7;
}
.promition-item{
width: 100%;
height: 6vh;
box-sizing: border-box;
-webkit-box-sizing: border-box;
margin-bottom: 20rpx;
position: relative;
display: flex;
align-items: center;
justify-content: space-between;
}
.promition-item:active{
opacity: 0.7;
}
.promition-item image{
width: 16rpx;
height: 24rpx;
}
.promition-item .promotions-name{
display: flex;
align-items: center;
justify-content: flex-start;
}
.promition-item .promotions-name .pro-title{
font-size: 28rpx;
width: 400rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.promition-item .promotions-name .promotion-type{
font-size: 22rpx;
width: 120rpx;
height: 40rpx;
background-position: center;
background-size: 100%;
display: flex;
align-items: center;
justify-content: center;
color: #cb3c3c;
margin-right: 10rpx;
background-image: url(https://img3.bigaka.com/prd/3001/202005/20200515/30015eb5843a-88a9-4ba1-86ad-74b26c15591a.png);
} }
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wxac09792264c49b5c", "appid": "wxc3b64b09b1d3dfc2",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E", "projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
"id": 16, "id": 16,
"name": "商品详情页", "name": "商品详情页",
"pathName": "pages/productDetail/productDetail", "pathName": "pages/productDetail/productDetail",
"query": "id=684465422204145664", "query": "id=684461227170336768",
"scene": null "scene": null
}, },
{ {
...@@ -690,15 +690,9 @@ ...@@ -690,15 +690,9 @@
}, },
{ {
"id": -1, "id": -1,
<<<<<<< HEAD
"name": "签到",
"pathName": "subPackageMarketing/page/pages/sign/sign",
"query": "",
=======
"name": "支付券信息", "name": "支付券信息",
"pathName": "subPackageA/page/pages/payCardInfo/payCardInfo", "pathName": "subPackageA/page/pages/payCardInfo/payCardInfo",
"query": "id=710195552385654784", "query": "id=710195552385654784",
>>>>>>> mall_dev_7.12.0
"scene": null "scene": null
} }
] ]
......
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