diff --git a/components/searchSelectWrapper/index.js b/components/searchSelectWrapper/index.js index 923f040..1f0b9e7 100644 --- a/components/searchSelectWrapper/index.js +++ b/components/searchSelectWrapper/index.js @@ -21,6 +21,7 @@ Component({ required: Boolean, transparent: Boolean, allowClear: Boolean, + hideMargin: Boolean, }, /** diff --git a/components/searchSelectWrapper/index.wxml b/components/searchSelectWrapper/index.wxml index 548d684..d615ec9 100644 --- a/components/searchSelectWrapper/index.wxml +++ b/components/searchSelectWrapper/index.wxml @@ -37,7 +37,7 @@ *{{ label }} - + \ No newline at end of file diff --git a/pages/workBenchNew/components/recharge/index.wxml b/pages/workBenchNew/components/recharge/index.wxml index 868329b..ec5e587 100644 --- a/pages/workBenchNew/components/recharge/index.wxml +++ b/pages/workBenchNew/components/recharge/index.wxml @@ -17,11 +17,23 @@ + useSlot="{{true}}" + hideBorder="{{true}}" + hideMargin="{{true}}" + type="" + > + + + + + text="{{voucherNo}}" + fieldType="number" + bind:changeText="onChangeMoney" + useSlot="{{true}}" + hideBorder="{{true}}" + hideMargin="{{true}}" + type="" + > + + + + diff --git a/pages/workBenchNew/components/recharge/index.wxss b/pages/workBenchNew/components/recharge/index.wxss index b1ed3a3..c7e9761 100644 --- a/pages/workBenchNew/components/recharge/index.wxss +++ b/pages/workBenchNew/components/recharge/index.wxss @@ -1 +1,17 @@ -/* pages/workBenchNew/components/recharge/index.wxss */ \ No newline at end of file +/* pages/workBenchNew/components/recharge/index.wxss */ + + +.inputContent { + flex: 1; + margin-right: 10rpx; + display: flex; + padding: 0 20rpx; + border-radius: 12rpx; + border: 1rpx solid #ccc; + background-color: #fff; + position: relative; +} + +.text { + flex: 1; +} \ No newline at end of file diff --git a/pages/workBenchNew/components/workBenchMeterControl/index.js b/pages/workBenchNew/components/workBenchMeterControl/index.js index 28ab80a..9a5fe6d 100644 --- a/pages/workBenchNew/components/workBenchMeterControl/index.js +++ b/pages/workBenchNew/components/workBenchMeterControl/index.js @@ -107,6 +107,7 @@ Page({ const { code, message } = await handleOperateMeterMode({ ids: [meter], mode, days: days == null ? undefined : Number(days), reason, images: url }) if (code !== OK) { alertInfo(message) + await that.init(); return } alertSuccess("操作成功")