fe / yohobuywap-node · Commits

Go to a project

Authored by huangyi
Commit 4d6334ed7404c726b6677c205d5cd29a96d30190 1 parent 1a485b46

Merge branches 'feature/redpack' and 'release/6.7.9' of http://git.yoho.cn/fe/yo… 

…hobuywap-node into feature/redpack

# Conflicts:
#	apps/activity/router.js
Inline Side-by-side
Showing 7 changed files with 53 additions and 49 deletions
... ... @@ -45,8 +45,8 @@ class redEnvelopeModel extends global.yoho.BaseModel {
return await this.get({
data: {
method: 'app.passport.submitUserWechatCode',
uid: obj.userUid,
wechat_uid: obj.uid,
uid: obj.uid,
wechat_uid: obj.userUid,
userCode: obj.userCode
}
});
... ...
<div class="content-service">
{{#if isGetRedBag}}
<div class="user-coupon-info">
<input type="hidden" id="uid" value="{{userInfo.uid}}"/>
<div class="coupon-desc">
<div>{{userInfo.userName}}，已成功获取</div>
{{#if userInfo.rewardType }}
<div class="desc-li">{{userInfo.couponName}}</div>
{{else}}
<div class="desc-li">{{userInfo.rewardName}}</div>
{{/if}}
<div class="desc-li">{{userInfo.recievedTime}}</div>
</div>
<div class="user-info">
<div class="copy-account">
<div class="account">{{userInfo.vipLevel}} {{userInfo.uid}}</div>
<button class="copy">点击复制</button>
</div>
{{#if userInfo.related}}
<div class="wx-account">
<input placeholder="请输入用户微信号" class="account-input" bindinput="bindAccount" value="{{account}}"/>
<button class="submitWxAccount">提交微信</button>
</div>
{{/if}}
<div class="wx-account-info">
{{#if userInfo.submitWechat}}
<div>已提交微信号：{{userInfo.userWechatCode}}</div>
<div class="user-coupon-info">
<input type="hidden" id="uid" value="{{userInfo.uid}}"/>
<div class="coupon-desc">
<div>{{userInfo.userName}}，已成功获取</div>
{{#if userInfo.rewardType }}
<div class="desc-li">{{userInfo.couponName}}</div>
{{else}}
<div>未提交微信</div>
<div class="desc-li">{{userInfo.rewardName}}</div>
{{/if}}
<div class="desc-li">{{userInfo.recievedTime}}</div>
</div>
</div>
<div class="user-label">
<div class="title">用户标签</div>
<div>
<span class="label">{{userInfo.tag_address}}</span>
<span class="label">{{userInfo.tag_createTime}}</span>
<div class="user-info">
<div class="copy-account">
<div class="account">{{userInfo.vipLevel}} {{userInfo.uid}}</div>
<button class="copy">点击复制</button>
</div>
{{#if userInfo.related}}
<div class="wx-account">
<input placeholder="请输入用户微信号" class="account-input" bindinput="bindAccount"
value="{{account}}"/>
<button class="submitWxAccount">提交微信</button>
</div>
{{/if}}
<div class="wx-account-info">
<div id="hasCode" style="{{#if userInfo.submitWechat}}display: block{{/if}}">已提交微信号：<span id="wxCode">{{userInfo.userWechatCode}}</span></div>
<div id="noCode" style="{{#if userInfo.submitWechat}}display: none;{{/if}}">未提交微信</div>
</div>
</div>
</div>
<div class="relation-list">
<div class="title">已关联潮流顾问</div>
{{#each userInfo.relatedWechatList}}
<div class="list-item">
<span class="item-jqm">{{machineCode}}</span>
<span class="item-wx-acount">{{wechatCode}}</span>
<div class="user-label">
<div class="title">用户标签</div>
<div>
<span class="label">{{userInfo.tag_address}}</span>
<span class="label">{{userInfo.tag_createTime}}</span>
</div>
{{/each}}
</div>
<div class="relation-list">
<div class="title">已关联潮流顾问</div>
{{#each userInfo.relatedWechatList}}
<div class="list-item">
<span class="item-jqm">{{machineCode}}</span>
<span class="item-wx-acount">{{wechatCode}}</span>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{else}}
<div class="no-box">
<div class="no-received">
<image src="http://img12.static.yhbimg.com/sns/2018/09/20/10/02f45a44a7dc9012468441eae604f1c910.png" class="no-icon"/>
<image src="http://img12.static.yhbimg.com/sns/2018/09/20/10/02f45a44a7dc9012468441eae604f1c910.png"
class="no-icon"/>
<div class="no-txt">礼包尚未被领取</div>
<div class="no-txt">可以微信提醒用户尽快领取！</div>
</div>
... ...
... ... @@ -43,4 +43,4 @@
<p class="txt txt-3">抽中的优惠券将被放入您的有货账户中，若抽中免单/微信红包/实物奖品，请截图后联系微信客服；</p>
<p class="txt last">*此活动最终解释权归Yoho!Buy所有</p>
</div>
</div>
\ No newline at end of file
</div>
... ...
... ... @@ -21,6 +21,9 @@ $('.submitWxAccount').click(function() {
},
success: function(data) {
if (data.code === 200) {
$('#wxCode').text($('.account-input')[0].value);
$('#noCode').hide();
$('#hasCode').show();
tip.show('提交成功');
} else {
tip.show(data.message);
... ...
... ... @@ -35,9 +35,9 @@ $(() => {
},
success: function(res) {
if (res.code === 200) {
// setTimeout(() => {
// window.location.reload();
// }, 500);
setTimeout(() => {
window.location.reload();
}, 500);
}
tip.show(res.message);
},
... ...
... ... @@ -197,6 +197,7 @@ body {
}
.user-coupon-info {
height: 100%;
background: #fff;
min-height: 87vh;
}
... ...
... ... @@ -80,7 +80,8 @@
.activity-rule {
width: 680px;
height: 440px;
height: 100%;
min-height: 440px;
margin: 0 auto;
padding: 33px;
background: url("img/activity/red-envelope/txt-bg.png") no-repeat;
... ...