|
|
@@ -153,12 +153,12 @@
|
|
|
<input id="alertTitleColor" name="alertTitleColor" class="form-control" type="text">
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!--<div class="form-group">-->
|
|
|
- <!--<label class="col-sm-3 control-label">取色器:</label>-->
|
|
|
- <!--<div class="col-sm-8">-->
|
|
|
- <!--<div id="colorTest"></div>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--</div>-->
|
|
|
+ <div class="form-group">
|
|
|
+ <label class="col-sm-3 control-label"></label>
|
|
|
+ <div class="col-sm-8">
|
|
|
+ <input type="color" name="color" id="color" onchange="changeColor()">
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</form>
|
|
|
</div>
|
|
|
<th:block th:include="include :: footer" />
|
|
|
@@ -185,13 +185,12 @@
|
|
|
getThemeInfo();
|
|
|
})
|
|
|
|
|
|
- // layui.use('colorpicker', function(){
|
|
|
- // var colorpicker = layui.colorpicker;
|
|
|
- // //渲染
|
|
|
- // colorpicker.render({
|
|
|
- // elem: '#colorTest' //绑定元素
|
|
|
- // });
|
|
|
- // });
|
|
|
+ var color = document.getElementById("color");
|
|
|
+ var colorInfo = document.getElementById("alertTitleColor");
|
|
|
+ colorInfo.value = color.value;
|
|
|
+ function changeColor(){
|
|
|
+ colorInfo.value = color.value;
|
|
|
+ }
|
|
|
|
|
|
$('.activityIconBox').on('click','.activityIconItemClear', function (res) {
|
|
|
activityImageUrlArray.splice(res.currentTarget.dataset.index,1);
|
|
|
@@ -319,6 +318,7 @@
|
|
|
}
|
|
|
if (result.data.prompt_text_color != null){
|
|
|
document.getElementById("alertTitleColor").value = result.data.prompt_text_color;
|
|
|
+ document.getElementById("color").value = result.data.prompt_text_color;
|
|
|
}
|
|
|
if (result.data.activity_icon_starttime != null){
|
|
|
document.getElementById("alertStartTime").value = result.data.activity_icon_starttime;
|