Browse Source

no message

feature/v1.4
xpz2018 5 years ago
parent
commit
40bd9c586d
28 changed files with 38 additions and 68 deletions
  1. BIN
      assets/agent/icon-agent.png
  2. BIN
      assets/agent/icon-dsh.png
  3. BIN
      assets/agent/icon-dyy.png
  4. BIN
      assets/agent/icon-sjz.png
  5. BIN
      assets/agent/icon-ywc.png
  6. BIN
      assets/image/icon-banner.png
  7. BIN
      assets/image/icon-qrcode.png
  8. BIN
      assets/info/noData.png
  9. BIN
      assets/info/sucessful.png
  10. 0
      assets/tabbar/home-blue.png
  11. 0
      assets/tabbar/home-gray.png
  12. BIN
      assets/tabbar/mall-blue.png
  13. BIN
      assets/tabbar/mall-gray.png
  14. 0
      assets/tabbar/message-blue.png
  15. 0
      assets/tabbar/message-gray.png
  16. 0
      assets/tabbar/process-blue.png
  17. 0
      assets/tabbar/process-gray.png
  18. 25
      components/popup/index.wxml
  19. 30
      components/toast/index.wxml
  20. 3
      pages/agent/ability-item/index.json
  21. 4
      pages/agent/ability-item/index.wxml
  22. 8
      pages/agent/index/index.js
  23. 6
      pages/agent/index/index.wxml
  24. 4
      pages/home/customer-list/index.wxml
  25. 2
      pages/htmls/auths/index.wxml
  26. 8
      pages/index/index.js
  27. 2
      pages/process/index/index.wxml
  28. 14
      pages/process/order-price/index.wxml

BIN
assets/agent/icon-agent.png

Before After
Width: 32  |  Height: 32  |  Size: 1.3 KiB

BIN
assets/agent/icon-dsh.png

Before After
Width: 68  |  Height: 68  |  Size: 2.1 KiB

BIN
assets/agent/icon-dyy.png

Before After
Width: 68  |  Height: 68  |  Size: 3.9 KiB

BIN
assets/agent/icon-sjz.png

Before After
Width: 68  |  Height: 68  |  Size: 1.9 KiB

BIN
assets/agent/icon-ywc.png

Before After
Width: 68  |  Height: 68  |  Size: 2.2 KiB

BIN
assets/image/icon-banner.png

Before After
Width: 694  |  Height: 200  |  Size: 27 KiB

BIN
assets/image/icon-qrcode.png

Before After
Width: 200  |  Height: 200  |  Size: 17 KiB

BIN
assets/info/noData.png

Before After
Width: 320  |  Height: 249  |  Size: 12 KiB

BIN
assets/info/sucessful.png

Before After
Width: 200  |  Height: 200  |  Size: 2.8 KiB

assets/image/tabbar/home-blue.png → assets/tabbar/home-blue.png

assets/image/tabbar/home-gray.png → assets/tabbar/home-gray.png

BIN
assets/tabbar/mall-blue.png

Before After
Width: 50  |  Height: 50  |  Size: 1.2 KiB

BIN
assets/tabbar/mall-gray.png

Before After
Width: 50  |  Height: 50  |  Size: 1.9 KiB

assets/image/tabbar/mall-blue.png → assets/tabbar/message-blue.png

assets/image/tabbar/mall-gray.png → assets/tabbar/message-gray.png

assets/image/tabbar/process-blue.png → assets/tabbar/process-blue.png

assets/image/tabbar/process-gray.png → assets/tabbar/process-gray.png

25
components/popup/index.wxml

