Skip to content

H
hello_taobao
Commit 8423db20 authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

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

parents b3cfab8b f9d22f5c
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 32 deletions
dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.acss
View file @ 8423db20
......@@ -52,7 +52,8 @@
}
.gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .list {
width: 453rpx;
/* width: 453rpx; */
width: 500rpx;
height: 383rpx;
opacity: 1;
top: 150rpx;
......@@ -76,12 +77,13 @@
*/
.gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .list .zu13434 {
width: 453rpx;
width: 500rpx;
height: 183rpx;
opacity: 1;
top: 10rpx;
position: absolute;
}
.gou_mai_ji_lu32 .gou_mai_ji_lu_kao_bei33 .zu135 .zu13434 .tu_ceng09_yue15_ri43 {
width: 101rpx;
height: 21rpx;
......
dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.axml
View file @ 8423db20
......@@ -3,13 +3,13 @@
<image class="zu139123" src={{resList['7b5dab10-64dd-462c-bf41-3699e0df9a9e'].url}} />
<view class="gou_mai_ji_lu_kao_bei33">
<image class="zu7" src={{resList['ae013a3c-875a-461d-9273-1f58dd01eca2'].url}} />
<image class="yuan_jiao_ju_xing71744" src={{resList['1a960b92-d4b6-40fe-8e31-9658a5d904ec'].url}} />
<!-- <image class="yuan_jiao_ju_xing71744" src={{resList['1a960b92-d4b6-40fe-8e31-9658a5d904ec'].url}} /> -->
<view class="zu135">
<view class="list" a:if="{{orderList != null}}">
<view class="zu13434" 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>
<label class="day1" style="{{item.order.orderDay}}">{{item.monthDate}}</label>
<label class="floor1" style="{{item.order.orderFloor}}">{{item.floorRange}}</label>
<label class="credits1" style="{{item.order.orderCredits}}">{{item.credits}}</label>
</view>
</view>
<view class="no_order" a:elif="{{orderList == null}}">暂无购买记录</view>
......
dist/components/comhui_yuan/comhui_yuan.acss
View file @ 8423db20
......@@ -41,24 +41,38 @@
position: absolute;
}
.hui_yuan .hui_yuan_deng_ji .zhu_ce_hui_yuan .gou_maixxx_ge_lou_ceng_yi_gong_xu_yao_hua_feixxxx_ji_fen22 {
width: 376rpx;
height: 91rpx;
width: 500rpx;
height: 60rpx;
opacity: 1;
left: 113rpx;
left: 50rpx;
top: 159rpx;
position: absolute;
font-size: 22.39614rpx;
font-size: 36rpx;
color: #ffa93a;
text-align: center;
}
.hui_yuan .hui_yuan_deng_ji .zhu_ce_hui_yuan .cost {
width: 500rpx;
height: 60rpx;
opacity: 1;
left: 50rpx;
top: 210rpx;
position: absolute;
font-size: 36rpx;
color: #ffa93a;
text-align: center;
}
.hui_yuan .hui_yuan_deng_ji .zhu_ce_hui_yuan .ps_mei_ceng_lou50_ji_fen {
width: 192rpx;
height: 25rpx;
width: 500rpx;
height: 40rpx;
opacity: 1;
left: 205rpx;
left: 65rpx;
top: 271rpx;
position: absolute;
font-size: 14.93076rpx;
font-size: 24rpx;
color: #ffa93a;
text-align: center;
}
.hui_yuan .hui_yuan_deng_ji .lan_qia_hui_yuan {
width: 670rpx;
......
dist/components/comhui_yuan/comhui_yuan.axml
View file @ 8423db20
......@@ -2,18 +2,17 @@
<image class="cha_cha4582" onTap="onOrderNowModalClose" src={{resList['b8bc26de-51ac-457f-bd3f-348e7df0af34'].url}} />
<view class="hui_yuan_deng_ji">
<view class="zhu_ce_hui_yuan">
<!-- <image class="bei_jing1" src={{resList['26ff41d0-0891-4573-a557-1a0bb7881405'].url}} /> -->
<!--<image class="bei_jing1" src={{resList['26ff41d0-0891-4573-a557-1a0bb7881405'].url}} /> -->
<image class="bei_jing5" a:if="{{vipCredits.grade == 5}}" src={{resList['c46f1953-53df-4fdd-aaab-b5e8252b84ce'].url}} />
<image class="bei_jing4" a:else src={{resList['fcb78ed4-6a1a-4a00-9a63-14359b9c44ae'].url}} />
<!-- <image class="zu012" src={{resList['948928c1-e583-449d-baca-77db2e213fe1'].url}} /> -->
<!--<image class="zu012" src={{resList['948928c1-e583-449d-baca-77db2e213fe1'].url}} /> -->
<!-- 会员标签 -->
<label class="grade_name">您是{{vipCredits.gradeName}}</label>
<label class="gou_maixxx_ge_lou_ceng_yi_gong_xu_yao_hua_feixxxx_ji_fen22">
购买 {{vipCredits.canBuyFloor}} 个楼层 一共需要花费 {{vipCredits.gradeCredits * vipCredits.canBuyFloor}} 积分
购买 {{vipCredits.canBuyFloor}} 个楼层
</label>
<label class="ps_mei_ceng_lou50_ji_fen">(PS:每层楼50积分)</label>
<label class="cost">一共需要花费 {{vipCredits.gradeCredits * vipCredits.canBuyFloor}} 积分</label>
<label class="ps_mei_ceng_lou50_ji_fen">(PS:每层楼{{vipCredits.gradeCredits}}积分)</label>
</view>
<!--<view class="lan_qia_hui_yuan"><image class="bei_jing2" src={{resList['1d470c7d-b99b-4fe1-a78e-319c6113a4f1'].url}} /><image class="zu723" src={{resList['491038ac-7976-4827-855c-c6693713e94d'].url}} /><label class="gou_maixxx_ge_lou_ceng_yi_gong_xu_yao_hua_feixxxx_ji_fen_kao_bei">
购买 XXX 个楼层 一共需要花费 XXXX 积分</label><label class="ps_mei_ceng_lou40_ji_fen">(PS:每层楼40积分)</label></view><view class="hong_qia_hui_yuan"><image class="bei_jing3" src={{resList['dddf56e4-6008-4b88-8210-c1a3b27e9f5d'].url}} /><image class="zu126834" src={{resList['157eceb5-639a-4d55-b237-3537a103254b'].url}} /><label class="gou_maixxx_ge_lou_ceng_yi_gong_xu_yao_hua_feixxxx_ji_fen_kao_bei2">
......
dist/components/comhui_yuan/comhui_yuan.js
View file @ 8423db20
......@@ -41,17 +41,19 @@ Component({
this.setData({
enableTap: true
})
this.onOrderNowModalClose();
this.props.onUserCredit();
commonToast(resp.message);
setTimeout(() => {
this.onOrderNowModalClose();
commonToast(resp.message);
}, 500);
}else{
commonToast(resp.message)
}
},(rej)=>{
this.onOrderNowModalClose();
this.props.onUserCredit();
commonToast(rej.message);
// this.props.onUserCredit();
commonToast(rej.message);
})
......
dist/components/comyou_xi_gui_ze27/comyou_xi_gui_ze27.axml
View file @ 8423db20
......@@ -3,7 +3,7 @@
<image class="zu13974" src={{resList['7b5dab10-64dd-462c-bf41-3699e0df9a9e'].url}} />
<view class="gou_mai_ji_lu_kao_bei28">
<image class="ju_xing705_kao_bei31" src={{resList['034783f1-bea0-4475-9103-5c579bc36c9b'].url}} />
<image class="yuan_jiao_ju_xing71730" src={{resList['1a960b92-d4b6-40fe-8e31-9658a5d904ec'].url}} />
<!-- <image class="yuan_jiao_ju_xing71730" src={{resList['1a960b92-d4b6-40fe-8e31-9658a5d904ec'].url}} /> -->
<label class="wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen_an_wen">
<!-- 文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案 -->
<slot />
......
dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml
View file @ 8423db20
......@@ -32,8 +32,8 @@
<!-- bianli -->
<image style="width:100rpx;height:100rpx;display:block;marginLeft:25rpx" src={{item.image}}></image>
<!-- <view style="width:100rpx;height:100rpx;background:white;marginLeft:25rpx"></view> -->
<view style="fontSize:22rpx">{{totalFloor}}*{{item.probability}}楼层</view>
<label style="fontSize:22rpx">{{item.name}}</label>
<view style="fontSize:22rpx;marginTop:10rpx">N*{{item.probability}}楼层</view>
<label style="fontSize:22rpx;height:40rpx;width:128rpx;overflow:hidden;letter-spacing:-1rpx;text-overflow:ellipsis;white-space:nowrap">{{item.name}}</label>
</view>
</view>
......
dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js
View file @ 8423db20
......@@ -374,19 +374,23 @@ Page({
left: 0,
top: 40 * (lens-i) + 'rpx',
position: 'absolute',
color: 'white'
color: 'white',
},
orderFloor: {
left: 200 + 'rpx',
left: 180 + 'rpx',
top: 40 * (lens-i) + 'rpx',
position: 'absolute',
color: 'white'
color: 'white',
width:150+'rpx',
textAlign:'center'
},
orderCredits: {
left: 400 + 'rpx',
top: 40 * (lens-i) + 'rpx',
position: 'absolute',
color: 'white'
color: 'white',
width:100+'rpx',
textAlign:'center'
}
}
data[i].order = orderStyle;
......
dist/pages/pagejie_shu_ye/pagejie_shu_ye.axml
View file @ 8423db20
......@@ -40,7 +40,7 @@
<!-- 购买记录组件 -->
<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}} />
<!-- <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>
......
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