From 264b59b3ab2e48195bb7a24cb3dad1f08089bcfc Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 16 Jun 2021 11:31:35 +0800
Subject: [PATCH] no message
---
components/textarea/index.wxml | 2 +-
pages/agent/appointment/index.js | 9 +-
pages/agent/appointment/index.wxml | 144 +++++++++++++++--------------
pages/login/index.js | 2 +
4 files changed, 82 insertions(+), 75 deletions(-)
diff --git a/components/textarea/index.wxml b/components/textarea/index.wxml
index 936ab1c..649bb3d 100644
--- a/components/textarea/index.wxml
+++ b/components/textarea/index.wxml
@@ -1,4 +1,4 @@
{{value || placeholder }}
\ No newline at end of file
diff --git a/pages/agent/appointment/index.js b/pages/agent/appointment/index.js
index 960ab4b..b4f96bb 100644
--- a/pages/agent/appointment/index.js
+++ b/pages/agent/appointment/index.js
@@ -9,7 +9,9 @@ Scene({
* 页面的初始数据
*/
data: {
+ height: app.globalData.fragmentHeight,
safeBottom: app.globalData.safeBottom,
+ keyboardHeight: 0,
form: {
paperCategoryId: '',
unitPrice: ''
@@ -36,17 +38,18 @@ Scene({
if(options.activityId){
this.data.form.activityId = options.activityId
}
+ this.data.windowWidth = wx.getSystemInfoSync().windowWidth
if(options.id){
this.data.form.paperCategoryId = options.categoryId
wx.showLoading({ title: '加载中', mask: true })
getVehicleList().then(result => {
this.data.plateList = result.data.records
if(this.data.plateList.length <= 7){
- this.setData({ vateList: this.data.plateList })
+ this.setData({ vateList: this.data.plateList, height: app.globalData.fragmentHeight - app.globalData.safeBottom - 120 })
} else {
this.data.vateList = this.data.plateList.slice(0, 7)
this.data.vateList.push({plateNumber: '查看更多', fold: 1})
- this.setData({ vateList: this.data.vateList })
+ this.setData({ vateList: this.data.vateList, height: app.globalData.fragmentHeight - app.globalData.safeBottom - 120})
}
}).catch(err => {
})
@@ -87,7 +90,7 @@ Scene({
if(util.isEmpty(result.data) || util.isEmpty(result.data.bizUserId)){
this.dialog = this.dialog || this.selectComponent('#van-dialog')
this.dialog.stopLoading()
- this.setData({ show: true })
+ // this.setData({ show: true })
}
wx.hideLoading()
}).catch(err => {
diff --git a/pages/agent/appointment/index.wxml b/pages/agent/appointment/index.wxml
index 2ece0c2..4a1806b 100644
--- a/pages/agent/appointment/index.wxml
+++ b/pages/agent/appointment/index.wxml
@@ -4,86 +4,88 @@
代卖预约
-
- 提交订单
-
- 等待预约
-
- 线下送货
-
- 余额提现
-
+
+
+ 提交订单
+
+ 等待预约
+
+ 线下送货
+
+ 余额提现
+
-
-
- 纸品信息
-
-
-
- 纸厂名称
- {{factoryDetail.name}}
-
-
-
-
- 纸品品类
- {{cateName || '请选择品类'}}
+
+
+ 纸品信息
-
-
-
- 预估单价(元/吨)
-
- {{formate.formatePrice(form.unitPrice)}}
- (已含补贴{{formate.formatePrice(form.publicSubsidies)}}元/吨)
+
+
+ 纸厂名称
+ {{factoryDetail.name}}
-
-
-
-
- 预估重量(吨)
-
-
-
-
- 货到时间
- {{form.deliveryTime||'请选择货到时间'}}
-
-
+
+
+
+ 纸品品类
+ {{cateName || '请选择品类'}}
+
+
+
+
+ 预估单价(元/吨)
+
+ {{formate.formatePrice(form.unitPrice)}}
+ (已含补贴{{formate.formatePrice(form.publicSubsidies)}}元/吨)
+
+
+
+
+
+ 预估重量(吨)
+
+
+
+
+ 货到时间
+ {{form.deliveryTime||'请选择货到时间'}}
+
+
-
-
- 车辆信息
-
-
-
- {{item.plateNumber}}
+
+
+ 车辆信息
+
+
+
+ {{item.plateNumber}}
+
-
-
-
-
- {{index + 1}}
- 货车车牌：
+
+
+
+ {{index + 1}}
+ 货车车牌：
+
+ {{item.plateNumber || '点击输入车牌号码'}}
+
- {{item.plateNumber || '点击输入车牌号码'}}
-
+
+
+
+ 添加车辆
-
-
-
- 添加车辆
-
-
-
- 其他信息
-
-
-
-
+
+
+ 其他信息
+
+
+
+
-
+
+
提交订单
diff --git a/pages/login/index.js b/pages/login/index.js
index 9081918..f8eb204 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -37,6 +37,7 @@ Page({
// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
updateManager.applyUpdate()
})
+ app.globalData.keyboardHeight = storage.get('keyboardHeight') || 0
if(options.q){
//扫二维码进入的，
let q = decodeURIComponent(options.q)
@@ -271,6 +272,7 @@ Page({
},
inputFocus: function(e) {
app.globalData.keyboardHeight = e.detail.height
+ storage.put('keyboardHeight', app.globalData.keyboardHeight)
},
bindInput: function (e) {
this.data.form[e.target.id] = e.detail.value