@ -1,24 +1,13 @@
<wxs src="../wxs/utils.wxs" module="utils" />
<van-overlay
wx:if="{{ overlay }}"
show="{{ show }}"
z-index="{{ zIndex }}"
custom-style="{{ overlayStyle }}"
duration="{{ duration }}"
bind:click="onClickOverlay"
/>
<view
wx:if="{{ inited }}"
<van-overlay wx:if="{{ overlay }}" show="{{ show }}" z-index="{{ zIndex }}" custom-style="{{ overlayStyle }}"
duration="{{ duration }}" bind:click="onClickOverlay" />
<view wx:if="{{ inited }}"
class="custom-class {{ classes }} {{ utils.bem('popup', [position, { round, safe: safeAreaInsetBottom, safeTop: safeAreaInsetTop }]) }}"
style="z-index: {{ zIndex }}; -webkit-transition-duration:{{ currentDuration }}ms; transition-duration:{{ currentDuration }}ms; {{ display ? '' : 'display: none;' }};{{ customStyle }}"
bind:transitionend="onTransitionEnd"
>
bind:transitionend="onTransitionEnd">
<slot />
<van-icon
wx:if="{{ closeable }}"
name="{{ closeIcon }}"
<van-icon wx:if="{{ closeable }}" name="{{ closeIcon }}"
class="close-icon-class van-popup__close-icon van-popup__close-icon--{{ closeIconPosition }}"
bind:tap="onClickCloseIcon"
/>
</view>
bind:tap="onClickCloseIcon" />
</view>

30
components/toast/index.wxml

@ -1,33 +1,19 @@
<van-overlay
wx:if="{{ mask || forbidClick }}"
show="{{ show }}"
z-index="{{ zIndex }}"
custom-style="{{ mask ? '' : 'background-color: transparent;' }}"
/>
<van-transition
show="{{ show }}"
custom-style="z-index: {{ zIndex }}"
custom-class="van-toast__container"
>
<view
class="van-toast van-toast--{{ type === 'text' ? 'text' : 'icon' }} van-toast--{{ position }}"
catch:touchmove="noop"
>
<van-overlay wx:if="{{ mask || forbidClick }}" show="{{ show }}" z-index="{{ zIndex }}"
custom-style="{{ mask ? '' : 'background-color: transparent;' }}" />
<van-transition show="{{ show }}" custom-style="z-index: {{ zIndex }}" custom-class="van-toast__container">
<view class="van-toast van-toast--{{ type === 'text' ? 'text' : 'icon' }} van-toast--{{ position }}"
catch:touchmove="noop">
<!-- text only -->
<text wx:if="{{ type === 'text' }}">{{ message }}</text>
<!-- with icon -->
<block wx:else>
<van-loading
wx:if="{{ type === 'loading' }}"
color="white"
type="{{ loadingType }}"
custom-class="van-toast__loading"
/>
<van-loading wx:if="{{ type === 'loading' }}" color="white" type="{{ loadingType }}"
custom-class="van-toast__loading" />
<van-icon wx:else class="van-toast__icon" name="{{ type }}" />
<text wx:if="{{ message }}" class="van-toast__text">{{ message }}</text>
</block>
<slot />
</view>
</van-transition>
</van-transition>

3
pages/agent/ability-item/index.json

@ -2,7 +2,6 @@
"component": true,
"usingComponents": {
"van-button": "/components/button/index",
"van-image": "/components/image/index",
"van-tag": "/components/tag/index"
"van-image": "/components/image/index"
}
}

4
pages/agent/ability-item/index.wxml

@ -11,9 +11,7 @@
<view>时间:{{formate.substring(item.startTime, 0, 10)}}至{{formate.substring(item.endTime, 0, 10)}}</view>
</view>
</view>
<van-tag bind:click="toAbilityRule" wx:if="{{item.redirectInfo}}">
<text class="text-df">活动规则</text>
</van-tag>
<van-button plain round size="small" bind:click="toAbilityRule" wx:if="{{item.redirectInfo}}">活动规则</van-button>
</view>
<view class="bg-white" style="padding:0rpx 32rpx 10rpx 32rpx">
<view class="flex" wx:for-item="cateItem" wx:for-index="ck" wx:for="{{item.paperCategoryList}}" wx:key="ck" wx:if="{{item.fold || ck < 3}}" style="margin-bottom: 20rpx">

