From def221146f0ed54f100a9dfbc39fc6a5f7c9a300 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 16 Jun 2021 10:30:13 +0800 Subject: [PATCH] no message --- app.js | 2 +- components/textarea/index.js | 41 ++++++++++++++++++++++++++++++ components/textarea/index.json | 3 +++ components/textarea/index.wxml | 4 +++ components/textarea/index.wxss | 7 +++++ pages/agent/appointment/index.js | 22 ++++++++-------- pages/agent/appointment/index.json | 1 + pages/agent/appointment/index.wxml | 4 +-- pages/home/index/index.wxml | 4 +-- pages/process/payment/index.js | 11 ++------ pages/process/payment/index.json | 1 + pages/process/payment/index.wxml | 4 +-- xtends/statics/index/index.wxml | 10 +++----- xtends/statics/index/index.wxss | 1 - 14 files changed, 79 insertions(+), 36 deletions(-) create mode 100644 components/textarea/index.js create mode 100644 components/textarea/index.json create mode 100644 components/textarea/index.wxml create mode 100644 components/textarea/index.wxss diff --git a/app.js b/app.js index 1432a24..76ed0a8 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 2, // 0: 开发版本；1：测试版本；2：生产版本 + evn: 0, // 0: 开发版本；1：测试版本；2：生产版本 tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: '2.1.0', xAppId: '503258978847953926', diff --git a/components/textarea/index.js b/components/textarea/index.js new file mode 100644 index 0000000..a4d4938 --- /dev/null +++ b/components/textarea/index.js @@ -0,0 +1,41 @@ +Component({ + /** + * 组件样式隔离 + */ + options: { + addGlobalClass: true, + multipleSlots: true // 支持多个slot + }, + properties: { + value: { + type: String, + value: null + }, + placeholder: { + type: String, + value: '' + } + }, + /** + * 组件的初始数据 + */ + data: { + editing: false + }, + + /** + * 组件的方法列表 + */ + methods: { + onEdit: function(e) { + this.setData({ editing: true }) + }, + onBlur: function(e) { + this.setData({ editing: false }) + }, + bindInput: function(e) { + this.setData({ value: e.detail.value }) + this.triggerEvent('change', this.data.value) + } + } +}) \ No newline at end of file diff --git a/components/textarea/index.json b/components/textarea/index.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/components/textarea/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/components/textarea/index.wxml b/components/textarea/index.wxml new file mode 100644 index 0000000..936ab1c --- /dev/null +++ b/components/textarea/index.wxml @@ -0,0 +1,4 @@ +{{value || placeholder }} + \ No newline at end of file diff --git a/components/textarea/index.wxss b/components/textarea/index.wxss new file mode 100644 index 0000000..4b7fd88 --- /dev/null +++ b/components/textarea/index.wxss @@ -0,0 +1,7 @@ +.textarea{ + width:100%; + height:80px; + padding:12rpx; + font-size: 14px; + border: 1rpx solid #f3f3f3; +} \ No newline at end of file diff --git a/pages/agent/appointment/index.js b/pages/agent/appointment/index.js index 3aeb3ab..960ab4b 100644 --- a/pages/agent/appointment/index.js +++ b/pages/agent/appointment/index.js @@ -24,7 +24,6 @@ Scene({ plateNumber: '', plateString: '', vindex: -1, - picking: false, requesting: false, columns: [], toolbar: '', @@ -121,7 +120,11 @@ Scene({ bindInput: function (e) { if(!util.isEmpty(e.currentTarget.id)){ var form_data = 'form.' + e.currentTarget.id - this.setData({ [form_data]: e.detail.value }) + if(e.currentTarget.id == 'remark'){ + this.setData({ [form_data]: e.detail }) + } else { + this.setData({ [form_data]: e.detail.value }) + } } else { this.data.code = e.detail.value } @@ -129,14 +132,11 @@ Scene({ showKeyboard: function(e){ var item = this.data.vehicleList[e.currentTarget.dataset.index] this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') - this.setData({ picking: true }) this.keyboard.show(item.plateNumber, e.currentTarget.dataset.index) }, onPlatenumber: function({detail}){ if(detail && detail.plateNumber){ - this.setData({ ['vehicleList[' + detail.type + '].plateNumber']: detail.plateNumber, picking: false }) - } else { - this.setData({ picking: false }) + this.setData({ ['vehicleList[' + detail.type + '].plateNumber']: detail.plateNumber }) } }, addCate: function (e) { @@ -160,17 +160,17 @@ Scene({ } this.data.toolId = e.currentTarget.id if(e.currentTarget.id == 'deliveryTime'){ - this.setData({ visible: true, picking: true, columns: this.data.timeList, toolbar: '选择到货时间' }) + this.setData({ visible: true, columns: this.data.timeList, toolbar: '选择到货时间' }) } else if(e.currentTarget.id == 'cateName'){ - this.setData({ visible: true, picking: true, columns: this.data.cateList, toolbar: '选择纸品' }) + this.setData({ visible: true, columns: this.data.cateList, toolbar: '选择纸品' }) } }, onHide: function(){ - this.setData({ picking: false, visible: false }) + this.setData({ visible: false }) }, onConfirm: function ({detail}) { if(this.data.toolId == 'deliveryTime'){ - this.setData({ ['form.deliveryTime']: detail.value, picking: false, visible: false }) + this.setData({ ['form.deliveryTime']: detail.value, visible: false }) } else if(this.data.toolId == 'cateName'){ const element = this.data.factoryDetail.paperCategoryList[detail.index] if(element.publicSubsidies && Number(element.publicSubsidies) > 0){ @@ -183,7 +183,7 @@ Scene({ this.data.cateName = element.categoryName this.data.form.paperCategoryId = element.categoryId this.setData({ ['form.unitPrice']: this.data.form.unitPrice, ['form.publicSubsidies']: this.data.form.publicSubsidies, - cateName: this.data.cateName, picking: false, visible: false }) + cateName: this.data.cateName, visible: false }) } }, tagChange: function(e){ diff --git a/pages/agent/appointment/index.json b/pages/agent/appointment/index.json index bf52850..639121f 100644 --- a/pages/agent/appointment/index.json +++ b/pages/agent/appointment/index.json @@ -6,6 +6,7 @@ "van-dialog": "/components/dialog/index", "van-loading": "/components/loading/index", "van-image": "/components/image/index", + "van-textarea": "/components/textarea/index", "van-picker": "/components/picker/index", "van-popup": "/components/popup/index", "vehicle-keyboard": "/components/vehicle-keyboard/index", diff --git a/pages/agent/appointment/index.wxml b/pages/agent/appointment/index.wxml index b7214ba..2ece0c2 100644 --- a/pages/agent/appointment/index.wxml +++ b/pages/agent/appointment/index.wxml @@ -80,9 +80,7 @@ 其他信息 - {{form.remark ? form.remark : '点击输入备注，最多100字' }} - + diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index f5db453..e64ebec 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -46,9 +46,9 @@ - + diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js index 4dc3f1c..e0c3185 100644 --- a/pages/process/payment/index.js +++ b/pages/process/payment/index.js @@ -28,8 +28,7 @@ Scene({ ids: [] }, settleType: '1', - requesting: false, - editing: false + requesting: false }, /** * 生命周期函数--监听页面加载 @@ -153,15 +152,9 @@ Scene({ wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` }) } }, - onRemark: function(e){ - this.setData({editing: true }) - }, - onBlur: function(){ - this.setData({editing: false }) - }, bindInput: function (e) { var form_data = 'params.' + e.currentTarget.id - this.setData({ [form_data]: e.detail.value }) + this.setData({ [form_data]: e.detail }) }, agentPayment: function(settleType){ if(Number(settleType) != 1 && Number(settleType) != 2){ diff --git a/pages/process/payment/index.json b/pages/process/payment/index.json index d98303a..4b0823e 100644 --- a/pages/process/payment/index.json +++ b/pages/process/payment/index.json @@ -6,6 +6,7 @@ "van-radio": "/components/radio/index", "van-radio-group": "/components/radio-group/index", "van-image": "/components/image/index", + "van-textarea": "/components/textarea/index", "van-dialog": "/components/dialog/index", "submit-layout": "/components/submit-layout/index", "notification": "/pages/message/notification/index" diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index 584eb22..cd016f1 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -37,9 +37,7 @@ 付款备注 - - {{params.payRemark ? params.payRemark : '点击输入付款备注，最多100字' }} - + diff --git a/xtends/statics/index/index.wxml b/xtends/statics/index/index.wxml index 8e31970..3eff93f 100644 --- a/xtends/statics/index/index.wxml +++ b/xtends/statics/index/index.wxml @@ -55,17 +55,15 @@ - + - - + - - + 收货合计(吨) 1230.45 @@ -74,7 +72,7 @@ 1230.45 - + 收货总金额(元) 1230.45 diff --git a/xtends/statics/index/index.wxss b/xtends/statics/index/index.wxss index f528fcd..353be70 100644 --- a/xtends/statics/index/index.wxss +++ b/xtends/statics/index/index.wxss @@ -13,7 +13,6 @@ .shanxing { width: 200rpx; height: 200rpx; - margin: 10rpx auto; position: relative; border-radius: 50%; overflow: hidden;