Merge branch 'master' into hjc

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetActiveController.java

@@ -57,6 +57,9 @@ import java.util.List;
 public class SweetActiveController extends BaseController {
     private String prefix = "zhengzai/sweet/qrCode";
 
+    @Value("${liquidnet.client.admin.platformUrl}")
+    private String platformUrl;
+
 
     @Autowired
     private ISweetAdminActiveTypeService sweetAdminActiveTypeService;
@@ -131,6 +134,7 @@ public class SweetActiveController extends BaseController {
     @GetMapping("/addQrCode/{type}")
     public String addQrCode(@PathVariable("type") String type, ModelMap mmap) {
         mmap.put("type", type);
+        mmap.put("platformUrl", platformUrl);
         return prefix + "/addQrCode";
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/category/category.html

@@ -162,13 +162,16 @@
             </div>
             <div class="gitPic">
                 <img id="viewImg" src="" alt="" style="max-height:150px;margin-top: 12px;margin-left: 12px;">
-                <div class="ibox-content" style="border: none;padding-bottom: 0;">
+                <div class="ibox-content" style="border: none;padding-bottom: 0;display:flex;align-items:center;">
+                    <em style="color:red;margin-right:12px">*</em>
                     <div class="form-group">
                         <div class="file-loading">
                             <input id="fileinput" type="file" name="file" data-browse-on-zone-click="true" data-theme="fas">
                         </div>
                     </div>
+                    <p style="margin-left:12px;">图片尺寸为54PX,比例为1:1</p>
                 </div>
+                
             </div>
             <div class="bottomBtn">
                 <a src="javascript:;" class="layui-layer-btn0 paddings" onclick="yes(1,2)">确定</a>
@@ -313,7 +316,7 @@
             name = $("#threeIpt").val();
             catePid = $("#secondTypeSelect").val();
         }
-        if (!name) {
+        if (!name || !$("#viewImg").attr('src')) {
             return layer.msg('请将必填项填写完整！')
         }
         let data = {
@@ -328,9 +331,14 @@
             url: '/goblin/category/addSave',
             data,
             success: function (res) {
+                console.log(res, '121212')
+                if (res.code == 0) {
                     $("pull-right button[type=refresh]").click();
                     closeModal ();
                     refreshItem();
+                } else {
+                    layer.msg(res.msg)
+                }
             }
         })
         

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -130,7 +130,7 @@ liquidnet:
       xxl:
         admin:
           addresses: 172.17.207.177:8090
-#          addresses: 192.168.96.147:8090
+  #          addresses: 192.168.96.147:8090
   client:
     admin:
       phpPayUrl: http://testdragon.zhengzai.tv