Skip to content

dev / zhiliang-light-mp

Go to a project
Toggle navigation
Toggle navigation pinning
c9d0d9f3 by simon
Options

默认提交

1 parent 35d4749d master
Inline Side-by-side
Showing 32 changed files with 416 additions and 111 deletions
......@@ -95,8 +95,7 @@ $contentWidth:690px;
@font-face {
font-family: "iconfont";
// src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAScAAsAAAAACWAAAARQAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDSAqFVIRuATYCJAMYCw4ABCAFhG0HVRshCMgOJSGRwABgYAPDUEoeHvd7PTfJSwFAEah6VmX1dTtS08QKyKgZO6MrzNCI9/9/p93MlJPWQetZqTCDwumbgGcyBbEQPyFlu+svwP9zP59X1mB57dlcIpO6qHBnQOMBDSiiLVJ4Axl/1g9uMj9DgoHJYeziMrYT6LVoIdZxQpoAzBRav0A8lEvLwSymU0oooVtZc6YW8R2MdacP2GUA39zvx3/wCTOSJtOGXj2Ir4SoXzYvA/HW/62KaoC2/ixgZpGxBRTiRa7tEdwPbsH1Sn/ByAnQr1tSftk84z7b8oJ5Gfi/BTGR5gr9eipF0vT4z4sKyfoh7izU8MvGRCj84iIkfm1BaPjDIGT+BgpOS1VRlz7cAsQOaPgtstj5d4Rm2sJiwdWa42RrY6ulpEvbeDlLtnAqJzlZk8u4aPEAP3fpSuXt24I7d4R374oNhiJLRB4nmnP7duGSfo5AlMO3tXKFgsnW7QN8sXDxwM42nki8tK3mqIFow/X54sSBO+ECS/w5TujcY2N92Rz53GqTg2ASsDfb2bYDO1l46xNX5PVv4qy63W9wW7KFIH7scBavZFt/chQu3zazYAlvehIBR+Uu3swXr1AmWrKJw5lczhUu3srnL10hZneQz3q7g0dMbgPo8EzXZ6VkJQlEttQOBNR5QVncISGLWroG2VIHRSxo/2/IU1P4BrHLsYrCmEN92IEDGOK+5UARjuM+XO64nNbYV6Wv1xw+6P43+saNYsePY6Nil50laln7B910+c7pbYU5oEojI9iIVbBZ1r9w7vTe3vnzwe/ml+vG+g0bjh3LOf5Fq1W+Hs8G/7d39kaNdr0PNHe39rU+aJrdzQN/k9GLbIudBavigso8bNUCD8vnXpHt2SvHuBru2I2kPb0Ez2yxxi1na+LP1TdyvBG18WcVp2bVxJ3d0jBLpchzG7aoZmJpcMV7ix+w9nlq8tTH3dTXBhoB2tNpCl8EQH6DA7B0MANWH8+SRKFwixEr3/mhfmPufaG81Drsa3dfAbcRm2ZBQT0Z/BVytfm/T0EB2v9GwQqxvhaxvNlBoLpmjPwJvbqLFrpGPe5LNfEewqHbRAhJlwXIui2hCm4LGn12oeq2B702Jc7uM4aGi9KDDV0AwrC9kAz6CdmwK6iCewSNSW+hGg4cenXCfsk+KyEnYmlUzqBKsqKOlEu0GspGhvAyc5C0SlVOR4UuVYRovdxDent4JSOJSIPoPkboq6U+DEORFK1VkwlgN6RSaUkdrVUgCeMhYxhdiKcnlXcjD4lWDYQjNKQcA6lEqlCHJCehpUHZtRlE6vM5EKkqKuXokrISqwhC05M3TvLmwasGKlGmqVV2Lq31qkn5YDAo3ItC01IjJUALotKDWiRdficFRILhQdbCrxPCE1Wi6so8xleor3Id9NLWqZEiR4kmanTpuVMuUe5/U28TiUqrR96mNKI8Ti8zkmnVyBipdUwdAA==') format('woff2'),
src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAacAAsAAAAADLwAAAZPAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCEIAqLFIkkATYCJAMoCxYABCAFhG0HgQMb7QojESaME0P2j4V402Eyc7TfPaKSlPTW5EN42b+ZSdJ0Umy7bn2Stw1O3B6A3SMXJ2D/kdWX8gEkAPx+02rFnXAjTKpce81XT9gPPfCGybaDY6mf1mB53/YuWb1sfhqOBxRdIuMNZAJT2yKeSy8VHOD7aiAAOLJQDaRdh24qZAjAagJ1Y0cVDIHssUBIIBPIeiniSAFkPUTIdAV9CmCd+nnyDeoQGaAQGfCevfzth6OVia8asoAVQH9hQ7A6F4D9cQADUA2AAJD9kZ6dzGSqgYFf/wICJgNwwAYGwYQpmTbTaY4yD5rvfTn1q4aWhf3IuD+BgxwFyBAhgCIeEuIa/ucRCUiTANi52XjABOODDJgSH0TAtPFBAEwnHyhgjpIU0x4ENYpo3wM+xAFfTnWB4SmRguwp0HB0hANAJkBOAzQfGNcNGnLzENDFayZQPAkJmZnJvMWRlmJLqcgT3GnOWa6A34hM8BfUGg268iIHHcNDjl6hzc4R4VXu/Oi2MYWFalGRVlJiFBf3pypdizZNhYX9Iisdqs5vfzjg1NRQ4Mgqt6GFVx0LunQjGpxxs5gXERvp5dBVRc3VRDaHcejDFaowtvecws/Uos+1ki+MYnMABycEoZwDypyk/R41BBo4oqSsOkZYpffc2nvlfsf2wpXFWZGDnB88mm5sU5JXebUth8v1jbjarVKPFGf4gNs4x2A9st/hCG1xauFDbnd0q6GU0EqCR108dBgocYCh7CvpeK8oV4ri1hG3Hq2QtPKwB5yH1NBpT5bf7me4o24FPLht3PmXGTte1b/0Jnvn6/HO+nP04X51xHCtYIThnzHM8kCRhsCJ8tWLSgymk0OnmHTs1uErI4QoCISMlovNepsP99UVzQFOot1NHa3A9x/u6konOHGN8/rjFXBDr6olGpVVzVH52VuRl+W79Oqk6in+oyPg7953cLtrGvFHd45I8V/VCSxrLystZXuJUIj4EKfo2gp69iwF5YqNCBSbEud7W7xbjDMZC+Uc6+q18WO15tZtt57GYnQ9EQohP8NMcmZ11sQ+6d2D/fIwlq5bRy3lWBDCWev3q1Rm+fIqVVBvyN+Z+2bv3XvrVl7s1wnkPL/FfMhhvruCJAr3hLuSdFdwVBIacE8Sy4gnT06l+6J+sOhUq/VLfmgYn51cN/kqc2bHN3Svsf6xklCj6vZ2jQajvbZXrZH4Ra2WC33bNjjHOzfIfSfXrKWaKXTuwfsz2j+YPdeh95nZ/v7oO+VntLt/cE75saOjgsUHx5YD15xMVlnpquQ6H0kf1VFr1bWh8oCqy3wdN2xg9mUlmxY9dUbqPOrPQWvSBSH3pbcGHrHdzSryPKdlmd4H1La9RhZ+Km/ccjd2LTHhWiz2JCHxSXVsEddarqFlvm348HV4RPF1QM9NoVu30ik+X7Bj2RneQ328rvddlVzPRG+fqDyjQ1lfEL3YlK1bB39XSZwupbZJlfxK+262Zak199UkMxp5K3XNq3twf5MWk+uUb1QwjmMy+LhGI8u1ndSiyfnWmV0moyMdtnjxMEKEsCcZho5dJ0/+qaBSwfPPOnW6RjVPweS/HnDNPVsJroIFMQCw7tJSVh0AWODH1cx0WgxYMUbO1wqwTrFXzAdYCwTChgLWBwpZi7qK/camqbYl6Ub8L7dCtT2Z+YOSm/0mK7/VZW/f+bTaRlK8dhoAGfR7pcW/kF0AYFmC/CDHVi5cxsdkf/bsaCjA19YETpYA/71AKj6o2uD8quYIZDgdoIhDJjDIKIcUsNWUIthQD0CCjJbAURUdj1dgx2QwECEeQBUssYDAhlNAkYRbwGDDM6SAfR9EuPAdSLARBhw6sZ9RQYWRxL+8MZRgT8uZvC6roXZ50fXfsFtS7JYryj+4+ThN/ejPf2EFV7FPO9hZxJDhkunTuh5SKlS5BGjpnUjdDYOJukevS756wRtDCfaE5SwEvS6r6S8vge//ht2S4oQRr4L/4OZXT5jQY8yA/NKsmUbsSms72BmCXIZYL5dM+EQuJJIphBq9WYCWHq5Aqu4woJlMVk3fvC6vbfkvexR8MCeUMCIQkUgkjsgk/hdYhuehSsdlWHN60Kk0TI8MQz+nuTtXMh5Pfr1gtffIVc73xy357XVRDcmv6FJv1NXTffLWydUV') format('woff2');
src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
}
.iconfont {
......@@ -116,6 +115,10 @@ $contentWidth:690px;
content: "\e615";
}
.iconSeckill:before {
content: "\e8cd";
}
.iconrefresh:before {
content: "\e874";
}
......@@ -124,6 +127,10 @@ $contentWidth:690px;
content: "\e610";
}
.iconpaimai:before {
content: "\e63b";
}
.iconxinzeng:before {
content: "\e606";
}
......@@ -136,6 +143,10 @@ $contentWidth:690px;
content: "\e6dc";
}
.iconmiaosha:before {
content: "\e61d";
}
.iconbaseline-close-px:before {
content: "\e600";
}
......@@ -146,7 +157,6 @@ $contentWidth:690px;
.drop-down-item :last-child {
border-bottom: none;
}
......
......@@ -35,7 +35,7 @@ Component({
},
getUserInfo(e) {
let _this = this;
app.globalData.userInfo = e.userInfo;
// app.globalData.userInfo = e.userInfo;
app.post({
url: app.api.register,
sid: false,
......@@ -52,7 +52,27 @@ Component({
}
_this.hideMask();
_this.authComplete();
_this.initPage();
}).catch((err) => {})
},
/**
* 尝试重拉信息
*/
initPage() {
let pages = getCurrentPages();
let view = pages[pages.length - 1];
console.log("@authorize-comp view:", view);
if (view) {
try {
view.hideMask();
console.log("@authorize-comp || hideMask");
} catch (error) {}
try {
view.initData();
console.log("@authorize-comp || initData");
} catch (error) {}
}
}
}
})
......
......@@ -54,7 +54,11 @@
.btn {
@include cb(240px, 80px);
margin: 0 24px;
}
.btn2 {
@include cb2(240px, 80px);
}
}
......
......@@ -11,7 +11,7 @@
</view>
<view class="btn-wrap">
<!-- <button class="btn gray" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button> -->
<button class="btn gray" bindtap="hideMask">暂不授权</button>
<button class="btn btn2" bindtap="hideMask">暂不授权</button>
<button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">确认授权</button>
</view>
</view>
......
......@@ -50,7 +50,7 @@ module.exports = {
seckillDetail: '/seckill/detail', // post 秒杀详情
member: '/member', // post 秒杀收件人信息获取
seckillSubmit: '/seckill/submit', // post 提交秒杀订单
seckillMine: '/seckill/member', // post 我的秒杀产品
seckillMine: '/seckill/order', // post 我的秒杀产品
areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询
......
......@@ -146,8 +146,30 @@ Page({
this.setData({
checked: event.detail,
});
}
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -85,8 +85,28 @@ Page({
}
}
})
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
// app.globalData.addressEditInfo = curData;
// console.log("def:", curData);
}
default:
break;
}
},
})
......
......@@ -84,14 +84,11 @@ $contentWidth:690px;
.t2 {
margin-top: 8px;
// font-size: 24px;
// color: #999999;
}
.t3 {
font-size: 20px;
color: #999999;
// color: #3680EB;
}
}
......
......@@ -10,7 +10,7 @@
<view bindtap="onShowAuctionMineHandler" class="btn">我的拍卖</view>
</view>
<view class="list">
<view wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
<view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
<view class="prize">
<image class="image" mode="aspectFill" src="{{item.auctionImages && item.auctionImages[0] || ''}}" />
</view>
......@@ -23,15 +23,9 @@
<view class="tt t3">{{item.dateStr}}</view>
</view>
</view>
<view bindtap="onDetailHandler" wx:if="{{item.status == 0}}" data-data="{{item}}" data-index="{{index}}" class="btn btn0">
未开始
</view>
<view bindtap="onDetailHandler" wx:if="{{item.status == 1}}" data-data="{{item}}" data-index="{{index}}" class="btn btn1">
进行中
</view>
<view bindtap="onDetailHandler" wx:if="{{item.status == 2}}" data-data="{{item}}" data-index="{{index}}" class="btn btn2">
已结束
</view>
<view wx:if="{{item.status == 0}}" class="btn btn0">未开始</view>
<view wx:if="{{item.status == 1}}" class="btn btn1">进行中</view>
<view wx:if="{{item.status == 2}}" class="btn btn2">已结束</view>
</view>
</view>
</view>
......
......@@ -4,6 +4,8 @@
$contentWidth:690px;
.page {
padding-bottom: $pageBottom;
.bgc {
background-color: #f8f8f8;
}
......@@ -50,13 +52,13 @@ $contentWidth:690px;
flex: 1;
// padding: 0 0 0 16px;
@extend .bb;
height: 220px;
// height: 220px;
.up {}
.down {
position: absolute;
bottom: 0;
// position: absolute;
// bottom: 0;
}
......@@ -68,13 +70,13 @@ $contentWidth:690px;
.t2 {
font-size: 26px;
margin-top: 4px;
// margin-top: 4px;
}
.t3 {
font-size: 26px;
font-weight: bold;
margin-top: 0px;
// margin-top: 0px;
}
.t4 {
......@@ -82,9 +84,13 @@ $contentWidth:690px;
margin-top: 2px;
color: #666666;
}
.sp2{
margin-top: 8px;
}
.sp4 {
margin-top: 24px;
margin-top: 12px;
}
}
......
......@@ -14,7 +14,7 @@
<view class="cont">
<view class="up">
<view class="tt t1">{{item.auctionName}}</view>
<view class="tt t2">原价：{{filter.Fen2Yuan(item.originalPrice)}}元</view>
<view class="tt t2 sp2">原价：{{filter.Fen2Yuan(item.originalPrice)}}元</view>
<view class="tt t3 price">竞拍价格：{{filter.Fen2Yuan(item.auctionPrice)}}元</view>
</view>
<view class="down">
......
......@@ -28,7 +28,7 @@ Page({
},
getUserInfo(e) {
let _this = this;
app.globalData.userInfo = e.userInfo;
// app.globalData.userInfo = e.userInfo;
// console.log("loginData:",_this.data.loginData);
app.post({
url: app.api.register,
......
......@@ -252,6 +252,7 @@ Page({
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
commonTipsCompVisible: false
})
},
......@@ -263,6 +264,10 @@ Page({
} = evt.detail;
switch (name) {
case "_evt_hide_mask":
this.hideMask();
break;
case "_evt_common_comp_button":
this.hideMask();
wx.navigateBack({
......
......@@ -62,5 +62,29 @@ Page({
})
resolve();
});
}
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -182,7 +182,11 @@ Page({
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
// 隐藏弹窗
case "_evt_common_comp_button":
this.hideMask();
switch (data.cid) {
......
......@@ -20,6 +20,15 @@ Page({
})
},
onLoad(options) {
},
onShow() {
console.log("@gift-shop || onShow")
this.hideMask();
this.initData();
},
initData() {
this.resetPage();
this.queryProduct();
},
// 到达底部
......@@ -42,6 +51,7 @@ Page({
* 请求产品
*/
queryProduct() {
console.log("queryProduct");
return new Promise((resolve, reject) => {
app.post({
sid: false,
......@@ -137,15 +147,20 @@ Page({
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
// 隐藏弹窗
case "_evt_common_comp_button":
this.hideMask();
break;
// 授权完毕
// 授权完毕
case "_evt_auth_complete":
this.resetPage();
this.queryProduct();
// this.resetPage();
// this.queryProduct();
// this.initData();
break;
default:
......
......@@ -55,8 +55,9 @@ Page({
},
onShow() {
console.log("onShow memberCode:", this.data.memberCode);
console.log("onShow code:", this.data.code);
this.hideMask();
// console.log("onShow memberCode:", this.data.memberCode);
// console.log("onShow code:", this.data.code);
},
initData() {
......@@ -307,8 +308,8 @@ Page({
hideMask() {
this.setData({
productDetailVisible: false,
authorizeVisible: false,
productDetailVisible: false,
})
},
// 子组件事件
......@@ -319,6 +320,10 @@ Page({
} = evt.detail;
switch (name) {
case "_evt_hide_mask":
this.hideMask();
break;
case "_evt_hide_product_detail_mask":
this.hideMask();
break;
......
......@@ -252,5 +252,29 @@ Page({
})
this.resetPage();
this.queryPointsOverview();
}
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -148,5 +148,29 @@ Page({
})
})
});
}
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -132,6 +132,30 @@ Page({
})
this.resetPage();
this.queryOrder();
}
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -241,5 +241,28 @@ Page({
return size;
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -43,7 +43,7 @@ Page({
}
}).then((result) => {
let rankInfo = this.formatRankInfo(result, status);
if(rankInfo){
if (rankInfo) {
this.setData({
rankInfo: rankInfo
})
......@@ -87,7 +87,7 @@ Page({
*/
formatRankInfo(val, status) {
let rankInfo = val;
if(!rankInfo) return;
if (!rankInfo) return;
if (status == "promotion") {
rankInfo.myMember.rank = rankInfo.myMember.promotionNo;
rankInfo.myMember.points = rankInfo.myMember.promotionPoints;
......@@ -207,5 +207,29 @@ Page({
// 滚动到底部 分页加载
onRankScrolltolower(e) {
}
},
// 隐藏蒙层
hideMask() {
this.setData({
authorizeVisible: false,
})
},
// 子组件事件
evtcomp(evt) {
let {
name,
data
} = evt.detail;
switch (name) {
// 隐藏弹窗
case "_evt_hide_mask":
this.hideMask();
break;
default:
break;
}
},
})
......
......@@ -156,7 +156,11 @@ Page({
} = evt.detail;
switch (name) {
// 授权完毕
case "_evt_hide_mask":
this.hideMask();
break;
// 授权完毕
case "_evt_auth_complete":
this.initData();
this.hideMask();
......
......@@ -5,12 +5,12 @@
<view class="app__content main">
<view class="top-space"></view>
<view class="content">
<!-- 我的拍卖按钮 -->
<!-- 我的秒杀按钮 -->
<view class="my-btn">
<view bindtap="onShowSeckillMineHandler" class="btn">我的秒杀</view>
</view>
<view class="list">
<view wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
<view bindtap="onDetailHandler" data-data="{{item}}" data-index="{{index}}" wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
<view class="prize">
<image class="image" mode="aspectFill" src="{{item.seckillImages && item.seckillImages[0] || ''}}" />
</view>
......@@ -23,15 +23,9 @@
<view class="tt t3">{{item.dateStr}}</view>
</view>
</view>
<view bindtap="onDetailHandler" wx:if="{{item.status == 0}}" data-data="{{item}}" data-index="{{index}}" class="btn btn0">
未开始
</view>
<view bindtap="onDetailHandler" wx:if="{{item.status == 1}}" data-data="{{item}}" data-index="{{index}}" class="btn btn1">
进行中
</view>
<view bindtap="onDetailHandler" wx:if="{{item.status == 2}}" data-data="{{item}}" data-index="{{index}}" class="btn btn2">
已结束
</view>
<view wx:if="{{item.status == 0}}" class="btn btn0">未开始</view>
<view wx:if="{{item.status == 1}}" class="btn btn1">进行中</view>
<view wx:if="{{item.status == 2}}" class="btn btn2">已结束</view>
</view>
</view>
</view>
......
......@@ -28,7 +28,7 @@ Page({
this.initData();
},
initData() {
this.queryAuctionList();
this.querySeckillList();
},
// 到达底部
......@@ -37,7 +37,7 @@ Page({
this.setData({
page: this.data.page + 1
});
this.queryAuctionList();
this.querySeckillList();
}
},
......@@ -50,10 +50,11 @@ Page({
},
// 拍卖列表
queryAuctionList() {
querySeckillList() {
console.log("app.api.seckillMine:",app.api.seckillMine)
return new Promise((resolve, reject) => {
app.post({
url: app.api.auctionMine,
url: app.api.seckillMine,
data: {
page: this.data.page,
size: this.data.size,
......@@ -62,12 +63,9 @@ Page({
if (!result) return;
if (!result.list) return;
let dataList = result.list;
dataList.forEach(element => {
element.dateStr = new Date(element.startTime).toString("yyyy.MM.dd hh:mm") + " - " + new Date(element.endTime).toString("yyyy.MM.dd hh:mm");
});
dataList = this.data.dataList.concat(dataList);
dataList.forEach(element => {
element.recordTime = new Date(element.recordTime).toString("yyyy.MM.dd hh:mm:ss");
element.dateStr = new Date(element.seckillOrderTime).toString("yyyy.MM.dd hh:mm");
});
console.log("dataList:", dataList);
this.setData({
......
{
"navigationBarTitleText": "我的竞拍订单"
"navigationBarTitleText": "我的秒杀订单"
}
......
......@@ -4,6 +4,8 @@
$contentWidth:690px;
.page {
padding-bottom: $pageBottom;
.bgc {
background-color: #f8f8f8;
}
......@@ -12,7 +14,7 @@ $contentWidth:690px;
.main {
.top-space {
height: 0px;
height: 24px;
}
.content {
......@@ -21,7 +23,7 @@ $contentWidth:690px;
// list
.list {
width: $contentWidth;
margin: 24px auto 0;
margin: 0 auto 0;
font-size: 22px;
&-item {
......@@ -34,7 +36,7 @@ $contentWidth:690px;
.prize {
margin: 0 32px;
border:solid 1PX #F0F0F0;
border: solid 1PX #F0F0F0;
border-radius: 8px;
padding: 16px;
......@@ -50,6 +52,15 @@ $contentWidth:690px;
flex: 1;
// padding: 0 0 0 16px;
@extend .bb;
// height: 220px;
.up {}
.down {
// position: absolute;
// bottom: 0;
}
.tt {}
......@@ -59,23 +70,25 @@ $contentWidth:690px;
.t2 {
font-size: 26px;
margin-top: 8px;
}
.t3 {
font-size: 26px;
font-weight: bold;
margin-top: 4px;
}
.t4 {
font-size: 22px;
margin-top: 4px;
margin-top: 2px;
color: #666666;
}
.sp4{
margin-top: 24px;
.sp2{
margin-top: 8px;
}
.sp4 {
margin-top: 12px;
}
}
......
......@@ -9,14 +9,19 @@
<view class="list">
<view wx:for="{{dataList}}" wx:key="{{index}}" class="border list-item">
<view class="prize">
<image class="image" mode="aspectFill" src="{{item.auctionImage && item.auctionImage[0] || ''}}" />
<image class="image" mode="aspectFill" src="{{item.seckillImages && item.seckillImages[0] || ''}}" />
</view>
<view class="cont">
<view class="tt t1">{{item.auctionName}}</view>
<view class="tt t2">原价：{{filter.Fen2Yuan(item.originalPrice)}}元</view>
<view class="tt t3 price">竞拍价格：{{filter.Fen2Yuan(item.auctionPrice)}}元</view>
<view class="tt t4 sp4">订单编号：A20191008103818293X</view>
<view class="tt t4">竞拍时间：{{item.auctionTime}}</view>
<view class="up">
<view class="tt t1">{{item.seckillName}}</view>
<view class="tt t2 sp2">数量：{{item.num}}</view>
<view class="tt t3 price">总价格：{{filter.Fen2Yuan(item.totalAmount)}}元</view>
</view>
<view class="down">
<view class="tt t4 sp4">订单编号：{{item.seckillOrderCode}}</view>
<view class="tt t4">竞拍时间：{{item.dateStr}}</view>
<view class="tt t4">备注：{{item.remark}}</view>
</view>
</view>
</view>
</view>
......
......@@ -24,8 +24,8 @@ Page({
})
},
onShow() {
this.hideMask();
this.initData();
},
onLoad(options) {
// app.router.push({
......@@ -191,6 +191,24 @@ Page({
},
/**
* 点击拍卖
*/
onAuctionHandler(evt) {
app.router.push({
path: "auctionList"
})
},
/**
* 点击秒杀
*/
onSeckillHandler(evt) {
app.router.push({
path: "seckillList"
})
},
/**
* 获取会员信息
*/
queryMember() {
......@@ -202,6 +220,7 @@ Page({
this.setData({
userInfo: result
})
app.globalData.userInfo = result;
resolve(result);
})
});
......
......@@ -257,31 +257,7 @@ $contentWidth: 690px;
}
}
// 订单区域
.order {
display: flex;
justify-content: space-between;
font-size: 24px;
color: #131415;
text-align: center;
&-item {
width: 110px;
.icon-wrap {
@extend .fcc;
height: 100px;
height: 100px;
.icon {
height: 64px;
height: 64px;
}
}
.txt {}
}
}
// 功能区
.func {
......@@ -315,8 +291,6 @@ $contentWidth: 690px;
width: 132px;
position: relative;
.icon-wrap {
position: relative;
@extend .fcc;
......@@ -347,6 +321,36 @@ $contentWidth: 690px;
}
// 活动区域
.active {
font-size: 24px;
color: #333333;
text-align: center;
margin: 40px 0 4px;
display: flex;
justify-content: space-between;
// justify-content: flex-start;
&-item {
width: 132px;
position: relative;
.icon-wrap {
@extend .fcc;
height: 100px;
.icon {
color: #333333;
font-size: 64px;
}
}
.txt {}
}
}
}
}
}
......
......@@ -97,6 +97,28 @@
</view>
</view>
</view>
<view class="border active ">
<view bindtap="onAuctionHandler" data-index="0" class="active-item">
<view class="icon-wrap">
<span class="iconfont iconpaimai icon"></span>
</view>
<view class="txt">拍卖</view>
</view>
<view bindtap="onSeckillHandler" data-index="1" class="active-item">
<view class="icon-wrap">
<span class="iconfont iconmiaosha icon"></span>
</view>
<view class="txt">秒杀</view>
</view>
<view data-index="2" class="active-item">
<view class="icon-wrap"></view>
<view class="txt"></view>
</view>
<view data-index="3" class="active-item">
<view class="icon-wrap"></view>
<view class="txt"></view>
</view>
</view>
</view>
</view>
</view>
......
......@@ -428,9 +428,9 @@ Page({
hideMask() {
// this.setData({
// productDetailVisible: false
// })
this.setData({
authorizeVisible: false
})
},
// 子组件事件
evtcomp(evt) {
......@@ -441,6 +441,7 @@ Page({
switch (name) {
case "_evt_hide_mask":
this.hideMask();
break;
default:
......