Browse Source

no message

feature/v2.1
xpz2018 4 years ago
parent
commit
24df3d875a
11 changed files with 33 additions and 131 deletions
  1. 3
      pages/agent/index/index.js
  2. 4
      pages/agent/index/index.wxml
  3. 4
      pages/home/index/index.wxml
  4. 8
      pages/index/index.js
  5. 1
      pages/index/index.json
  6. 1
      pages/index/index.wxml
  7. 61
      pages/process/index/index.js
  8. 26
      pages/process/index/index.wxml
  9. 46
      pages/storage/index/index.js
  10. 4
      pages/storage/index/index.json
  11. 6
      pages/storage/index/index.wxml

3
pages/agent/index/index.js

@ -11,7 +11,6 @@ Component({
},
/** 页面的初始数据 */
data: {
userInfo: app.userInfo,
firstShow: false,
height: app.globalData.safeFragmentHeight - 100,
tabList: [
@ -33,7 +32,7 @@ Component({
methods: {
onRestart: function () {
if(!this.data.firstShow) {
this.setData({userInfo: app.userInfo, height: app.globalData.safeFragmentHeight - 100 })
this.setData({ height: app.globalData.safeFragmentHeight - 100 })
}
this.fetchStatisticsInfo()
this.data.firstShow = true

4
pages/agent/index/index.wxml

@ -1,9 +1,5 @@
<!--pages/process/index.wxml-->
<wxs module="formate" src="../../formate.wxs"></wxs>
<!-- <cu-custom bgColor="bg-blue">
<view slot="right" class="text-white text-xl" style="padding-left:32rpx">{{ userInfo ? (userInfo.factoryName || '未注册工厂') : ''}}</view>
</cu-custom> -->
<scroll-view scroll-y style="height: {{height}}rpx;">
<view style="padding: 0rpx 28rpx;margin-top:24rpx">
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx">

4
pages/home/index/index.wxml

@ -1,8 +1,4 @@
<wxs module="formate" src="../../formate.wxs"></wxs>
<!-- <cu-custom bgColor="bg-white" isBack="{{false}}">
<view slot="content" style="color:black;font-size:18px">我的</view>
</cu-custom> -->
<view style="height: 337rpx;background-image: linear-gradient(124deg, rgba(0, 122, 255) 0%, rgba(13, 100, 227) 100%);position: relative;">
<view style="width: 750rpx; height: 128rpx;position: absolute;padding: 32rpx;"></view>
<image style="height: 32rpx;width: 100%;position: absolute;bottom: 0rpx;" src="/assets/image/bg-vip.png"></image>

8
pages/index/index.js

@ -138,10 +138,10 @@ Scene({
return
}
this.setData({ visible: !this.data.visible, mActiveIndex: this.data.popIndex })
if (this.data.tabIndex == 0) {
var pageView = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value)
pageView.onClose()
}
// if (this.data.tabIndex == 0) {
// var pageView = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value)
// pageView.onClose()
// }
},
onHide: function(){
this.setData({ visible: false })

1
pages/index/index.json

@ -7,7 +7,6 @@
"process": "/pages/process/index/index",
"agent": "/pages/agent/index/index",
"home": "/pages/home/index/index",
"van-dialog": "/components/dialog/index",
"van-popup": "/components/popup/index",
"van-cell": "/components/cell/index",
"van-tree-select": "/components/tree-select/index",

1
pages/index/index.wxml

@ -38,5 +38,4 @@
</view>
</van-popup>
<van-dialog id="van-dialog" />
<notification id="qn-notification" />

61
pages/process/index/index.js

@ -11,7 +11,6 @@ Component({
},
/** 页面的初始数据 */
data: {
userInfo: null,
height: app.globalData.safeFragmentHeight,
tabList: [
{ status: 1, badge: '', name: '定价', icon: '/assets/image/icon_pricing.png' },
@ -60,24 +59,11 @@ Component({
onRestart: function () {
if(!this.data.firstShow) {
var min = new Date()
min.setFullYear(min.getFullYear() - 1, min.getMonth(), min.getDate())
min.setHours(0, 0, 0)
var minDate = min.getTime()
var max = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
max.setHours(0, 0, 0)
var maxDate = max.getTime()
var today = new Date()
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.data.form.startTime = util.formatDate(today, 'Y-M-D') + ' 00:00:00'
var max = new Date(min.getTime() + 24 * 60 * 60 * 1000)
var vdateString = util.formatDate(min, 'Y-M-D')
this.data.form.startTime = util.formatDate(min, 'Y-M-D') + ' 00:00:00'
this.data.form.endTime = util.formatDate(max, 'Y-M-D') + ' 00:00:00'
var height = app.globalData.safeFragmentHeight - 100
if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0){
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString})
} else {
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString })
}
this.setData({ height: app.globalData.safeFragmentHeight - 100, vdateString })
// const worker = wx.createWorker('/workers/process.js')
// worker.postMessage({ x : 10, y : 2 })
// worker.onMessage(function(res){
@ -159,8 +145,7 @@ Component({
if(util.isEmpty(result.data.usedCreditLine)){
result.data.usedCreditLine = app.userInfo.usedCreditLine
}
var vdateString = this.data.form.startTime.substring(0, 10) + '至' + this.data.form.endTime.substring(0, 10)
this.setData({ tabList: this.data.tabList, tabList1: this.data.tabList1, totalInfo: result.data, vdateString })
this.setData({ tabList: this.data.tabList, tabList1: this.data.tabList1, totalInfo: result.data })
if(loading){
wx.hideLoading()
}
@ -170,40 +155,8 @@ Component({
}
})
},
showCalendar: function(){
this.setData({ show: true })
this.triggerEvent("zIndex", -1)
},
onClose: function() {
this.setData({ show: false, sheet: false })
this.trigEvent(9)
},
onSelect: function({detail}) {
var start = new Date(detail[0])
var end = new Date(detail[1])
var vdateString = util.formatDate(start, 'Y-M-D') + '至' + util.formatDate(end, 'Y-M-D')
this.data.form.startTime = util.formatDate(start, 'Y-M-D') + ' 00:00:00'
this.data.form.endTime = util.formatDate(end, 'Y-M-D') + ' 00:00:00'
this.setData({ show: false, vdateString })
this.trigEvent(9)
this.fetchStatisticsInfo()
},
toAuths: function(){
wx.navigateTo({ url: '/pages/htmls/auths/index' })
},
trigEvent: function(zIndex){
setTimeout(() => {
this.triggerEvent('zIndex', zIndex)
}, 300);
},
showSheet: function(){
this.setData({ sheet: true })
this.triggerEvent("zIndex", -1)
},
onAction: function({detail}){
this.setData({ sheetStr: detail.name })
this.data.form.type = detail.id
this.fetchStatisticsInfo()
report: function(){
wx.navigateTo({ url: `/xtends/statics/index/index` })
}
}
})

26
pages/process/index/index.wxml

@ -2,24 +2,28 @@
<wxs module="formate" src="../../formate.wxs"></wxs>
<scroll-view scroll-y style="height: {{height}}rpx;">
<view class="bg-white flex flex-justify" style="height:80rpx;padding: 0rpx 32rpx">
<!-- <view class="bg-white flex flex-justify" style="height:80rpx;padding: 0rpx 32rpx">
<view class="text-black text-df" bindtap="showCalendar">{{vdateString}}</view>
<view class="flex flex-center" bindtap="showSheet" style="padding: 2rpx 0rpx">
<view class="text-black text-df" style="margin-right:8rpx">{{sheetStr}}</view>
<van-icon name="{{sheet ? 'arrow-up' : 'arrow-down'}}" />
</view>
</view>
</view> -->
<view style="padding: 0rpx 28rpx;margin-top:24rpx">
<view style="padding: 0rpx 28rpx;margin-top:24rpx" bindtap="report">
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">
<view class="flex flex-justify" style="padding: 0rpx 28rpx">
<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>
</view> -->
<view class="text-black text-sg text-bold">
<text>收货统计</text>
<text class="text-gray text-df">({{vdateString}})</text>
</view>
<view class="flex flex-center" style="padding: 2rpx 0rpx">
<view class="text-gray text-sm" style="margin-right:8rpx">查看智能报表</view>
<van-icon name="arrow" color="#aaa"/>
</view>
</view>
<view class="flex" style="padding: 16rpx 0rpx 8rpx 0rpx">
<view class="flex" style="padding: 32rpx 0rpx 8rpx 0rpx">
<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>
@ -85,7 +89,7 @@
<van-icon name="arrow" color="#aaa"/>
</view>
</view>
<view class="flex" style="padding:0rpx 0rpx 12rpx 0rpx">
<view class="flex" style="padding:16rpx 0rpx 12rpx 0rpx">
<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>
@ -107,7 +111,7 @@
</scroll-view>
<van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" title="日期范围选择" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
<!-- <van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" title="日期范围选择" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
<van-action-sheet show="{{ sheet }}" actions="{{ actions }}" bind:cancel="onClose" bind:close="onClose"
bind:select="onAction" cancel-text="取消" z-index="22" />
bind:select="onAction" cancel-text="取消" z-index="22" /> -->

46
pages/storage/index/index.js

@ -1,6 +1,5 @@
// pages/index/index.js
import { getStatisticsInfo } from "../../../api/saas"
import util from '../../../utils/util'
const event = require('../../../utils/event')
const app = getApp()
@ -11,7 +10,6 @@ Component({
},
/** 页面的初始数据 */
data: {
userInfo: app.userInfo,
height: app.globalData.safeFragmentHeight,
tabList2: [
{ status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' },
@ -19,13 +17,7 @@ Component({
{ status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payback.png' },
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_complete.png' }
],
form: {
startTime: '',
endTime: '',
},
show: false,
vdate: [],
vdateString: ''
form: { startTime: '', endTime: ''}
},
lifetimes: {
attached: function () {
@ -38,17 +30,6 @@ Component({
methods: {
onRestart: function () {
if(!this.data.firstShow) {
var min = new Date()
min.setFullYear(min.getFullYear() - 1, min.getMonth(), min.getDate())
min.setHours(0, 0, 0)
var minDate = min.getTime()
var max = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
max.setHours(0, 0, 0)
var maxDate = max.getTime()
var today = new Date()
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')
var height = app.globalData.safeFragmentHeight - 100
if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0){
var tabList2 = [
@ -57,14 +38,14 @@ Component({
{ status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payback.png' },
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_complete.png' }
]
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString, tabList2})
this.setData({height, tabList2})
} else {
var tabList2 = [
{ status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' },
{ status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payback.png' },
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_complete.png' }
]
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString, tabList2 })
this.setData({height, tabList2 })
}
}
this.fetchStatisticsInfo()
@ -122,27 +103,6 @@ Component({
wx.hideLoading()
}
})
},
showCalendar: function(){
this.setData({ show: true })
this.triggerEvent("zIndex", -1)
},
onClose: function() {
this.setData({ show: false })
this.trigEvent(9)
},
onSelect: function({detail}) {
const [start, end] = detail
this.onClose()
this.fetchStatisticsInfo([start.getTime(), end.getTime()])
},
toAuths: function(){
wx.navigateTo({ url: '/pages/htmls/auths/index' })
},
trigEvent: function(zIndex){
setTimeout(() => {
this.triggerEvent('zIndex', zIndex)
}, 100);
}
}
})

4
pages/storage/index/index.json

@ -5,8 +5,6 @@
"van-grid-item": "/components/grid-item/index",
"van-cell": "/components/cell/index",
"van-cell-group": "/components/cell-group/index",
"van-icon": "/components/icon/index",
"van-popup": "/components/popup/index",
"van-calendar": "/components/calendar/index"
"van-icon": "/components/icon/index"
}
}

6
pages/storage/index/index.wxml

@ -61,7 +61,5 @@
</van-grid>
</view>
</view>
<view style="height:24rpx;"></view>
</scroll-view>
<van-calendar show="{{ show }}" type="range" row-height="50" color="#008AFF" z-index="22" min-date="{{ minDate }}" max-date="{{ maxDate }}" default-date="{{ vdate }}" top="{{ 1500 }}" show-subtitle="{{ false }}" show-confirm="{{ false }}" bind:close="onClose" bind:confirm="onSelect"/>
<view style="height:16rpx;"></view>
</scroll-view>
Loading…
Cancel
Save