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

no message

feature/v1.4
xpz2018 5 years ago
parent
4044ecfa7b
commit
962073a93b
9 changed files with 86 additions and 147 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      components/collapse-item/index.wxml
  2. 2
      components/collapse-item/index.wxss
  3. 8
      pages/agent/order-detail/item-car-info/index.wxss
  4. 2
      pages/home/factory-list/index.js
  5. 106
      pages/home/index/index.wxml
  6. 40
      pages/storage/order-create/index.js
  7. 10
      pages/storage/order-create/index.wxml
  8. 5
      pages/storage/order-create/index.wxss
  9. 14
      pages/storage/order-settlement/index.wxml

46
components/collapse-item/index.wxml
View File

@ -1,44 +1,18 @@
<wxs src="../wxs/utils.wxs" module="utils" /> <wxs src="../wxs/utils.wxs" module="utils" />
<view class="van-collapse-item custom-class {{ index !== 0 ? 'van-hairline--top' : '' }}"> <view class="van-collapse-item custom-class {{ index !== 0 ? 'van-hairline--top' : '' }}">
<van-cell
title="{{ title }}"
title-class="title-class"
icon="{{ icon }}"
value="{{ value }}"
label="{{ label }}"
is-link="{{ isLink }}"
clickable="{{ clickable }}"
border="{{ border && expanded }}"
class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}"
right-icon-class="van-cell__right-icon"
custom-class="van-cell collapse"
hover-class="van-cell--hover"
bind:click="onClick"
>
<slot
name="title"
slot="title"
/>
<slot
name="icon"
slot="icon"
/>
<van-cell title="{{ title }}" title-class="title-class" icon="{{ icon }}" value="{{ value }}" label="{{ label }}"
is-link="{{ isLink }}" clickable="{{ clickable }}" border="{{ border && expanded }}"
class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}" right-icon-class="van-cell__right-icon"
custom-class="van-cell" hover-class="van-cell--hover" bind:click="onClick" custom-style="min-height: auto;">
<slot name="title" slot="title" />
<slot name="icon" slot="icon" />
<slot name="value" /> <slot name="value" />
<slot
name="right-icon"
slot="right-icon"
/>
<slot name="right-icon" slot="right-icon" />
</van-cell> </van-cell>
<view
class="{{ utils.bem('collapse-item__wrapper') }}"
style="height: 0;"
animation="{{ animation }}"
>
<view
class="van-collapse-item__content content-class"
>
<view class="{{ utils.bem('collapse-item__wrapper') }}" style="height: 0;" animation="{{ animation }}">
<view class="van-collapse-item__content content-class">
<slot /> <slot />
</view> </view>
</view> </view>
</view>
</view>

2
components/collapse-item/index.wxss
View File