8
pages/agent/index/index.js

@ -15,10 +15,10 @@ Component({
userInfo: app.userInfo,
height: app.globalData.safeFragmentHeight,
tabList: [
{ status: 50, badge: '', name: '待预约', icon: '/assets/image/icon_pricing.png' },
{ status: 51, badge: '', name: '待送货', icon: '/assets/image/icon_checking.png' },
{ status: 53, badge: '', name: '结算中', icon: '/assets/image/icon_payment.png' },
{ status: 54, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
{ status: 50, badge: '', name: '待预约', icon: '/assets/agent/icon-dyy.png' },
{ status: 51, badge: '', name: '待送货', icon: '/assets/agent/icon-dsh.png' },
{ status: 53, badge: '', name: '结算中', icon: '/assets/agent/icon-sjz.png' },
{ status: 54, badge: '', name: '已完成', icon: '/assets/agent/icon-ywc.png' }
]
},
lifetimes: {

6
pages/agent/index/index.wxml

@ -10,10 +10,10 @@
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx">
<van-grid column-num="4" border="{{fasle}}">
<van-grid-item url="/pages/agent/agent-list/index" text="千鸟代卖">
<van-icon slot="icon" name="/assets/image/icon_pricing.png" size="68rpx" />
<van-icon slot="icon" name="/assets/agent/icon-agent.png" size="76rpx" />
</van-grid-item>
<van-grid-item url="/pages/moment/new-list/index" text="纸厂情报">
<van-icon slot="icon" name="/assets/image/icon_pricing.png" size="68rpx" />
<van-icon slot="icon" name="/assets/image/icon_pricing.png" size="76rpx" />
</van-grid-item>
</van-grid>
</view>
@ -30,7 +30,7 @@
</view>
<van-grid column-num="4" border="{{fasle}}">
<van-grid-item wx:for="{{ tabList }}" wx:key="index" data-status="{{item.status}}" bind:click="agentList" text="{{item.name}}">
<van-icon slot="icon" name="{{ item.icon }}" size="68rpx" info="{{item.badge}}" />
<van-icon slot="icon" name="{{ item.icon }}" size="76rpx" info="{{item.badge}}" />
</van-grid-item>
</van-grid>
</view>

4
pages/home/customer-list/index.wxml

@ -5,7 +5,6 @@
<van-search value="{{ form.name }}" shape="round" placeholder="请输入搜索关键词" use-action-slot bind:change="onChange">
<view slot="action" bind:tap="onSearch" style="padding: 0rpx 8rpx">搜索</view>
</van-search>
<!-- <scroll-view scroll-y style="height: {{height}}rpx;" throttle="{{false}}" lower-threshold="100" bind:scrolltolower="fetchCustomerList"> -->
<refresh-view id="refresh" height="{{height}}" bind:refresh="onRefreshList" bind:loadmore="fetchCustomerList">
<view class="list-empty" style="height:{{height}}rpx" wx:if="{{!orderList.length}}">
<view style="margin-bottom:24px" wx:if="{{loading}}">
@ -33,9 +32,8 @@
<text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦~':'加载中...'}}</text>
</van-divider>
</refresh-view>
<!-- </scroll-view> -->
<!-- <van-overlay show="{{ showEmbedded }}" duration="{{0}}" bind:click="onClickHideEmbedded">
<!-- <van-overlay show="{{ true }}" 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}}">

2
pages/htmls/auths/index.wxml

@ -33,7 +33,7 @@
</view>
<view style="flex:1;padding-left:40rpx">
<van-image width="200rpx" height="200rpx" use-loading-slot show-menu-by-longpress
src="/assets/image/icon-qrcode.png" fit="fill">
src="https://img.imgdb.cn/item/6088db7ad1a9ae528f60cf13.png" fit="fill">
<view class="image-load" style="width:210rpx;height:210rpx" slot="loading">
<van-loading type="spinner" size="32" />
</view>

8
pages/index/index.js

@ -12,10 +12,10 @@ Scene({
safeBottom: app.globalData.safeBottom,
fragment: app.globalData.safeFragmentHeight,
tabList: [
{ index: 2, value: 'agent', badge: 0, name: '代卖', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' },
// { index: 0, value: 'message', badge: 0, name: '消息', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' },
{ index: 1, value: 'work', badge: 0, name: '工作台', blue: '/assets/image/tabbar/process-blue.png', gray: '/assets/image/tabbar/process-gray.png' },
{ index: 3, value: 'home', badge: 0, name: '我的', blue: '/assets/image/tabbar/home-blue.png', gray: '/assets/image/tabbar/home-gray.png' }
{ index: 2, value: 'agent', badge: 0, name: '代卖', blue: '/assets/tabbar/mall-blue.png', gray: '/assets/tabbar/mall-gray.png' },
// { index: 0, value: 'message', badge: 0, name: '消息', blue: '/assets/tabbar/mall-blue.png', gray: '/assets/tabbar/mall-gray.png' },
{ index: 1, value: 'work', badge: 0, name: '工作台', blue: '/assets/tabbar/process-blue.png', gray: '/assets/tabbar/process-gray.png' },
{ index: 3, value: 'home', badge: 0, name: '我的', blue: '/assets/tabbar/home-blue.png', gray: '/assets/tabbar/home-gray.png' }
],
tabIndex: 1,
visiable: true,

2
pages/process/index/index.wxml

@ -105,7 +105,7 @@
</view>
<view style="padding: 0rpx 28rpx;margin-top:24rpx" wx:if="{{!totalInfo.creditLine}}">
<image style="width:694rpx;height:200rpx" src="/assets/image/icon-banner.png" bindtap="toAuths"></image>
<image style="width:694rpx;height:200rpx" src="https://img.imgdb.cn/item/6088db35d1a9ae528f5ee296.png" bindtap="toAuths"></image>
</view>
<view style="padding: 0rpx 28rpx;margin-top:24rpx" bindtap="agentList" wx:else>
<view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">

14
pages/process/order-price/index.wxml

@ -7,13 +7,13 @@
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">客户姓名</view>
<view class="text-gray">{{form.factoryCustomerName}}</view>
<view class="text-black">{{form.factoryCustomerName}}</view>
</view>
</van-cell>
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">过磅时间</view>
<view class="text-gray">{{form.createTime}}</view>
<view class="text-black">{{form.createTime}}</view>
</view>
</van-cell>
<view class="flex flex-center flex-column">
@ -35,22 +35,22 @@
<van-cell>
<view slot="title" class="flex flex-justify">
<view class="text-black">客户姓名</view>
<view class="text-gray">{{form.factoryCustomerName}}</view>
<view class="text-black">{{form.factoryCustomerName}}</view>
</view>
</van-cell>
<van-cell bind:click="showPlate">
<van-cell clickable center is-link bind:click="showPlate">
<view slot="title" class="flex flex-justify">
<view class="text-black">车牌号码</view>
<view class="text-gray">{{form.plateNumber || '请输入车牌号码'}}</view>
<view class="{{form.plateNumber ? 'text-black' : 'text-gray'}}">{{form.plateNumber || '请输入车牌号码'}}</view>
</view>
</van-cell>
<van-cell center bind:click="showCategory">
<van-cell clickable center is-link bind:click="showCategory">
<view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>废纸品类</text>
</view>
<view class="text-gray">{{form.productName || '请选择废纸品类'}}</view>
<view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择废纸品类'}}</view>
</view>
</van-cell>
<van-index-anchor index="定价信息" />

Loading…
Cancel
Save