diff --git a/components/collapse-item/index.wxml b/components/collapse-item/index.wxml
index 3a09394..60bade3 100644
--- a/components/collapse-item/index.wxml
+++ b/components/collapse-item/index.wxml
@@ -1,44 +1,18 @@
-
-
-
+
+
+
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/components/collapse-item/index.wxss b/components/collapse-item/index.wxss
index bd8e5b0..0e075bd 100644
--- a/components/collapse-item/index.wxss
+++ b/components/collapse-item/index.wxss
@@ -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;}
\ No newline at end of file
+@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)}
\ No newline at end of file
diff --git a/pages/agent/order-detail/item-car-info/index.wxss b/pages/agent/order-detail/item-car-info/index.wxss
index 00093ad..5842437 100644
--- a/pages/agent/order-detail/item-car-info/index.wxss
+++ b/pages/agent/order-detail/item-car-info/index.wxss
@@ -6,11 +6,3 @@
.margin-right{
margin-right: 24rpx;
}
-
-.image-load {
- width: 50px;
- height: 50px;
- display: flex;
- align-items: center;
- justify-content: center;
-}
\ No newline at end of file
diff --git a/pages/home/factory-list/index.js b/pages/home/factory-list/index.js
index 08bae7e..4552083 100644
--- a/pages/home/factory-list/index.js
+++ b/pages/home/factory-list/index.js
@@ -39,7 +39,7 @@ Scene({
*/
onLoad: function (options) {
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 {
this.setData({ height: app.globalData.fragmentHeight })
}
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index a985435..3f006f3 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -4,13 +4,11 @@
-
-
{{userName || ''}}
@@ -26,68 +24,44 @@
-
-
-
-
-
-
-
-
- 员工管理
-
-
-
-
-
- 客户管理
-
-
-
-
-
- 品类管理
-
-
-
-
-
-
- 出货渠道管理
-
-
-
-
-
- 智能绑卡
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ -->
\ No newline at end of file
diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js
index a5a81ca..2ed3f46 100644
--- a/pages/storage/order-create/index.js
+++ b/pages/storage/order-create/index.js
@@ -59,25 +59,29 @@ Scene({
}
},
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
- // 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) {
this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard')
diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml
index bc1980c..09a4997 100644
--- a/pages/storage/order-create/index.wxml
+++ b/pages/storage/order-create/index.wxml
@@ -13,16 +13,16 @@
关联代卖单
- {{form.factoryName || '请选择代卖订单'}}
+ {{form.factoryName || '请选择代卖订单'}}
-
+
*
收货方名称
- {{form.factoryName || '请选择收货方'}}
+ {{form.factoryName || '请选择收货方'}}
@@ -31,7 +31,7 @@
*
废纸品类
- {{form.productName || '请选择废纸品类'}}
+ {{form.productName || '请选择废纸品类'}}
@@ -47,7 +47,7 @@
*
车牌号码
- {{form.plateNumber || '请输入车牌号码'}}
+ {{form.plateNumber || '请输入车牌号码'}}
diff --git a/pages/storage/order-create/index.wxss b/pages/storage/order-create/index.wxss
index e961ac3..c3de589 100644
--- a/pages/storage/order-create/index.wxss
+++ b/pages/storage/order-create/index.wxss
@@ -1,4 +1 @@
-/* pages/storage/index/index.wxss */
-.collapse-item{
- padding: 0rpx;
-}
\ No newline at end of file
+/* pages/storage/index/index.wxss */
\ No newline at end of file
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index 7996c16..e07478f 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -5,13 +5,16 @@
-
+
+ 结算信息
+
+
*
废纸品类
- {{form.categoryName || '请选择废纸品类'}}
+ {{form.categoryName || '请选择废纸品类'}}
@@ -62,8 +65,8 @@
placeholder="请输入结算金额" disabled value="{{form.settlePrice || ''}}" bindinput="bindInput" />
-
-
+
+
纸厂磅单
最多3张，每图片大小限制5M
@@ -72,7 +75,8 @@
-
+
+
收货方名称