Merge branch 'dong_1027_master' into hjc_now

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/addNewActivity.html

@@ -232,6 +232,8 @@
             $(this).fileinput("upload");
         })
         .on("fileuploaded", function (event, data) {       //上传回调事件
+            console.log(event, data)
+            if (data.response.code == 1) return layer.msg(data.response.message);
             let showPicture = 'https://img.zhengzai.tv/' + data.response.data.ossPath;
             $("#viewImg").attr('src', showPicture)
         })
@@ -362,7 +364,7 @@
             endTime: $("#endTime").val(),
             startTime: $("#startTime").val(),
             name: $("#selectShow").val(),
-            performanceId: $("#selectShow").attr('data-id'),
+            performanceId: $("#selectShow").attr('data-id').split(',')[$("#selectShow").attr('data-id').split(',').length - 1],
             performanceImg: $("#viewImg").attr('src')
         } // endTime
         if (marketId) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/setGoodsRole.html

@@ -128,20 +128,20 @@
                             align: 'center'
                         },
                         {
-                            field: 'buyLimit',
+                            field: 'stockMarketing',
                             // title: '库存限量<a onclick="setPrice(2)">批量</a>',
                             title: '库存限量',
                             width: '150',
                             align: 'center',
-                            formatter: function (value, row, index) {
-                                let str = '';
-                                if (value == 0) {
-                                    str = '无限量';
-                                } else {
-                                    str = value;
-                                }
-                                return str
-                            }
+                            // formatter: function (value, row, index) {
+                            //     let str = '';
+                            //     if (value == 0) {
+                            //         str = '无限量';
+                            //     } else {
+                            //         str = value;
+                            //     }
+                            //     return str
+                            // }
                         },
                         {
                             field: 'buyLimit',
@@ -165,20 +165,20 @@
                                 if (value == 0) {
                                     return `<div style="display:flex;">
                                     <label style="margin-right:12px;">
-                                        <input type="radio" checked value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
+                                        <input disabled type="radio" checked value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
+                                        <input disabled type="radio" value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
+                                        <input disabled type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
                                     </div>`   
                                 } else {
                                     return `<div style="display:flex;">
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
+                                        <input disabled type="radio" value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" checked value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
+                                        <input disabled type="radio" checked value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
+                                        <input disabled type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
                                     </div>`   
                                 }