Merge remote-tracking branch 'origin/dev_stone' into dev_stone

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -45,16 +45,6 @@
         .layui-form .money input {
             width: 60px;
         }
-        .changeData .dataOne {
-            margin-bottom: 20px;
-        }
-        .changeData .dataOne p {
-            margin: 12px 0 0 20px;
-            color: #ccc;
-        }
-        .changeData .dataOne input {
-            width: 60px;
-        }
         .main_bottom .describe, .main_bottom .sendTime {
             margin-bottom: 20px;
         }
@@ -200,7 +190,7 @@
         </div>
         <div class="bottom_btn">
             <!-- <button type="button" class="layui-btn btn btn-primary" lay-filter="formDemo" onclick="create()">创建代金券</button> -->
-            <button type="button" class="btn btn-primary" onclick="create()">创建</button>
+            <button type="button" class="btn btn-primary" onclick="create()">确  定</button>
         </div>
     </div>
     
@@ -483,6 +473,7 @@
             success: function (res) {
                 $("#showPic"+showIndex).attr('src','https://img.zhengzai.tv/' + res.data.ossPath)
                 data[showIndex].prizeImg = 'https://img.zhengzai.tv/' + res.data.ossPath;
+                $("#ceshi").val("");
                 // $summernote.summernote('insertImage', 'https://img.zhengzai.tv/' + data.data.ossPath)
             }
         });

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/util/InnerUtils.java

@@ -23,7 +23,7 @@ public class InnerUtils {
         MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
         header.add("Accept", "application/json;charset=UTF-8");
         header.add("Authorization", "Bearer " + CurrentUtil.getToken());
-        String resultData = HttpUtil.post(adamUrl + "/adam/user/gif/mobile", null, header);
+        String resultData = HttpUtil.post("http://devadam.zhengzai.tv" + "/adam/user/gif/mobile", null, header);
         ResponseDto<AdamUserInfoSimpleVo> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamUserInfoSimpleVo>>() {
         });
         return innerReturnVo.getData();