libo
/
ztb-saas-mini
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

no message

feature/v1.3
xpz2018 5 years ago
parent
a5a751a7a4
commit
4f8d7854a0
8 changed files with 53 additions and 26 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      components/icon/index.wxss
  2. 3
      pages/home/employee-info/index.js
  3. 6
      pages/home/employee-info/index.wxml
  4. 4
      pages/home/employee/index.wxml
  5. 4
      pages/home/index/index.js
  6. 4
      pages/home/index/index.wxml
  7. 23
      pages/process/index/index.js
  8. 33
      pages/process/index/index.wxml

2
components/icon/index.wxss
View File

@ -939,6 +939,8 @@
:host {
display: -webkit-inline-flex;
display: inline-flex;
padding-top: 4rpx;
margin-right: -8rpx;
-webkit-align-items: center;
align-items: center;
-webkit-justify-content: center;

3
pages/home/employee-info/index.js
View File

@ -123,6 +123,9 @@ Scene({
})
},
chooseMember: function(){
if(!this.data.cardNo){
return
}
var that = this
wx.navigateTo({
url: `/pages/home/employee/index?type=1`,

6
pages/home/employee-info/index.wxml
View File

@ -2,7 +2,7 @@
<view slot="content">员工资料</view>
</cu-custom>
<van-notice-bar color="#1989fa" background="#008AFF" left-icon="info-o" text="{{ cardNo ? '选择员工进行绑定' : '点击可以修改员工信息' }}" wx:if="{{form.enterpriseMemberId}}" />
<van-notice-bar color="#1989fa" background="#008AFF" left-icon="info-o" text="{{ cardNo ? '选择员工进行绑定' : '点击可以修改员工信息' }}" wx:if="{{form.enterpriseMemberId || cardNo }}" mode="{{ cardNo ? 'link' : '' }}" bind:click="chooseMember"/>
<van-field value="{{ form.enterpriseMemberId }}" label="员工编号：" disabled wx:if="{{ form.enterpriseMemberId }}" />
<van-field value="{{ form.cardNo }}" label="卡号：" disabled wx:if="{{ cardNo }}"/>
<van-field value="{{ form.enterpriseMemberName || form.applicantName }}" label="员工姓名：" disabled placeholder="请输入员工姓名" bind:input="bindInput" />
@ -22,8 +22,8 @@
<view style="height:32rpx"></view>
<view style="margin-top:20rpx;padding:48rpx 32rpx" wx:if="{{ cardNo }}">
<van-button block type="default" bind:click="chooseMember">选择员工进行绑定</van-button>
<view style="height:36rpx"></view>
<!-- <van-button block type="default" bind:click="chooseMember">选择员工进行绑定</van-button>
<view style="height:36rpx"></view> -->
<van-button block type="info" bind:click="submitForm">保存</van-button>
</view>
<view style="margin-top:20rpx;padding:48rpx 32rpx" wx:elif="{{ form.enterpriseMemberId }}">

4
pages/home/employee/index.wxml
View File

@ -61,7 +61,7 @@
</button>
</view>
<van-overlay show="{{ showEmbedded }}" duration="{{0}}" bind:click="onClickHideEmbedded">
<!-- <van-overlay show="{{ showEmbedded }}" duration="{{0}}" bind:click="onClickHideEmbedded">
<view class="wrapper flex-column" catch:tap="noop">
<view style="position: relative;background-color:white;margin-top:48px">
<van-image use-loading-slot width="525rpx" height="525rpx" src="data:image/png;base64,{{base64}}">
@ -73,6 +73,6 @@
<text class="text-df text-white" style="margin-top:36rpx;text-align:center">为保证企业账户安全，二维码仅在3小时内有效，失效后，可重新生成。</text>
<van-icon name="close" color="white" size="36px" custom-style="margin-top:48px" catch:tap="onClickHideEmbedded" />
</view>
</van-overlay>
</van-overlay> -->
<notification id="qn-notification"/>

4
pages/home/index/index.js
View File

@ -58,7 +58,7 @@ Component({
avatarUrl: util.isEmpty(app.userInfo.avatarUrl) ? '/assets/image/ygImg.png' : app.userInfo.avatarUrl,
userInfo: app.userInfo,
userName: nickname,
height: app.globalData.safeFragmentHeight
height: app.globalData.safeFragmentHeight - 100
})
},
toUserInfo: function(){
@ -69,7 +69,7 @@ Component({
wx.navigateTo({ url: '/pages/setting/authory/index' })
}
},
orderList: function(){
agentList: function(){
wx.navigateTo({ url: '/pages/process/agent-list/index' })
},
tipApply: function(){

4
pages/home/index/index.wxml
View File

@ -64,7 +64,7 @@
<van-cell is-link clickable url="/pages/setting/paper/index">
<view class="flex" slot="title" style="align-items: center">
<van-icon name="records" size="20"/>
<text class="text-sg" style="margin-left:12rpx">纸品管理</text>
<text class="text-sg" style="margin-left:12rpx">废纸品类管理</text>
</view>
</van-cell>
<!-- <van-cell is-link clickable link-type="navigateTo" url="/pages/home/qrcode/index">
@ -76,7 +76,7 @@
<van-cell is-link clickable url="/pages/home/factory-list/index">
<view class="flex" slot="title" style="align-items: center">
<van-icon name="newspaper-o" size="20"/>
<text class="text-sg" style="margin-left:12rpx">纸厂管理</text>
<text class="text-sg" style="margin-left:12rpx">出货渠道管理</text>
</view>
</van-cell>
<van-cell is-link clickable link-type="navigateTo" url="/pages/message/card-list/index">

23
pages/process/index/index.js
View File

@ -20,8 +20,7 @@ Component({
{ status: 1, badge: '', name: '定价', icon: '/assets/image/icon_pricing.png' },
{ status: 2, badge: '', name: '过磅审核', icon: '/assets/image/icon_checking.png' },
{ status: 3, badge: '', name: '待付款', icon: '/assets/image/icon_payment.png' },
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' },
// { status: 5, badge: '', name: '已关闭', icon: '/assets/image/icon_close.png' }
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
],
tabList2: [
{ status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_checking.png' },
@ -53,7 +52,23 @@ Component({
today.setHours(0, 0, 0)
var vdate = [today.getTime(), maxDate]
var vdateString = util.formatDate(new Date(), 'Y-M-D') + '至' + util.formatDate(max, 'Y-M-D')
this.setData({userInfo: app.userInfo, height: app.globalData.safeFragmentHeight - 100, minDate, maxDate, vdate, vdateString })
var height = app.globalData.safeFragmentHeight - 100
if(app.userInfo.type.indexOf('ADMIN') >= 0){
var tabList2 = [
{ status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_checking.png' },
{ status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_checking.png' },
{ status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payment.png' },
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
]
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString, tabList2 })
} else {
var tabList2 = [
{ status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_checking.png' },
{ status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payment.png' },
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
]
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString, tabList2 })
}
event.on('EventMessage', this, this.onEvent)
},
detached: function () {
@ -103,6 +118,8 @@ Component({
wx.navigateTo({ url: '/pages/storage/order-list/index?status=2' })
} else if(e.currentTarget.dataset.status == 4){
wx.navigateTo({ url: '/pages/storage/order-list/index?status=3' })
} else {
wx.navigateTo({ url: '/pages/storage/order-list/index' })
}
},
fetchStatisticsInfo: function(vdate){

33
pages/process/index/index.wxml
View File

@ -18,10 +18,10 @@
<view class="text-black text-sg text-bold">收货统计</view>
<view class="flex flex-center" bindtap="showSheet" style="padding: 2rpx 0rpx">
<view class="text-black text-sm" style="margin-right:8rpx">{{vdateString}}</view>
<van-icon name="arrow-down" />
<!-- <van-icon name="arrow-down" /> -->
</view>
</view>
<view class="flex" style="padding:0rpx 0rpx 24rpx 0rpx">
<view class="flex" style="padding:0rpx 0rpx 24rpx 0rpx" bindtap="orderList">
<view style="flex:1;padding:0rpx 32rpx;margin-right:12rpx">
<view class="flex flex-center" style="justify-content: flex-start">
<view style="height:24rpx;width:6rpx;background:#007AFF"></view>
@ -44,7 +44,7 @@
<view style="padding: 0rpx 28rpx;margin-top:24rpx">
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx 8rpx 28rpx">
<view class="text-black text-sg text-bold">收货订单</view>
<view class="text-black text-sg text-bold">收货管理</view>
<view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="orderList">
<view class="text-gray text-sm" style="margin-right:8rpx">查看全部订单</view>
<van-icon name="arrow" color="#aaa"/>
@ -58,38 +58,44 @@
</view>
</view>
<!-- <view style="padding: 0rpx 28rpx;margin-top:24rpx">
<view style="padding: 0rpx 28rpx;margin-top:24rpx">
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx 24rpx 28rpx">
<view class="text-black text-sg text-bold">出货统计</view>
<view class="flex flex-center">
<view class="text-black text-sm" style="margin-right:8rpx">今日</view>
<van-icon name="arrow-down" />
<!-- <van-icon name="arrow-down" /> -->
</view>
</view>
<view class="flex" style="padding:0rpx 0rpx 24rpx 0rpx">
<view class="flex" style="padding:0rpx 0rpx 24rpx 0rpx" bindtap="outList">
<view style="flex:1;padding:0rpx 32rpx;margin-right:12rpx">
<view class="flex flex-center" style="justify-content: flex-start">
<view style="height:24rpx;width:6rpx;background:#007AFF"></view>
<view class="text-black text-sm" style="margin-left: 12rpx">收货重量</view>
<view class="text-black text-sm" style="margin-left: 12rpx">出货重量</view>
</view>
<view class="text-xxl text-bold" style="margin:12rpx 0rpx">30.000吨</view>
<view class="text-gray text-sm">查看收货详情</view>
<view class="text-gray text-sm">查看出货详情</view>
</view>
<view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx" bindtap="orderList">
<view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx">
<view class="flex flex-center" style="justify-content: flex-start">
<view style="height:24rpx;width:6rpx;background:#FF8413"></view>
<view class="text-black text-sm" style="margin-left: 12rpx">收货金额</view>
<view class="text-black text-sm" style="margin-left: 12rpx">收款金额</view>
</view>
<view class="text-xxl text-bold text-price" style="margin:12rpx 0rpx">10998.23</view>
</view>
</view>
</view>
</view> -->
</view>
<view style="padding: 0rpx 28rpx;margin-top:24rpx">
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx">
<view class="text-black text-sg text-bold" style="padding: 0rpx 28rpx 12rpx 28rpx">出货管理</view>
<view class="flex flex-justify" style="padding: 0rpx 28rpx 8rpx 28rpx">
<view class="text-black text-sg text-bold">出货管理</view>
<view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="outList">
<view class="text-gray text-sm" style="margin-right:8rpx">查看全部订单</view>
<van-icon name="arrow" color="#aaa"/>
</view>
</view>
<van-grid column-num="4" border="{{fasle}}">
<van-grid-item wx:for="{{ tabList2 }}" wx:key="index" data-status="{{item.status}}" bind:click="outList" text="{{item.name}}">
<van-icon slot="icon" name="{{ item.icon }}" size="68rpx" info="{{item.badge}}" />
@ -106,7 +112,7 @@
<view class="flex flex-justify" style="padding: 0rpx 28rpx 24rpx 28rpx">
<view class="text-black text-sg text-bold">千鸟代付额度</view>
<view class="flex flex-center" style="padding:4rpx 0rpx 4rpx 4rpx">
<view class="text-gray text-sm" style="margin-right:8rpx">查看详情</view>
<view class="text-gray text-sm" style="margin-right:8rpx">查看代付详情</view>
<van-icon name="arrow" color="#aaa"/>
</view>
</view>
@ -117,7 +123,6 @@
<view class="text-black text-sm" style="margin-left: 12rpx">剩余代付额度</view>
</view>
<view class="text-xxl text-bold text-price" style="margin:12rpx 0rpx">{{totalInfo.availableCreditLine || 0}}</view>
<view class="text-gray text-sm">查看代付详情</view>
</view>
<view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx">
<view class="flex flex-center" style="justify-content: flex-start">

Write Preview
Loading…
Cancel
Save