xt / xcx-book · Commits

Go to a project

Commit 48492ec92b6d7d7836fef5c29d0a45dc5db0ea5f

Authored by wangfan
1 parent 7eac5b19
build: skipped

v2 list

Inline Side-by-side
Showing 8 changed files with 73 additions and 79 deletions
... ... @@ -37,7 +37,7 @@ Component({
if(this.data.detail && this.data.detail.rdate){
this.setData({
rdateStr:util.unixtoTime(this.data.detail.rdate,'MM月DD日 HH:II'),
tableSubInfo:this.data.detail.tableFirst+' '+this.data.detail.tableSubInfo,
tableSubInfo:(this.data.detail.tableFirst||'')+' '+(this.data.detail.tableSubInfo||''),
})
}
}
... ...
... ... @@ -15,6 +15,7 @@
class="share-but-view">
<view class="share-but Regular">邀请同行的朋友</view>
</userinfo-share>
<view style="height: 40rpx;"></view>
<card seller="{{detail.seller}}" detail="{{detail}}"></card>
<view class="detail-info Medium" style="margin-top: 56rpx;">
<view class="flex-lr">
... ...
... ... @@ -8,14 +8,9 @@ Page({
* 页面的初始数据
*/
data: {
tabFlag:0,
list:[{
success:[],
padding:[]
},{
success:[],
padding:[]
}]
success:[],
padding:[],
total:0,
},
/**
... ... @@ -58,23 +53,27 @@ Page({
openid:getApp().openid,
}).then(res => {
let data=this.formatList(res.data);
let list=this.data.list;
list[this.data.tabFlag]=data;
this.setData({
list:list
success:data.success,
padding:data.padding,
total:res.data.success.length+res.data.padding.length
})
})
},
_formatList(list){
if(!list) return [];
if(!list) return {};
let dlist={};
if(list.length>0){
let openid=getApp().openid;
list.forEach(row=>{
row.rdateStr=util.unixtoTime(row.rdate,'MM月DD日 WW HH:II');
row.navigator=row.openid==openid?'detail_owner':'detail_customer'
row.navigator=row.openid==openid?'detail_owner':'detail_customer';
let d=util.unixtoTime(row.rdate,'MM月DD日 DAY 星期WW');
typeof dlist[d]=='undefined'?dlist[d]=[]:'';
dlist[d].push(row);
})
}
return list;
return dlist;
},
formatList(res){
res.success=this._formatList(res.success);
... ...
... ... @@ -5,6 +5,7 @@
"usingComponents": {
"userinfo": "/components/userinfo/userinfo",
"formids":"/components/formids/formids",
"nav":"/components/nav/nav"
"nav":"/components/nav/nav",
"card":"/components/seller-card/seller-card"
}
}
\ No newline at end of file
... ...
<!--pages/customer/list.wxml-->
<nav hasHome>订个座儿</nav>
<view class="page">
<!--
<view class="tabs flex-cc">
<view class="item {{0==tabFlag?'active':''}}"
bindtap="switchTab" data-index="0">我的日程</view>
... ... @@ -8,53 +9,37 @@
<view class="item {{1==tabFlag?'active':''}}"
bindtap="switchTab" data-index="1">我的订座</view>
</view>
<block wx:for="{{list}}" wx:key="list.key" wx:for-item="parts" wx:for-index="tabindex">
<block wx:if="{{parts.success.length>0 || parts.padding.length>0}}">
<block wx:for="{{parts}}" wx:key="partskey" wx:for-item="part" wx:for-index="partIndex">
<view class="list-content" wx:if="{{tabindex==tabFlag && part.length>0}}">
<view class="cate-class">{{partIndex=='success'?'即将开始':'待处理'}}<text>({{part.length}}条)</text></view>
<block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail">
<view class="card" style="width: 100%;">
<navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
<view class="bottom">
<view class="rdateStr Medium">{{detail.rdateStr}}</view>
<view class="seller flex-lr" bindtap="lookLocation">
<view class="seller-info">
<view class="name Medium">{{detail.seller.sellername}}</view>
<view class="addr">{{detail.seller.map_address}}</view>
</view>
<image src="http://qn.colorcun.com/custom/lite-yd/image/success.png"
style="width:160rpx;height: 94rpx;"
wx:if="{{tabFlag==1}}"></image>
</view>
</view>
</navigator>
<view class="top">
<view class="customers flex-ll" wx:if="{{detail.customers.length>0}}">
<block wx:for="{{detail.customers}}">
<image src="{{item.headimgurl}}" wx:if="{{index<5}}"></image>
</block>
<view>等{{detail.customers.length}}人已参加</view>
</view>
<view class="flex-lr">
<view class="title">{{detail.topic?'#'+detail.topic+'#':''}}</view>
<userinfo binduserinfo="userinfo"
class="share-but-view" data-id="{{detail.id}}" data-type="{{partIndex}}">
<view class="share-but{{partIndex=='success'?'':'-write'}} Regular">{{partIndex=='success'?'邀请':'接受'}}</view>
</userinfo>
</view>
</view>
</view>
</block>
</view>
</block>
-->
<block wx:if="{{total==0}}">
<view wx:if="{{tabindex==tabFlag}}" class="flex-vc empry">
<image src="http://qn.colorcun.com/custom/lite/image/empty-order.png"></image>
<view class="Medium">{{0==tabFlag?'暂无日程':'暂无订座'}}</view>
</view>
</block>
<block wx:else="">
<block wx:for="{{success}}" wx:key="success.key" wx:for-item="part" wx:for-index="dateIndex">
<view class="list-content" wx:if="{{part.length>0}}">
<view class="cate-class" style="margin-bottom: 40rpx;margin-left: 44rpx;">{{dateIndex}}</view>
<block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail">
<navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
<view class="card">
<card seller="{{detail.seller}}" detail="{{detail}}"></card>
</view>
</navigator>
</block>
</view>
</block>
<block wx:else>
<view wx:if="{{tabindex==tabFlag}}" class="flex-vc empry">
<image src="http://qn.colorcun.com/custom/lite/image/empty-order.png"></image>
<view class="Medium">{{0==tabFlag?'暂无日程':'暂无订座'}}</view>
<block wx:for="{{padding}}" wx:key="padding.key" wx:for-item="part" wx:for-index="dateIndex">
<view class="list-content" wx:if="{{part.length>0}}">
<view class="cate-class" style="margin-bottom: 26rpx;">待处理<text>({{part.length}}条)</text></view>
<view class="cate-class" style="margin-bottom: 40rpx;margin-top: 0;margin-left: 44rpx;">{{dateIndex}}</view>
<block wx:for="{{part}}" wx:key="part.key" wx:for-item="detail">
<navigator url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
<view class="card">
<card seller="{{detail.seller}}" detail="{{detail}}"></card>
</view>
</navigator>
</block>
</view>
</block>
</block>
... ...
/* pages/customer/list.wxss */
.page{
width: 94%;
margin: 0 3%;
width: 90%;
margin: 30rpx 5% 0;
color:#353535;
}
... ...
... ... @@ -73,7 +73,7 @@
"id": 6,
"name": "pages/customer/index",
"pathName": "pages/customer/index",
"query": "id=17",
"query": "id=21",
"scene": "1044",
"shareInfo": {
"groupName": "测试模拟群1",
... ... @@ -96,13 +96,6 @@
},
{
"id": -1,
"name": "预定本-无参数",
"pathName": "pages/book/b_index",
"query": "",
"scene": "1001"
},
{
"id": -1,
"name": "pages/customer/index 无产进列表",
"pathName": "pages/customer/index",
"query": "",
... ...
... ... @@ -46,15 +46,30 @@ function unixtoTime(ns,format) {
result=result.replace('SS',ss>9?ss:'0'+ss);
var week;
switch (time.getDay()) {
case 0:week="周日";break
case 1:week="周一";break
case 2:week="周二";break
case 3:week="周三";break
case 4:week="周四";break
case 5:week="周五";break
case 6:week="周六";break
case 0:week="日";break
case 1:week="一";break
case 2:week="二";break
case 3:week="三";break
case 4:week="四";break
case 5:week="五";break
case 6:week="六";break
}
result=result.replace('WW',week);
if(format.indexOf('DAY')>0){
var day = new Date();
//day.setDate(day.getDate());//今天
console.log('ns<day.getTime()',ns,day.getTime(),ns<day.getTime())
if(ns<day.getTime()){
result=result.replace('DAY','今天');
}else{
day.setDate(day.getDate() +1);//明天
if(ns<day.getTime()){
result=result.replace('DAY','明天');
}else{
result=result.replace('DAY','');
}
}
}
return result;
}
... ...