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 188 additions and 59 deletions
1 { 1 {
2 - "pages": [  
3 - "pages/zeroSell/index",  
4 - "pages/zeroSell/detail",  
5 - "pages/zeroSell/snapshootShare",  
6 - "pages/zeroSell/h5Page",  
7 - "pages/zeroSell/error",  
8 - "pages/bindPhoneNumber/bindPhoneNumber",  
9 - "pages/choosecountry/choosecountry",  
10 - "login/login-page/login-page"  
11 - ],  
12 - "window": {  
13 - "navigationBarTextStyle": "white",  
14 - "navigationBarBackgroundColor": "#3a3a3a",  
15 - "backgroundColor": "#fff",  
16 - "backgroundTextStyle": "dark",  
17 - "onReachBottomDistance": 100  
18 - },  
19 - "navigateToMiniProgramAppIdList": [  
20 - "wx207f18be42db9028",  
21 - "wx68c7dd3634272f71",  
22 - "wxf9bac5064053057a"  
23 - ]  
24 -}  
25 - 2 + "pages": [
  3 + "pages/zeroSell/index",
  4 + "pages/zeroSell/detail",
  5 + "pages/zeroSell/snapshootShare",
  6 + "pages/zeroSell/h5Page",
  7 + "pages/zeroSell/error",
  8 + "pages/bindPhoneNumber/bindPhoneNumber",
  9 + "pages/choosecountry/choosecountry",
  10 + "login/login-page/login-page"
  11 + ],
  12 + "window": {
  13 + "navigationBarTextStyle": "white",
  14 + "navigationBarBackgroundColor": "#3a3a3a",
  15 + "backgroundColor": "#fff",
  16 + "backgroundTextStyle": "dark",
  17 + "onReachBottomDistance": 100
  18 + },
  19 + "navigateToMiniProgramAppIdList": [
  20 + "wx207f18be42db9028",
  21 + "wx68c7dd3634272f71",
  22 + "wxf9bac5064053057a"
  23 + ],
  24 + "sitemapLocation": "sitemap40.json"
  25 +}

3.58 KB | W: | H:

3.83 KB | W: | H:

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