Merge branch 'pre' into 'master'

Pre

See merge request !139

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStore.html

@@ -87,7 +87,7 @@
                         field: '',
                         title: '序号',
                         formatter: function (value, row, index) {
-                            return index + 1
+                            return row.mid;
                         }
                     },
                     {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html

@@ -358,7 +358,7 @@
                     $("#searchIpt").val(data.targetTitle);
                     $("#integralNum").val(data.score);
                     $("#inventory").val(data.generalTotal);
-                    showId = data.generalTotal;
+                    showId = data.targetId;
                     // $("#goodsDetail").val(data.details);
                     $('#summernote').summernote('code', data.details)
                     $('.summernote').eq(1).summernote('code', data.notice)
@@ -383,6 +383,9 @@
                         var simpleTypeData = data.simpleType.toString();
                         $("#labelSelectType").find("option[value=" + simpleTypeData + "]").attr("selected",true);
                     }
+                    if (!showId) {
+                        $('.labelSelect').hide();
+                    }
                 }
             })
         }
@@ -559,6 +562,7 @@
             targetTitle: $('#searchIpt').val() || $("#searchIptMall").val(), // 目标物品标题
             simpleType: $('#labelSelectType option:selected').val()
         }
+        console.log(showId)
         let type = 'post';
         if (!itemId) {
             delete data.itemId