fe / yoho-luck · Commits

Go to a project

Authored by QC-L
Commit 675285aa2a56be65625c52acdde27fceb51271f6 1 parent 8323c1f6

登录兼容 review by 黄敬囿

Inline Side-by-side
Showing 6 changed files with 29 additions and 23 deletions
@@ -9,7 +9,7 @@ let CHOOSED_COUNTRY_ID = 'CHOOSED_COUNTRY_ID' @@ -9,7 +9,7 @@ let CHOOSED_COUNTRY_ID = 'CHOOSED_COUNTRY_ID'
9 let CHOOSED_COUNTRY_NAME = 'CHOOSED_COUNTRY_NAME' 9 let CHOOSED_COUNTRY_NAME = 'CHOOSED_COUNTRY_NAME'
10 let app = getApp(); 10 let app = getApp();
11 const {extend,Toast} = require('../../vendors/zanui/index'); 11 const {extend,Toast} = require('../../vendors/zanui/index');
12 - 12 +const event = global.event;
13 Page(extend({},Toast,{ 13 Page(extend({},Toast,{
14 /** 14 /**
15 * 页面的初始数据 15 * 页面的初始数据
@@ -185,11 +185,12 @@ Page(extend({},Toast,{ @@ -185,11 +185,12 @@ Page(extend({},Toast,{
185 //如果是从h5页面唤起，则重新用webview 打开h5链接；其他页面直接返回上一层 185 //如果是从h5页面唤起，则重新用webview 打开h5链接；其他页面直接返回上一层
186 if (that.data.h5back){ 186 if (that.data.h5back){
187 wx.navigateBack({ 187 wx.navigateBack({
188 - delta: 1, 188 + delta: 2,
189 }) 189 })
190 wx.redirectTo({ 190 wx.redirectTo({
191 url: '../webview/webview?url=' + that.data.h5back 191 url: '../webview/webview?url=' + that.data.h5back
192 }) 192 })
  193 + event.emit('wechat-login-success');
193 }else{ 194 }else{
194 if (result.is_register){ 195 if (result.is_register){
195 that.showZanToast({ 196 that.showZanToast({
@@ -200,8 +201,9 @@ Page(extend({},Toast,{ @@ -200,8 +201,9 @@ Page(extend({},Toast,{
200 prePage[prePage.length - 2].bindPhoneNumComplete(); 201 prePage[prePage.length - 2].bindPhoneNumComplete();
201 } 202 }
202 wx.navigateBack({ 203 wx.navigateBack({
203 - delta: 1, 204 + delta: 2,
204 }) 205 })
  206 + event.emit('wechat-login-success');
205 } 207 }
206 }, 1500); 208 }, 1500);
207 } else { 209 } else {
@@ -210,6 +212,7 @@ Page(extend({},Toast,{ @@ -210,6 +212,7 @@ Page(extend({},Toast,{
210 if (prePage.length > 1 && prePage[prePage.length - 2].bindPhoneNumComplete != undefined) { 212 if (prePage.length > 1 && prePage[prePage.length - 2].bindPhoneNumComplete != undefined) {
211 prePage[prePage.length - 2].bindPhoneNumComplete(); 213 prePage[prePage.length - 2].bindPhoneNumComplete();
212 } 214 }
  215 + event.emit('wechat-login-success');
213 wx.navigateBack({ 216 wx.navigateBack({
214 delta: 1, 217 delta: 1,
215 }) 218 })
@@ -427,6 +430,7 @@ bindBtnAction:function (needBind, callBackFun) { @@ -427,6 +430,7 @@ bindBtnAction:function (needBind, callBackFun) {
427 } else { 430 } else {
428 that.redirectAction(); 431 that.redirectAction();
429 } 432 }
  433 + event.emit('wechat-login-success');
430 } 434 }
431 }) 435 })
432 }, 436 },
@@ -438,21 +442,21 @@ redirectAction: function() { @@ -438,21 +442,21 @@ redirectAction: function() {
438 let that = this; 442 let that = this;
439 if (that.data.h5back) { 443 if (that.data.h5back) {
440 wx.navigateBack({ 444 wx.navigateBack({
441 - delta: 1, 445 + delta: 2,
442 }) 446 })
443 wx.redirectTo({ 447 wx.redirectTo({
444 url: '../webview/webview?url=' + that.data.h5back 448 url: '../webview/webview?url=' + that.data.h5back
445 }) 449 })
446 } else { 450 } else {
447 - let prePage = getCurrentPages();  
448 - that.newCustomerStorage();  
449 - if (prePage.length > 1 && prePage[prePage.length - 2].bindPhoneNumComplete != undefined) {  
450 - prePage[prePage.length - 2].bindPhoneNumComplete();  
451 - } 451 + // let prePage = getCurrentPages();
  452 + // that.newCustomerStorage();
  453 + // if (prePage.length > 1 && prePage[prePage.length - 2].bindPhoneNumComplete != undefined) {
  454 + // prePage[prePage.length - 2].bindPhoneNumComplete();
  455 + // }
452 456
453 // console.log("currentPage:", getCurrentPages()) 457 // console.log("currentPage:", getCurrentPages())
454 wx.navigateBack({ 458 wx.navigateBack({
455 - delta: 1, 459 + delta: 2,
456 }) 460 })
457 return 461 return
458 } 462 }
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 66
67 <button catchtap="bindBtnAction" class="view-bindBtn {{disabledClass == undefined ? 'disabled' : disabledClass}}" >完成</button> 67 <button catchtap="bindBtnAction" class="view-bindBtn {{disabledClass == undefined ? 'disabled' : disabledClass}}" >完成</button>
68 68
69 - <button class="view-verifyBtn" open-type="{{hasUnionID?'getPhoneNumber':'getUserInfo'}}" bindgetphonenumber="getPhoneNumber" bindgetuserinfo='getUserInfo'>自动验证</button> 69 + <!-- <button class="view-verifyBtn" open-type="{{hasUnionID?'getPhoneNumber':'getUserInfo'}}" bindgetphonenumber="getPhoneNumber" bindgetuserinfo='getUserInfo'>自动验证</button> -->
70 70
71 </view> 71 </view>
72 72
@@ -503,7 +503,7 @@ Page(Object.assign({ @@ -503,7 +503,7 @@ Page(Object.assign({
503 onShareAppMessage(res) { 503 onShareAppMessage(res) {
504 let params = { 504 let params = {
505 TITLE: `【0元抽奖】点一下，免费拿走${this.data.product.name}`, 505 TITLE: `【0元抽奖】点一下，免费拿走${this.data.product.name}`,
506 - DESC: '我在有货精选发现一个不错的商品赶快来看看吧！' 506 + DESC: '我在YO!LUCK发现一个不错的商品赶快来看看吧！'
507 }; 507 };
508 508
509 if (res.from === 'menu') { 509 if (res.from === 'menu') {
@@ -458,7 +458,6 @@ Page(Object.assign({ @@ -458,7 +458,6 @@ Page(Object.assign({
458 }, 458 },
459 459
460 loginSuccess(params) { 460 loginSuccess(params) {
461 - console.log(params);  
462 let app = getApp(); 461 let app = getApp();
463 this.setData({ 462 this.setData({
464 isLogin: app.isLogin(), 463 isLogin: app.isLogin(),
@@ -232,7 +232,7 @@ Page(Object.assign({ @@ -232,7 +232,7 @@ Page(Object.assign({
232 onShareAppMessage(res) { 232 onShareAppMessage(res) {
233 let params = { 233 let params = {
234 TITLE: `【0元抽奖】点一下，免费拿走${this.data.shareProduct.name}`, 234 TITLE: `【0元抽奖】点一下，免费拿走${this.data.shareProduct.name}`,
235 - DESC: '我在有货精选发现一个不错的商品赶快来看看吧！' 235 + DESC: '我在YO!LUCK发现一个不错的商品赶快来看看吧！'
236 }; 236 };
237 237
238 if (res.from === 'menu') { 238 if (res.from === 'menu') {
@@ -38,8 +38,8 @@ @@ -38,8 +38,8 @@
38 .yoho-logo { 38 .yoho-logo {
39 width: 200rpx; 39 width: 200rpx;
40 height: 40rpx; 40 height: 40rpx;
41 - margin-top: 40rpx;  
42 - margin-bottom: 40rpx; 41 + margin-top: 20rpx;
  42 + margin-bottom: 20rpx;
43 } 43 }
44 44
45 .content { 45 .content {
@@ -78,27 +78,30 @@ @@ -78,27 +78,30 @@
78 .product-name { 78 .product-name {
79 color: #444444; 79 color: #444444;
80 text-align: center; 80 text-align: center;
81 - font-size: 30rpx; 81 + font-size: 32rpx;
82 margin-top: 30rpx; 82 margin-top: 30rpx;
83 margin-bottom: 20rpx; 83 margin-bottom: 20rpx;
84 - /* line-height: 50rpx; */ 84 + line-height: 60rpx;
85 font-weight: bold; 85 font-weight: bold;
86 - display: inherit; 86 + display: -webkit-box;
87 overflow: hidden; 87 overflow: hidden;
88 - text-overflow:ellipsis;  
89 - white-space: pre-wrap; 88 + text-overflow: ellipsis;
  89 + word-wrap: normal;
  90 + white-space: normal !important;
90 -webkit-box-orient: vertical; 91 -webkit-box-orient: vertical;
91 -webkit-line-clamp: 2; 92 -webkit-line-clamp: 2;
92 - padding: 0 40rpx; 93 + padding: 0 10rpx;
  94 + font-family: SanFranciscoText-Bold;
93 /* white-space: nowrap; 95 /* white-space: nowrap;
94 text-overflow: ellipsis; 96 text-overflow: ellipsis;
95 overflow: hidden; */ 97 overflow: hidden; */
96 } 98 }
97 99
98 .product-price { 100 .product-price {
  101 + font-family: SanFranciscoText-Bold;
99 text-align: center; 102 text-align: center;
100 font-size: 34rpx; 103 font-size: 34rpx;
101 - margin: 30rpx 0; 104 + margin: 20rpx 0;
102 } 105 }
103 106
104 .price { 107 .price {