@ -1 +1 @@
@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c8c9cc!important;color:var(--collapse-item-title-disabled-color,#c8c9cc)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__content{color:#969799;color:var(--collapse-item-content-text-color,#969799);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)}.collapse{min-height: auto;}
@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c8c9cc!important;color:var(--collapse-item-title-disabled-color,#c8c9cc)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__content{color:#969799;color:var(--collapse-item-content-text-color,#969799);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)}

8
pages/agent/order-detail/item-car-info/index.wxss
View File

@ -6,11 +6,3 @@
.margin-right{ .margin-right{
margin-right: 24rpx; margin-right: 24rpx;
} }
.image-load {
width: 50px;
height: 50px;
display: flex;
align-items: center;
justify-content: center;
}

2
pages/home/factory-list/index.js
View File

@ -39,7 +39,7 @@ Scene({
*/ */
onLoad: function (options) { onLoad: function (options) {
if(options.type){ if(options.type){
this.setData({ height: app.globalData.fragmentHeight - 90, type: Number(options.type )})
this.setData({ height: app.globalData.fragmentHeight, type: Number(options.type )})
} else { } else {
this.setData({ height: app.globalData.fragmentHeight }) this.setData({ height: app.globalData.fragmentHeight })
} }

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

@ -4,13 +4,11 @@
</cu-custom> </cu-custom>
<scroll-view scroll-y style="height:{{height}}rpx;"> <scroll-view scroll-y style="height:{{height}}rpx;">
<!-- 用户信息 -->
<van-cell center is-link clickable="{{false}}" border="{{false}}" wx:if="{{userInfo}}" bind:click="toUserInfo"> <van-cell center is-link clickable="{{false}}" border="{{false}}" wx:if="{{userInfo}}" bind:click="toUserInfo">
<view class="flex" slot="title" style="align-items: center"> <view class="flex" slot="title" style="align-items: center">
<van-image use-loading-slot width="120rpx" height="120rpx" lazy-load round src="{{avatarUrl}}"> <van-image use-loading-slot width="120rpx" height="120rpx" lazy-load round src="{{avatarUrl}}">
<image class="image-load" slot="loading" src="/assets/image/ygImg.png"></image> <image class="image-load" slot="loading" src="/assets/image/ygImg.png"></image>
</van-image> </van-image>
<!-- <image class="image-load" slot="loading" src="/assets/image/ygImg.png"></image> -->
<view class="flex flex-column flex-center" style="margin-left:24rpx;align-items:flex-start"> <view class="flex flex-column flex-center" style="margin-left:24rpx;align-items:flex-start">
<view class="flex flex-center"> <view class="flex flex-center">
<text class="text-lg" style="white-space: nowrap">{{userName || ''}}</text> <text class="text-lg" style="white-space: nowrap">{{userName || ''}}</text>
@ -26,68 +24,44 @@
</view> </view>
</view> </view>
</van-cell> </van-cell>
<!-- 授信信息 -->
<!-- <view class="bg-white" style="margin-top: 16rpx">
<view class="flex" style="padding: 20rpx 32rpx">
<text class="text-lg text-bold">千鸟代付额度</text>
<text class="text-df text-gray" style="padding-top:6rpx;margin-left:8rpx"></text>
<view class="bg-white" style="margin-top: 16rpx">
<view class="flex" style="padding: 24rpx 32rpx;border-bottom:2rpx solid #f3f3f3">
<text class="text-sg">企业管理</text>
</view> </view>
<view class="flex" style="padding:0rpx 32rpx 24rpx 32rpx">
<view style="flex:1;border: 2rpx solid #eeeeee;padding:24rpx 32rpx;margin-right:12rpx">
<view class="text-black">剩余代付额度</view>
<view class="text-xxl text-bold" style="margin:12rpx 0rpx">{{formate.formateAmount(creditInfo.availableCreditLine)}}</view>
<view class="text-blue text-sm" style=";text-decoration:underline" wx:if="{{!creditInfo.creditLine}}"
catchtap="tipApply">如何获得采购量？</view>
</view>
<view style="flex:1;border: 2rpx solid #eeeeee;padding:24rpx 32rpx;margin-left:12rpx" bindtap="orderList">
<view class="text-black">待付款订单</view>
<view class="text-xxl text-bold" style="margin:12rpx 0rpx">{{formate.formateAmount(creditInfo.usedCreditLine)}}</view>
<view class="text-gray text-sm">查看订单明细</view>
</view>
<van-grid column-num="4" border="{{fasle}}">
<van-grid-item text="员工管理" url="/pages/home/employee/index" wx:if="{{isAdmin}}">
<van-icon slot="icon" name="manager-o" size="60rpx" />
</van-grid-item>
<van-grid-item text="客户管理" url="/pages/home/customer-list/index">
<van-icon slot="icon" name="user-circle-o" size="60rpx" />
</van-grid-item>
<van-grid-item text="品类管理" url="/pages/setting/paper-list/index">
<van-icon slot="icon" name="records" size="60rpx" />
</van-grid-item>
<van-grid-item text="智能绑卡" url="/pages/message/card-list/index">
<van-icon slot="icon" name="idcard" size="60rpx" />
</van-grid-item>
</van-grid>
</view>
<view class="bg-white" style="margin-top: 16rpx">
<view class="flex" style="padding: 24rpx 32rpx;border-bottom:2rpx solid #f3f3f3">
<text class="text-sg">企业信息</text>
</view> </view>
</view> -->
<!-- 企业信息 -->
<view style="height:24rpx"></view>
<van-cell-group>
<van-cell is-link clickable url="/pages/home/employee/index" wx:if="{{isAdmin}}">
<view class="flex" slot="title" style="align-items: center">
<van-icon name="manager-o" size="18"/>
<text class="text-sg" style="margin-left:12rpx">员工管理</text>
</view>
</van-cell>
<van-cell is-link clickable url="/pages/home/customer-list/index">
<view class="flex" slot="title" style="align-items: center">
<van-icon name="user-circle-o" size="20"/>
<text class="text-sg" style="margin-left:12rpx">客户管理</text>
</view>
</van-cell>
<van-cell is-link clickable url="/pages/setting/paper-list/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>
</view>
</van-cell>
<!-- <van-cell is-link clickable link-type="navigateTo" url="/pages/home/qrcode/index">
<view class="flex" slot="title" style="align-items: center">
<van-icon name="qr" size="18"/>
<text class="text-sg" style="margin-left:12rpx">二维码名片</text>
</view>
</van-cell> -->
<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>
</view>
</van-cell>
<van-cell is-link clickable link-type="navigateTo" url="/pages/message/card-list/index">
<view class="flex" slot="title" style="align-items: center">
<van-icon name="idcard" size="18"/>
<text class="text-sg" style="margin-left:12rpx">智能绑卡</text>
</view>
</van-cell>
</van-cell-group>
<view style="height:16rpx"></view>
<van-cell-group>
<van-grid column-num="4" border="{{fasle}}">
<van-grid-item text="银行卡" url="/pages/settlement/bank-list/index" wx:if="{{isAdmin}}">
<van-icon slot="icon" name="credit-pay" size="60rpx" />
</van-grid-item>
<van-grid-item text="出货渠道" url="/pages/home/factory-list/index">
<van-icon slot="icon" name="newspaper-o" size="60rpx" />
</van-grid-item>
<van-grid-item text="二维码名片" url="/pages/home/qrcode/index">
<van-icon slot="icon" name="qr" size="60rpx" />
</van-grid-item>
</van-grid>
</view>
<!-- <van-cell-group>
<van-cell is-link clickable url="/pages/setting/password/index"> <van-cell is-link clickable url="/pages/setting/password/index">
<view class="flex" slot="title" style="align-items: center"> <view class="flex" slot="title" style="align-items: center">
<text class="cuIcon-lock text-black" style="font-size:36rpx"></text> <text class="cuIcon-lock text-black" style="font-size:36rpx"></text>
@ -100,13 +74,7 @@
<text class="text-sg" style="margin-left:12rpx">修改手机号码</text> <text class="text-sg" style="margin-left:12rpx">修改手机号码</text>
</view> </view>
</van-cell> </van-cell>
<!-- <van-cell is-link clickable bind:click="loginOut">
<view class="flex" slot="title" style="align-items: center">
<van-icon name="setting-o" size="18" />
<text class="text-sg" style="margin-left:12rpx">退出当前账号</text>
</view>
</van-cell> -->
</van-cell-group>
</van-cell-group> -->
<view style="height:16rpx"></view> <view style="height:16rpx"></view>
</scroll-view> </scroll-view>

40
pages/storage/order-create/index.js
View File

@ -59,25 +59,29 @@ Scene({
} }
}, },
chooseList: function(e){ chooseList: function(e){
console.log(e.currentTarget.id == 'orderId')
var url = ''
if(e.currentTarget.id == 'orderId'){
url = `/pages/agent/select-list/index?itemId=1`
} else if(e.currentTarget.id == 'factoryId'){
url = `/pages/home/factory-list/index?type=1`
}
var that = this var that = this
// wx.navigateTo({
// url: `/pages/home/factory-list/index?type=1`,
// events: {
// onCallback: (data) => {
// if (data.what == 140) {
// if(data.detail.paperMillId){
// that.data.form.deliveryChannelType = 2
// that.data.form.factoryDeliveryChannelId = data.detail.paperMillId
// } else {
// that.data.form.deliveryChannelType = 1
// that.data.form.factoryDeliveryChannelId = data.detail.id
// }
// that.setData({ ['form.factoryName']: data.detail.name })
// }
// }
// }
// })
var events = {}
events.onCallback = function(data){
if (data.what == 140) {
if(data.detail.paperMillId){
that.data.form.deliveryChannelType = 2
that.data.form.factoryDeliveryChannelId = data.detail.paperMillId
} else {
that.data.form.deliveryChannelType = 1
that.data.form.factoryDeliveryChannelId = data.detail.id
}
that.setData({ ['form.factoryName']: data.detail.name })
} else if (data.what == 62) {
console.log(data.detail)
}
}
wx.navigateTo({url, events})
}, },
showPlate: function (e) { showPlate: function (e) {
this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard')

10
pages/storage/order-create/index.wxml
View File

@ -13,16 +13,16 @@
<view class="flex flex-center text-black"> <view class="flex flex-center text-black">
<text>关联代卖单</text> <text>关联代卖单</text>
</view> </view>
<view class="text-gray">{{form.factoryName || '请选择代卖订单'}}</view>
<view class="{{form.factoryName ? 'text-black' : 'text-gray'}}">{{form.factoryName || '请选择代卖订单'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell id="factoryId" center is-link bind:click="chooseList">
<van-cell id="factoryId" clickable center is-link bind:click="chooseList">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black"> <view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view> <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>收货方名称</text> <text>收货方名称</text>
</view> </view>
<view class="text-gray">{{form.factoryName || '请选择收货方'}}</view>
<view class="{{form.factoryName ? 'text-black' : 'text-gray'}}">{{form.factoryName || '请选择收货方'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell clickable center is-link bind:click="showCategory"> <van-cell clickable center is-link bind:click="showCategory">
@ -31,7 +31,7 @@
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view> <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>废纸品类</text> <text>废纸品类</text>
</view> </view>
<view class="text-gray">{{form.productName || '请选择废纸品类'}}</view>
<view class="{{form.productName ? 'text-black' : 'text-gray'}}">{{form.productName || '请选择废纸品类'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
@ -47,7 +47,7 @@
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view> <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>车牌号码</text> <text>车牌号码</text>
</view> </view>
<view class="text-gray">{{form.plateNumber || '请输入车牌号码'}}</view>
<view class="{{form.plateNumber ? 'text-black' : 'text-gray'}}">{{form.plateNumber || '请输入车牌号码'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>

5
pages/storage/order-create/index.wxss
View File

@ -1,4 +1 @@
/* pages/storage/index/index.wxss */
.collapse-item{
padding: 0rpx;
}
/* pages/storage/index/index.wxss */

14
pages/storage/order-settlement/index.wxml
View File

@ -5,13 +5,16 @@
</cu-custom> </cu-custom>
<view wx:if="{{orderInfo}}"> <view wx:if="{{orderInfo}}">
<van-cell center is-link bind:click="showCategory">
<view style="background-color:#f3f3f3;">
<text class="text-sg" style="line-height:64rpx;padding-left:32rpx">结算信息</text>
</view>
<van-cell center clickable is-link bind:click="showCategory">
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="flex flex-center text-black"> <view class="flex flex-center text-black">
<view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view> <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
<text>废纸品类</text> <text>废纸品类</text>
</view> </view>
<view class="text-gray">{{form.categoryName || '请选择废纸品类'}}</view>
<view class="{{form.categoryName ? 'text-black' : 'text-gray'}}">{{form.categoryName || '请选择废纸品类'}}</view>
</view> </view>
</van-cell> </van-cell>
<van-cell> <van-cell>
@ -62,8 +65,8 @@
placeholder="请输入结算金额" disabled value="{{form.settlePrice || ''}}" bindinput="bindInput" /> placeholder="请输入结算金额" disabled value="{{form.settlePrice || ''}}" bindinput="bindInput" />
</view> </view>
</van-cell> </van-cell>
<view class="bg-white" style="padding: 20rpx 32rpx">
<view class="flex flex-justify" style="padding-bottom: 20rpx">
<view class="bg-white" style="padding: 24rpx 32rpx 20rpx 32rpx">
<view class="flex flex-justify" style="padding-bottom: 24rpx">
<text class="text-black">纸厂磅单</text> <text class="text-black">纸厂磅单</text>
<text class="text-gray">最多3张，每图片大小限制5M</text> <text class="text-gray">最多3张，每图片大小限制5M</text>
</view> </view>
@ -72,7 +75,8 @@
</view> </view>
<view class="margin-top"></view> <view class="margin-top"></view>
<van-collapse value="{{ activeNames }}" bind:change="onChange" wx:if="{{orderInfo}}"> <van-collapse value="{{ activeNames }}" bind:change="onChange" wx:if="{{orderInfo}}">
<van-collapse-item title="出货信息" content-class="collapse-item" name="2">
<van-collapse-item title="出货信息" name="2">
<!-- <view slot="title" class="text-gray">出货信息</view> -->
<van-cell center> <van-cell center>
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">收货方名称</view> <view class="text-black">收货方名称</view>

Write Preview
Loading…
Cancel
Save