Commit 97b155f9 authored by 王波's avatar 王波

Merge branch 'b_template_component_bugfixed_20200519' into 'b-template-component'

B template component bugfixed 20200519

See merge request !22
parents 5755b01b 3a9af120
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<select value="{{searchInfo.prizeDataType}}" onChange="handleInputChange" data-name='prizeDataType'> <select value="{{searchInfo.prizeDataType}}" onChange="handleInputChange" data-name='prizeDataType'>
<option value="">全部</option> <option value="">全部</option>
<% for(var i = 0; i < formatPrize.length; ++i) {%> <% for(var i = 0; i < formatPrize.length; ++i) {%>
<%- `<option value="${formatPrize[i].prizeDataType}">${formatPrize[i].name}</option> ` <%- `<option value="${formatPrize[i].prizeDataType}">${formatPrize[i].prizeSource}</option> `
%><% } %> %><% } %>
</select> </select>
</form-item> </form-item>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<table-column title="发奖来源" dataIndex="prizeDataType"> <table-column title="发奖来源" dataIndex="prizeDataType">
<view slot-scope="x"> <view slot-scope="x">
<% for(var i = 0; i < formatPrize.length; ++i) {%> <% for(var i = 0; i < formatPrize.length; ++i) {%>
<%- `<text a:if="{{x.record.prizeDataType == ${formatPrize[i].prizeDataType}}}">${formatPrize[i].name}</text> ` <%- `<text a:if="{{x.record.prizeDataType == ${formatPrize[i].prizeDataType}}}">${formatPrize[i].prizeSource}</text> `
%><% } %> %><% } %>
</view> </view>
</table-column> </table-column>
......
...@@ -8,7 +8,15 @@ ...@@ -8,7 +8,15 @@
<!-- 数据需求时间范围 --> <!-- 数据需求时间范围 -->
<form class="edit-content-form" data-name="form" inline="true" labelTextAlign="center" size="large"> <form class="edit-content-form" data-name="form" inline="true" labelTextAlign="center" size="large">
<form-item class="edit-content-formItem" label="统计时间" labelTextAlign="center" asterisk="{{false}}"> <form-item class="edit-content-formItem" label="统计时间" labelTextAlign="center" asterisk="{{false}}">
<range-picker style="width: 400px" onChange="handleTimeRangeChange" hasClear="true" value="{{timeRange}}" class="block" data-time="{{timeRange}}"/> <range-picker
style="width: 400px"
onChange="handleTimeRangeChange"
hasClear="true"
value="{{timeRange}}"
class="block"
data-time="{{timeRange}}"
format="YYYY/MM/DD"
/>
</form-item> </form-item>
<view class="operator-btns" style="textAlign:center"> <view class="operator-btns" style="textAlign:center">
<button style="margin-left:20px;height:32px" type="primary" onTap="handleExport" size="medium">导出</button> <button style="margin-left:20px;height:32px" type="primary" onTap="handleExport" size="medium">导出</button>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<items-config itemIds="{{itemIds}}" onUpdate="onItemIdsChange"/> <items-config itemIds="{{itemIds}}" onUpdate="onItemIdsChange"/>
</form-item> </form-item>
<form-item label="任务奖励"> <form-item label="任务奖励">
<input onChange="onChange" data-name="value" defaultValue="{{value}}" name="value" addonTextAfter="{{unit}}" placeholder="1-999" maxLength="{{3}}"/> <input data-name="value" value="{{value}}" addonTextAfter="{{unit}}" placeholder="1-999" maxLength="{{3}}" onChange="onChange" />
<!--<view class="item-txt">{{value}}{{unit}}</view> --> <!--<view class="item-txt">{{value}}{{unit}}</view> -->
</form-item> </form-item>
</form> </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment