Skip to content

H
hello_taobao
Commit 1e07b1a4 authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

Merge branch 'master' of gitlab2.dui88.com:wanghongyuan/hello_taobao

parents ddb2f17a 4a0f9db9
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 97 deletions
dist/components/comhui_yuan/comhui_yuan.js
View file @ 1e07b1a4
...@@ -45,7 +45,7 @@ Component({ ...@@ -45,7 +45,7 @@ Component({
setTimeout(() => { setTimeout(() => {
this.onOrderNowModalClose(); this.onOrderNowModalClose();
commonToast(resp.message); commonToast(resp.message);
}, 500); }, 1000);
}else{ }else{
commonToast(resp.message) commonToast(resp.message)
} }
......
dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js
View file @ 1e07b1a4
...@@ -97,8 +97,8 @@ Page({ ...@@ -97,8 +97,8 @@ Page({
// 购买成功后更新积分 // 购买成功后更新积分
// 更新购买记录 // 更新购买记录
// 总楼层数更新 // 总楼层数更新
this.getOrderList();
this.getUserCredits(); this.getUserCredits();
this.getOrderList();
this.getBaseInfo(); this.getBaseInfo();
console.log(this.data.userCredits, '更新后的用户积分'); console.log(this.data.userCredits, '更新后的用户积分');
}, },
...@@ -161,8 +161,7 @@ Page({ ...@@ -161,8 +161,7 @@ Page({
if (currentTime < end) { if (currentTime < end) {
if(reduced <= 0){ if(reduced <= 0){
commonToast('已购买的楼层达到最大值'); commonToast('已购买的楼层达到最大值');
} }else if(canBuyFloor <= reduced){
if(canBuyFloor <= reduced){
// 可以买 // 可以买
// 显示 // 显示
this.setData({ this.setData({
......
dist/pages/pagejie_shu_ye/pagejie_shu_ye.acss
View file @ 1e07b1a4
...@@ -5,6 +5,15 @@ ...@@ -5,6 +5,15 @@
position: absolute; position: absolute;
} }
.mask {
position: fixed;
width: 100%;
height: 100%;
z-index: 999;
background-color: #000;
opacity: 0.7;
}
.jie_shu_ye .logo { .jie_shu_ye .logo {
width: 160rpx; width: 160rpx;
height: 58rpx; height: 58rpx;
...@@ -55,40 +64,40 @@ ...@@ -55,40 +64,40 @@
width: 35rpx; width: 35rpx;
height: 25rpx; height: 25rpx;
opacity: 1; opacity: 1;
left: 13rpx; left: 15rpx;
top: 47rpx; top: 40rpx;
position: absolute; position: absolute;
font-size: 14.41518rpx; font-size: 25rpx;
color: #ffffff; color: #ffffff;
} }
.jie_shu_ye .dao_ji_shi69 .tu_ceng22_kao_bei72 { .jie_shu_ye .dao_ji_shi69 .tu_ceng22_kao_bei72 {
width: 35rpx; width: 35rpx;
height: 25rpx; height: 25rpx;
opacity: 1; opacity: 1;
left: 131rpx; left: 135rpx;
top: 47rpx; top: 40rpx;
position: absolute; position: absolute;
font-size: 14.41518rpx; font-size: 25rpx;
color: #ffffff; color: #ffffff;
} }
.jie_shu_ye .dao_ji_shi69 .tu_ceng2271 { .jie_shu_ye .dao_ji_shi69 .tu_ceng2271 {
width: 35rpx; width: 35rpx;
height: 25rpx; height: 25rpx;
opacity: 1; opacity: 1;
left: 246rpx; left: 248rpx;
top: 47rpx; top: 40rpx;
position: absolute; position: absolute;
font-size: 14.41518rpx; font-size: 25rpx;
color: #ffffff; color: #ffffff;
} }
.jie_shu_ye .dao_ji_shi69 .tu_ceng22_kao_bei370 { .jie_shu_ye .dao_ji_shi69 .tu_ceng22_kao_bei370 {
width: 35rpx; width: 35rpx;
height: 25rpx; height: 25rpx;
opacity: 1; opacity: 1;
left: 357rpx; left: 360rpx;
top: 47rpx; top: 40rpx;
position: absolute; position: absolute;
font-size: 14.41518rpx; font-size: 25rpx;
color: #ffffff; color: #ffffff;
} }
.jie_shu_ye .mai_zhongn20n50n80_lou_ceng_de_yong_hu_ke_huo_de_jiang_pinn_dai_biao_gai_lou_jie_shu_shi_de_zong_lou_ceng { .jie_shu_ye .mai_zhongn20n50n80_lou_ceng_de_yong_hu_ke_huo_de_jiang_pinn_dai_biao_gai_lou_jie_shu_shi_de_zong_lou_ceng {
...@@ -468,21 +477,21 @@ ...@@ -468,21 +477,21 @@
position: absolute; position: absolute;
} }
.jie_shu_ye .gou_mai_ji_lu46 .zu13447 { .jie_shu_ye .gou_mai_ji_lu46 .zu13447 {
width: 453rpx; width: 500rpx;
height: 222rpx; height: 222rpx;
opacity: 1; opacity: 1;
left: 61rpx; left: 61rpx;
top: 147rpx; top: 130rpx;
position: absolute; position: absolute;
overflow-y: auto; overflow-y: auto;
} }
.jie_shu_ye .gou_mai_ji_lu46 .zu13447 .item{ .jie_shu_ye .gou_mai_ji_lu46 .zu13447 .item{
top:0rpx; top:0rpx;
width: 453rpx; width: 500rpx;
height: 222rpx; height: 222rpx;
opacity: 1; opacity: 1;
left: 10rpx; /* left: 10rpx; */
position: absolute; position: absolute;
} }
......
dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml
View file @ 1e07b1a4
<view class="jie_shu_ye"> <view class="jie_shu_ye">
<image class="di_kao_bei3" src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} /> <view class="{{maskVisible ? 'mask' : ''}}"></view>
<image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} /> <image class="di_kao_bei3" src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} />
<image onTap="onPrizeBtnClick" class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} /> <image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} />
<image class="gui_zeicon" onTap="showRuleModal" src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} /> <image onTap="onPrizeBtnClick" class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} />
<image class="gui_zeicon" onTap="showRuleModal" src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} />
<view class="dao_ji_shi69"> <view class="dao_ji_shi69">
<image class="di74" src={{resList['ad6e754e-6243-4acf-9ffd-9a7aeb3f4971'].url}} /> <image class="di74" src={{resList['ad6e754e-6243-4acf-9ffd-9a7aeb3f4971'].url}} />
<label class="tu_ceng2273">00</label> <label class="tu_ceng2273">00</label>
<label class="tu_ceng22_kao_bei72">00</label> <label class="tu_ceng22_kao_bei72">00</label>
<label class="tu_ceng2271">00</label> <label class="tu_ceng2271">00</label>
<label class="tu_ceng22_kao_bei370">00</label> <label class="tu_ceng22_kao_bei370">00</label>
</view> </view>
<label class="mai_zhongn20n50n80_lou_ceng_de_yong_hu_ke_huo_de_jiang_pinn_dai_biao_gai_lou_jie_shu_shi_de_zong_lou_ceng"> <label class="mai_zhongn20n50n80_lou_ceng_de_yong_hu_ke_huo_de_jiang_pinn_dai_biao_gai_lou_jie_shu_shi_de_zong_lou_ceng">
买中N*20%，N*50%，N*80%楼层的用户可获得奖品 N代表盖楼结束时的总楼层 买中N*20%，N*50%，N*80%楼层的用户可获得奖品 N代表盖楼结束时的总楼层
</label> </label>
<view class="zhong_jiang_ming_dan"> <view class="zhong_jiang_ming_dan">
<image class="di953" src={{resList['e701381d-fb5a-4b6a-8fc1-71aedea9416d'].url}} /> <image class="di953" src={{resList['e701381d-fb5a-4b6a-8fc1-71aedea9416d'].url}} />
<view class="zhong_jiang_zhuang_tai"> <view class="zhong_jiang_zhuang_tai">
<!-- 已中奖名单列表 --> <!-- 已中奖名单列表 -->
<view class="yi_zhong_jiang"> <view class="yi_zhong_jiang">
<!-- 有中奖用户 -->
<!-- 有中奖用户 --> <view style="position:absolute" a:if="{{prizeMenu != null}}" a:for="{{prizeMenu}}" a:key="idx" a:for-item="prizeItem">
<view style="position:absolute" a:if="{{prizeMenu != null}}" a:for="{{prizeMenu}}" a:key="idx" a:for-item="prizeItem" > <view style="height:40rpx;position:absolute">
<view style="height:40rpx;position:absolute"> <label style="{{prizeItem.prizestyle.prizefloor}}">第{{prizeItem.floor}}层</label>
<label style="{{prizeItem.prizestyle.prizefloor}}">第{{prizeItem.floor}}层</label> <label style="{{prizeItem.prizestyle.prizeuser}}">{{prizeItem.username}}</label>
<label style="{{prizeItem.prizestyle.prizeuser}}">{{prizeItem.username}}</label> <image style="{{prizeItem.prizestyle.prizeimage}}" src={{prizeItem.image}}></image>
<image style="{{prizeItem.prizestyle.prizeimage}}" src={{prizeItem.image}}></image>
</view>
</view>
<view class="no_prize" a:if="{{prizeMenu == null}}">总楼层不足,无人中奖</view>
</view>
<!-- <view class="wei_zhong_jiang">
<label class="zong_lou_ceng_bu_zu_wu_ren_zhong_jiang">总楼层不足，无人中奖</label>
</view> -->
</view>
</view>
<!-- 购买记录组件 -->
<view class="gou_mai_ji_lu46">
<image class="di77" src={{resList['79d3561c-5c4c-47b8-b4f9-51e7f82fcd7c'].url}} />
<!-- <image class="jin_du_tiao" src={{resList['40b73efe-19b8-41af-be83-17dc9b933e52'].url}} /> -->
<view class="zu13447" >
<!-- <label class="tu_ceng09_yue15_ri56">09 月 15日</label>
<label class="tu_ceng10012055">100-120</label>
<label class="tu_ceng10012054">100-120</label>
<label class="tu_ceng10012053">100-120</label>
<label class="tu_ceng20052">200</label>
<label class="tu_ceng20051">200</label>
<label class="tu_ceng20050">200</label>
<label class="tu_ceng09_yue15_ri49">09 月 15日</label>
<label class="tu_ceng09_yue15_ri48">09 月 15日</label>
<label class="tu_ceng100120_kao_bei">100-120</label>
<label class="tu_ceng200_kao_bei">200</label>
<label class="tu_ceng09_yue15_ri_kao_bei">09 月 15日</label>
<label class="tu_ceng100120_kao_bei2">100-120</label>
<label class="tu_ceng200_kao_bei2">200</label>
<label class="tu_ceng09_yue15_ri_kao_bei2">09 月 15日</label>
<label class="tu_ceng100120_kao_bei3">100-120</label>
<label class="tu_ceng200_kao_bei3">200</label>
<label class="tu_ceng09_yue15_ri_kao_bei3">09 月 15日</label> -->
<view class="item" a:for="{{orderList}}" a:key="index" a:for-item="item" >
<label style="{{item.order.orderDay}}">{{item.monthDate}}</label>
<label style="{{item.order.orderFloor}}">{{item.floorRange}}</label>
<label style="{{item.order.orderCredits}}">{{item.credits}}</label>
</view>
</view> </view>
</view> </view>
<view class="no_prize" a:if="{{prizeMenu == null}}">总楼层不足,无人中奖</view>
</view>
<!--<view class="wei_zhong_jiang"><label class="zong_lou_ceng_bu_zu_wu_ren_zhong_jiang">总楼层不足，无人中奖</label></view> -->
</view>
</view>
<!-- 购买记录组件 -->
<view class="gou_mai_ji_lu46">
<image class="di77" src={{resList['79d3561c-5c4c-47b8-b4f9-51e7f82fcd7c'].url}} />
<!--<image class="jin_du_tiao" src={{resList['40b73efe-19b8-41af-be83-17dc9b933e52'].url}} /> -->
<view class="zu13447">
<view class="item" a:for="{{orderList}}" a:key="index" a:for-item="item">
<label style="{{item.order.orderDay}}">{{item.monthDate}}</label>
<label style="{{item.order.orderFloor}}">{{item.floorRange}}</label>
<label style="{{item.order.orderCredits}}">{{item.credits}}</label>
</view> </view>
<prize-modal a:if="{{prizeVisible}}" onPrizeModalClose="onPrizeModalClose" myPrize="{{myPrize}}" ></prize-modal> </view>
<noprize-modal a:if="{{noprizeVisible}}" openPrizeStatus="{{openPrizeStatus}}" onHandleNoPrizeClose="onHandleNoPrizeClose" myPrize="{{myPrize}}" ></noprize-modal> </view>
</view>
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="ruleModalClose"><text>{{ruleData}}</text></rule-modal> <prize-modal a:if="{{prizeVisible}}" onPrizeModalClose="onPrizeModalClose" myPrize="{{myPrize}}"></prize-modal>
\ No newline at end of file <noprize-modal a:if="{{noprizeVisible}}" openPrizeStatus="{{openPrizeStatus}}" onHandleNoPrizeClose="onHandleNoPrizeClose" myPrize="{{myPrize}}"></noprize-modal>
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="ruleModalClose">
<text>{{ruleData}}</text></rule-modal>
\ No newline at end of file
dist/pages/pagejie_shu_ye/pagejie_shu_ye.js
View file @ 1e07b1a4
...@@ -18,7 +18,8 @@ Page({ ...@@ -18,7 +18,8 @@ Page({
ruleModalVisible: false, ruleModalVisible: false,
// myPrizeBtnVisible: false, // myPrizeBtnVisible: false,
ruleData:'', ruleData:'',
myPrize:'' myPrize:'',
maskVisible:false
}, },
onLoad(props) { onLoad(props) {
...@@ -72,12 +73,14 @@ Page({ ...@@ -72,12 +73,14 @@ Page({
}, },
showRuleModal() { showRuleModal() {
this.setData({ this.setData({
ruleModalVisible: true ruleModalVisible: true,
maskVisible:true
}) })
}, },
ruleModalClose() { ruleModalClose() {
this.setData({ this.setData({
ruleModalVisible: false ruleModalVisible: false,
maskVisible:false
}) })
}, },
...@@ -108,16 +111,20 @@ Page({ ...@@ -108,16 +111,20 @@ Page({
color: 'white' color: 'white'
}, },
orderFloor: { orderFloor: {
left: 200 + 'rpx', left: 180 + 'rpx',
top: 40 * (lens-i) + 'rpx', top: 40 * (lens-i) + 'rpx',
position: 'absolute', position: 'absolute',
color: 'white' color: 'white',
width:150+'rpx',
textAlign:'center'
}, },
orderCredits: { orderCredits: {
left: 400 + 'rpx', left: 400 + 'rpx',
top: 40 * (lens-i) + 'rpx', top: 40 * (lens-i) + 'rpx',
position: 'absolute', position: 'absolute',
color: 'white' color: 'white',
width:100+'rpx',
textAlign:'center'
} }
} }
data[i].order = orderStyle; data[i].order = orderStyle;
...@@ -215,7 +222,7 @@ Page({ ...@@ -215,7 +222,7 @@ Page({
onPrizeModalClose(){ onPrizeModalClose(){
this.setData({ this.setData({
prizeVisible: true prizeVisible: false
}) })
}, },
onHandleNoPrizeClose(){ onHandleNoPrizeClose(){
......
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