fe / yoho-luck · Commits

Go to a project

Authored by 陈峰
Commit 9646ff63980911deb69fbd9ac45d011dbf22d3a5 2 parents 8f6ff194 7f7834d4

Merge branch 'release/6.8.7' into 'master' 

Release/6.8.7



See merge request !17
Inline Side-by-side
Showing 25 changed files with 165 additions and 36 deletions
... ... @@ -20,6 +20,6 @@
"wx207f18be42db9028",
"wx68c7dd3634272f71",
"wxf9bac5064053057a"
]
],
"sitemapLocation": "sitemap40.json"
}
\ No newline at end of file
... ...

3.58 KB | W: | H:

3.83 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -94,7 +94,7 @@
width: 460rpx;
height: 80rpx;
line-height: 80rpx;
margin-top: 90rpx;
margin-top: 50rpx;
vertical-align: center;
}
... ...
<zero-alert wx:if="{{_show}}">
<view class="content" wx:if="{{!_text}}">
<block wx:if="{{_show}}">
<!-- <view class="content" wx:if="{{!_text}}">
<view>公众号<text style="font-weight: bolder">“{{_copyText}}”</text>已经复制成功，</view>
<view>打开微信搜索去添加吧~</view>
</view>
<view wx:else class="text">{{_text}}</view>
</view> -->
<block wx:if="{{!_text}}">
<view class="modal-mask" bindtap="onConfirm"></view>
<image class="modal-image" src="../images/WXTC@2x.png">
<view class="confirm" bindtap="onConfirm"></view>
</image>
</block>
<zero-alert wx:else>
<view class="text">{{_text}}</view>
<view class="foot" bindtap="onConfirm">确定</view>
</zero-alert>
\ No newline at end of file
</zero-alert>
</block>
\ No newline at end of file
... ...
/* page/subPackage/pages/zeroSell/components/fellow-alert.wxss */
.modal-mask {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
background: #000;
opacity: 0.5;
}
.content {
font-size: 28rpx;
color: #444444;
line-height: 40rpx;
text-align: center;
margin-top: 110rpx;
.modal-image {
width: 600rpx;
height: 1028rpx;
position: fixed;
top: 46%;
left: 50%;
margin-right: -50%;
transform: translate(-50%, -50%);
z-index: 9999;
overflow: visible;
}
.foot {
... ... @@ -21,6 +33,15 @@
text-align: center;
border-top: 1rpx solid #E0E0E0;
}
.confirm {
position: absolute;
left: 60rpx;
bottom: 50rpx;
width: 500rpx;
height: 100rpx;
}
.text {
font-size: 28rpx;
display:flex;
... ...
... ... @@ -23,7 +23,7 @@
抽奖价 ¥
<text class="lucky">0</text>
</view>
<view class="product_price">原价：<text class="line">{{product.price}}</text></view>
<view class="product_price"><text class="line">{{product.price}}</text></view>
</view>
<view wx:if="{{product.status !== 2 && product.start_time}}" class="product_time">{{helper.formatTime(product.start_time,
product.end_time)}}
... ...
... ... @@ -13,21 +13,21 @@
font-size: 28rpx;
font-weight: bold;
word-break:break-all;
color: #444444;
color: #222222;
}
.product_lucky_bg {
display: flex;
flex-direction: row;
align-items: baseline;
justify-content: space-between;
justify-content: center;
margin-left: 32rpx;
margin-right: 32rpx;
}
.product_price {
color: #B0B0B0;
font-size: 24rpx;
font-size: 32rpx;
font-weight: bold;
margin-left: 20rpx;
... ... @@ -109,7 +109,8 @@
.product_lucky {
color: #D0021B;
font-size: 24rpx;
font-family: PingFangSC-Semibold;
font-family: PingFangSC-Medium;
font-weight: bold;
display: flex;
flex-direction: row;
align-items: baseline;
... ...
... ... @@ -72,7 +72,7 @@
.product_lucky {
color: #D0021B;
font-size: 24rpx;
font-family: PingFangSC-Semibold;
font-family: PingFangSC-Medium;
display: flex;
flex-direction: row;
align-items: baseline;
... ...
import router from '../router/router';
let timer;
Component({
properties: {
product: {
... ... @@ -7,6 +9,33 @@ Component({
},
tabIdx: String
},
data: {
animation: null,
},
ready: function() {
let animation = wx.createAnimation({
duration: 400,
timingFunction: 'linear',
});
//放大缩小循环动画
var next = true;
timer = setInterval(function () {
if (next) {
animation.scale(1.05).step()
next = !next;
} else {
animation.scale(1).step({duration:250})
next = !next;
}
this.setData({
animation: animation.export()
})
}.bind(this), 400)
},
detached: function() {
clearInterval(timer);
},
methods: {
onClick() {
router.go('detail', {
... ...
... ... @@ -8,7 +8,7 @@
</block>
<block wx:elif="{{product.status === 2}}">
<view class="btn ok" catchtap="onClick">参加抽奖</view>
<view class="btn ok" catchtap="onClick" animation="{{animation}}">参加抽奖</view>
</block>
<block wx:elif="{{product.status === 3}}">
... ...
... ... @@ -11,7 +11,7 @@
}
.ok {
background: #222;
background: #D0021B;
}
.cancel {
... ...
/* page/subPackage/pages/zeroSell/components/tabs-panel.wxss */
\ No newline at end of file
... ... @@ -79,7 +79,8 @@ Page(Object.assign({
closeOnClickOverlay: true,
cancelText: '取消',
isNewShareStyle: true,
unionUserImageUrl: 'http://img12.static.yhbimg.com/sns/2018/08/02/15/029b6acc4f8bc0620ecd7ec2133fcf900c.png',
// unionUserImageUrl: 'http://img12.static.yhbimg.com/sns/2018/08/02/15/029b6acc4f8bc0620ecd7ec2133fcf900c.png',
unionUserImageUrl: './images/share_tip@2x.png',
actions: [{
name: '分享给好友',
className: 'action-class',
... ...
... ... @@ -2,6 +2,9 @@
<product-header product="{{product}}" shareFlag="{{shareFlag}}" avatars="{{avatars}}"></product-header>
</view>
<image class="jion-tips-image" src="./images/jion_tips@3x.png"></image>
<view class="machine {{shareFlag ? 'machine-t-m' : 'machine-t-l'}}">
<view class="open-shadow"></view>
<view class="code-list" animation="{{animation}}">
... ...
... ... @@ -30,7 +30,7 @@
position: fixed;
width: 100%;
top: 0rpx;
z-index: 999;
z-index: 1000;
}
.action-bar {
... ... @@ -56,7 +56,7 @@
}
.confirm {
background-color: #444444;
background-color: #D0021B;
}
.over {
... ... @@ -108,6 +108,13 @@
border-top: 1rpx solid #E0E0E0;
}
.jion-tips-image {
margin-left: 30rpx;
width: 690rpx;
height: 70rpx;
margin-top: 20rpx;
}
.machine {
background-image: url('https://img10.static.yhbimg.com/yhb-img01/2018/12/27/19/011f45717237b3cbf7301833e8dc28f994.png');
background-size: contain;
... ...
... ... @@ -63,7 +63,8 @@ Page(Object.assign({
closeOnClickOverlay: true,
cancelText: '取消',
isNewShareStyle: true,
unionUserImageUrl: 'http://img12.static.yhbimg.com/sns/2018/08/02/15/029b6acc4f8bc0620ecd7ec2133fcf900c.png',
// unionUserImageUrl: 'http://img12.static.yhbimg.com/sns/2018/08/02/15/029b6acc4f8bc0620ecd7ec2133fcf900c.png',
unionUserImageUrl: './images/share_tip@2x.png',
actions: [{
name: '分享给好友',
className: 'action-class',
... ... @@ -107,7 +108,7 @@ Page(Object.assign({
}
new app.WeToast();
if (options && (Number(options.reload) !== 0)) {
if (options && (Number(options.reload) !== 0) && options.tabIndex !== "3") {
this._getResouceCode()
}
this._getBottomBanner();
... ... @@ -353,6 +354,12 @@ Page(Object.assign({
this._init();
},
_jumpMyDrawCode() {
router.go('index', {
tabIndex: 3,
});
},
getUserInfo: function (e) {
var that = this;
if (e.detail.errMsg === 'getUserInfo:ok') {
... ...
<tabs tabs-class="tabs-class" current-key="{{tabIndex}}" bindchange="onTabChange">
<view class="list-top-blank"></view>
<tabs tabs-class="tabs-class {{tabIndex==3 ? 'hidden' : ''}}" current-key="{{tabIndex}}" bindchange="onTabChange">
<view class="list-top-blank {{tabIndex==3 ? 'hidden' : ''}}"></view>
<tabs-pane name="进行中">
<image class="topgif" src="./images/yoluck.gif"/>
... ... @@ -26,7 +26,9 @@
</view>
</tabs-pane>
<tabs-pane name="已参加">
<!-- 首页改版，tabIndex=3的已参加一栏取消，改为点击我的抽奖码进入 2019.6.20 -->
<!-- <tabs-pane name="已参加"> -->
<block wx:if="{{tabIndex == 3}}">
<block wx:if="{{isLogin}}">
<view class="title-view">
<view class="space-line"></view>
... ... @@ -46,8 +48,7 @@
<text class="title">已公布</text>
</view>
<block wx:if="{{my_zero_list[1].data && my_zero_list[1].data.length === 0}}">
<view class="list-foot-blank">暂无已公布活动，请继续参加活动
</view>
<view class="list-foot-blank">暂无已公布活动，请继续参加活动</view>
</block>
<block wx:else>
<block wx:for="{{my_zero_list[1].data}}" wx:key="{{index}}">
... ... @@ -58,7 +59,9 @@
<block wx:else>
<login theme="light" openType="{{openType}}"></login>
</block>
</tabs-pane>
<!-- </tabs-pane> -->
</block>
<block wx:if="{{tabIndex !== 3}}">
<view class="list-foot-blank">{{footText}}</view>
</block>
... ... @@ -69,6 +72,12 @@
</view>
</block>
<block wx:if="{{tabIndex !== 3}}">
<view class="my-draw-code" bindtap="_jumpMyDrawCode">
<text class="my-draw-code-text">我的抽奖码</text>
</view>
</block>
<import src="../../vendors/zanui/toast/index.wxml"/>
<template is="zan-toast" data="{{zanToast}}"/>
... ...
... ... @@ -62,6 +62,10 @@ page {
border-bottom: 1rpx solid #E0E0E0;
}
.hidden {
display: none !important;
}
.topgif {
width: 100%;
height: 200rpx;
... ... @@ -87,3 +91,26 @@ page {
align-items: center;
font-family: PingFangSC-Medium;
}
.my-draw-code {
position: fixed;
z-index: 999;
left: 0;
bottom: 0;
width: 100%;
height: 100rpx;
background-color: white;
border-top: 2rpx solid #e0e0ee;
display: flex;
align-items: center;
justify-content: center;
}
.my-draw-code-text {
font-family: PingFangSC-Medium;
font-weight: bold;
font-size: 28rpx;
color: #444444;
letter-spacing: 0;
text-align: center;
}
\ No newline at end of file
... ...
... ... @@ -13,6 +13,8 @@
"libVersion": "2.0.0",
"appid": "wx7678b61d1e6702fe",
"projectname": "YO!LUCK",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
... ...
{
"desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
... ...
{
"desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
... ...
... ... @@ -29,7 +29,7 @@
<view wx:if='{{isNewShareStyle}}' class='share_new_container'>
<!--联盟用户 资源位-->
<view class='share_union_soruce_img_container'>
<image src="{{unionUserImageUrl? unionUserImageUrl:'http://img13.static.yhbimg.com/article/2018/07/05/11/0204b2cb17aebf4ca33557392bb29e0807.jpg'}}" catchtap='_handlerJumpByUrl' class='share_union_soruce_img'></image>
<image src="{{unionUserImageUrl? unionUserImageUrl:'http://img13.static.yhbimg.com/article/2018/07/05/11/0204b2cb17aebf4ca33557392bb29e0807.jpg'}}" catchtap='_handlerJumpByUrl' class='share_union_soruce_img' mode='aspectFit'></image>
</view>
<!--分享的图标及文字容器-->
... ...