记得上下班打卡 | git大法好,push需谨慎

Commit a1b9924e authored by 张国柄's avatar 张国柄

后台页面调整;

parent e1117cd8
...@@ -9,67 +9,67 @@ ...@@ -9,67 +9,67 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券标题:</label> <label class="col-sm-3 control-label">券标题:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${mgtCouponInfoDto.title}]] [[${mgtCouponInfoDto?.title}]]
</div> </div>
<label class="col-sm-3 control-label">发放状态:</label> <label class="col-sm-3 control-label">发放状态:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto.state)}]] [[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto?.state)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">描述说明(App显示):</label> <label class="col-sm-3 control-label">描述说明(App显示):</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.notice}]] [[${mgtCouponInfoDto?.notice}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">适用范围:</label> <label class="col-sm-3 control-label">适用范围:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${couponRule.busiName}]][[${busiNameChildNode}]] [[${couponRule?.busiName}]][[${busiNameChildNode}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券类别:</label> <label class="col-sm-3 control-label">券类别:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto.busiType)}]] [[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto?.busiType)}]]
</div> </div>
<label class="col-sm-3 control-label">类型:</label> <label class="col-sm-3 control-label">类型:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto.bindType)}]] [[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto?.bindType)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">金额:</label> <label class="col-sm-3 control-label">金额:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${mgtCouponInfoDto.valFace}]] 元 [[${mgtCouponInfoDto?.valFace}]] 元
</div> </div>
<label class="col-sm-3 control-label">数量:</label> <label class="col-sm-3 control-label">数量:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${mgtCouponInfoDto.eventAmt}]][[${mgtCouponInfoDto.bindType == 0 ? ' 张' : ' 张/账户'}]] [[${mgtCouponInfoDto?.eventAmt}]][[${mgtCouponInfoDto?.bindType == 0 ? ' 张' : ' 张/账户'}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券的有效期:</label> <label class="col-sm-3 control-label">券的有效期:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.validity}]] 天 [[${mgtCouponInfoDto?.validity}]] 天
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">兑换有效期:</label> <label class="col-sm-3 control-label">兑换有效期:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.redeemValidity}]] 天 [[${mgtCouponInfoDto?.redeemValidity}]] 天
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">生成时间:</label> <label class="col-sm-3 control-label">生成时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.createdAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.createdAt,0,19)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">发放时间:</label> <label class="col-sm-3 control-label">发放时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.eventAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.eventAt,0,19)}]]
</div> </div>
</div> </div>
</form> </form>
......
...@@ -9,67 +9,67 @@ ...@@ -9,67 +9,67 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券标题:</label> <label class="col-sm-3 control-label">券标题:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${mgtCouponInfoDto.title}]] [[${mgtCouponInfoDto?.title}]]
</div> </div>
<label class="col-sm-3 control-label">发放状态:</label> <label class="col-sm-3 control-label">发放状态:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto.state)}]] [[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto?.state)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">描述说明(App显示):</label> <label class="col-sm-3 control-label">描述说明(App显示):</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.notice}]] [[${mgtCouponInfoDto?.notice}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">适用范围:</label> <label class="col-sm-3 control-label">适用范围:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${couponRule.busiName}]][[${busiNameChildNode}]] [[${couponRule?.busiName}]][[${busiNameChildNode}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券类别:</label> <label class="col-sm-3 control-label">券类别:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto.busiType)}]] [[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto?.busiType)}]]
</div> </div>
<label class="col-sm-3 control-label">类型:</label> <label class="col-sm-3 control-label">类型:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto.bindType)}]] [[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto?.bindType)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">金额:</label> <label class="col-sm-3 control-label">金额:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${mgtCouponInfoDto.valFace}]] 元 [[${mgtCouponInfoDto?.valFace}]] 元
</div> </div>
<label class="col-sm-3 control-label">数量:</label> <label class="col-sm-3 control-label">数量:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${mgtCouponInfoDto.eventAmt}]][[${mgtCouponInfoDto.bindType == 0 ? ' 张' : ' 张/账户'}]] [[${mgtCouponInfoDto?.eventAmt}]][[${mgtCouponInfoDto?.bindType == 0 ? ' 张' : ' 张/账户'}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券的有效期:</label> <label class="col-sm-3 control-label">券的有效期:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.validity}]] 天 [[${mgtCouponInfoDto?.validity}]] 天
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">兑换有效期:</label> <label class="col-sm-3 control-label">兑换有效期:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.redeemValidity}]] 天 [[${mgtCouponInfoDto?.redeemValidity}]] 天
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">生成时间:</label> <label class="col-sm-3 control-label">生成时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.createdAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.createdAt,0,19)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">发放时间:</label> <label class="col-sm-3 control-label">发放时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.eventAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.eventAt,0,19)}]]
</div> </div>
</div> </div>
</form> </form>
......
...@@ -9,57 +9,57 @@ ...@@ -9,57 +9,57 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券标题:</label> <label class="col-sm-3 control-label">券标题:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${mgtCouponInfoDto.title}]] [[${mgtCouponInfoDto?.title}]]
</div> </div>
<label class="col-sm-3 control-label">发放状态:</label> <label class="col-sm-3 control-label">发放状态:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto.state)}]] [[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto?.state)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">描述说明(App显示):</label> <label class="col-sm-3 control-label">描述说明(App显示):</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.notice}]] [[${mgtCouponInfoDto?.notice}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">适用范围:</label> <label class="col-sm-3 control-label">适用范围:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${couponRule.busiName}]][[${busiNameChildNode}]] [[${couponRule?.busiName}]][[${busiNameChildNode}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券类别:</label> <label class="col-sm-3 control-label">券类别:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto.busiType)}]] [[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto?.busiType)}]]
</div> </div>
<label class="col-sm-3 control-label">类型:</label> <label class="col-sm-3 control-label">类型:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto.bindType)}]] [[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto?.bindType)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">数量:</label> <label class="col-sm-3 control-label">数量:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${mgtCouponInfoDto.eventAmt}]][[${mgtCouponInfoDto.bindType == 0 ? ' 张' : ' 张/账户'}]] [[${mgtCouponInfoDto?.eventAmt}]][[${mgtCouponInfoDto?.bindType == 0 ? ' 张' : ' 张/账户'}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券的有效期:</label> <label class="col-sm-3 control-label">券的有效期:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.validity}]] 天 [[${mgtCouponInfoDto?.validity}]] 天
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">生成时间:</label> <label class="col-sm-3 control-label">生成时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.createdAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.createdAt,0,19)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">发放时间:</label> <label class="col-sm-3 control-label">发放时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.eventAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.eventAt,0,19)}]]
</div> </div>
</div> </div>
</form> </form>
......
...@@ -9,67 +9,67 @@ ...@@ -9,67 +9,67 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券标题:</label> <label class="col-sm-3 control-label">券标题:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${mgtCouponInfoDto.title}]] [[${mgtCouponInfoDto?.title}]]
</div> </div>
<label class="col-sm-3 control-label">发放状态:</label> <label class="col-sm-3 control-label">发放状态:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto.state)}]] [[${@dict.getLabel('zhengzai_coupon_mgt_state', mgtCouponInfoDto?.state)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">描述说明(App显示):</label> <label class="col-sm-3 control-label">描述说明(App显示):</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.notice}]] [[${mgtCouponInfoDto?.notice}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">适用范围:</label> <label class="col-sm-3 control-label">适用范围:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${couponRule.busiName}]][[${busiNameChildNode}]] [[${couponRule?.busiName}]][[${busiNameChildNode}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券类别:</label> <label class="col-sm-3 control-label">券类别:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto.busiType)}]] [[${@dict.getLabel('zhengzai_coupon_busi_type', mgtCouponInfoDto?.busiType)}]]
</div> </div>
<label class="col-sm-3 control-label">类型:</label> <label class="col-sm-3 control-label">类型:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto.bindType)}]] [[${@dict.getLabel('zhengzai_coupon_bind_type', mgtCouponInfoDto?.bindType)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">折扣:</label> <label class="col-sm-3 control-label">折扣:</label>
<div class="form-control-static col-sm-2"> <div class="form-control-static col-sm-2">
[[${mgtCouponInfoDto.discount}]] 折 [[${mgtCouponInfoDto?.discount}]] 折
</div> </div>
<label class="col-sm-3 control-label">数量:</label> <label class="col-sm-3 control-label">数量:</label>
<div class="form-control-static col-sm-4"> <div class="form-control-static col-sm-4">
[[${mgtCouponInfoDto.eventAmt}]][[${mgtCouponInfoDto.bindType == 0 ? ' 张' : ' 张/账户'}]] [[${mgtCouponInfoDto?.eventAmt}]][[${mgtCouponInfoDto?.bindType == 0 ? ' 张' : ' 张/账户'}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">券的有效期:</label> <label class="col-sm-3 control-label">券的有效期:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.validity}]] 天 [[${mgtCouponInfoDto?.validity}]] 天
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">兑换有效期:</label> <label class="col-sm-3 control-label">兑换有效期:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${mgtCouponInfoDto.redeemValidity}]] 天 [[${mgtCouponInfoDto?.redeemValidity}]] 天
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">生成时间:</label> <label class="col-sm-3 control-label">生成时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.createdAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.createdAt,0,19)}]]
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">发放时间:</label> <label class="col-sm-3 control-label">发放时间:</label>
<div class="form-control-static col-sm-9"> <div class="form-control-static col-sm-9">
[[${#strings.substring(mgtCouponInfoDto.eventAt,0,19)}]] [[${#strings.substring(mgtCouponInfoDto?.eventAt,0,19)}]]
</div> </div>
</div> </div>
</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