|
|
@@ -11,8 +11,8 @@
|
|
|
<swiper current="{{currentTab}}" class="swiper-box" duWration="300" style="height:{{winHeight-31}}px;margin:85rpx 0 0 0;" bindchange="bindChange">
|
|
|
<swiper-item>
|
|
|
<scroll-view scroll-y="true" style="height:100%;">
|
|
|
- <block wx:for='{{todayorders}}'>
|
|
|
- <template is='ordertep' data='{{...item}}'/>
|
|
|
+ <block wx:for='{{todayorders}}' >
|
|
|
+ <template is='waitApproval' data='{{...item}}' />
|
|
|
</block>
|
|
|
</scroll-view>
|
|
|
</swiper-item>
|
|
|
@@ -20,7 +20,7 @@
|
|
|
<swiper-item>
|
|
|
<scroll-view scroll-y="true" style="height:100%;">
|
|
|
<block wx:for='{{weekorders}}'>
|
|
|
- <template is='ordertep' data='{{...item}}'/>
|
|
|
+ <template is='Approvaled' data='{{...item}}'/>
|
|
|
</block>
|
|
|
</scroll-view>
|
|
|
</swiper-item>
|
|
|
@@ -28,15 +28,15 @@
|
|
|
<swiper-item >
|
|
|
<scroll-view scroll-y="true" style="height:100%;">
|
|
|
<block wx:for='{{monthorders}}'>
|
|
|
- <template is='ordertep' data='{{...item}}'/>
|
|
|
+ <template is='waitApproval' data='{{...item}}'/>
|
|
|
</block>
|
|
|
</scroll-view>
|
|
|
</swiper-item>
|
|
|
</swiper>
|
|
|
|
|
|
|
|
|
-<template name='ordertep'>
|
|
|
- <view class='commonHview itemRow' bindtap='approItemClick' >
|
|
|
+<template name='waitApproval'>
|
|
|
+ <view class='commonHview itemRow' bindtap='waitApproItemClick'>
|
|
|
<view><image src='../../img/common_header_boy.png' class='img1'></image></view>
|
|
|
<view class='commonVview itemMsg'>
|
|
|
<view style='font-size:30rpx;margin-top:10rpx;'>陈冠希的积分申报</view>
|
|
|
@@ -45,4 +45,16 @@
|
|
|
<view class='itemStatue_finish'>2018-09-19</view>
|
|
|
</view>
|
|
|
<view class='commonhline' style='height:3rpx;'></view>
|
|
|
+</template>
|
|
|
+
|
|
|
+<template name='Approvaled'>
|
|
|
+ <view class='commonHview itemRow' bindtap='ApprovaledClick'>
|
|
|
+ <view><image src='../../img/common_header_boy.png' class='img1'></image></view>
|
|
|
+ <view class='commonVview itemMsg'>
|
|
|
+ <view style='font-size:30rpx;margin-top:10rpx;'>陈冠希的积分申报</view>
|
|
|
+ <view style='color:#999999;font-size:24rpx;margin-top:20rpx;'>已审批</view>
|
|
|
+ </view>
|
|
|
+ <view class='itemStatue_finish'>2018-09-19</view>
|
|
|
+ </view>
|
|
|
+ <view class='commonhline' style='height:3rpx;'></view>
|
|
|
</template>
|