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

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

@@ -14,7 +14,7 @@
             margin-bottom: 20px;
         }
         #searchIpt {
-            display: none;
+            /* display: none; */
         }
         .phoneNumber,.playMethod {
             display: none;
@@ -158,15 +158,15 @@
     <div id="scoreType" class="main_type">
         <span class="labelName"><i class="required">*</i>类别：</span>
         <div class="layui-input-block" style="display: flex">
-            <input type="radio" value="0" name="selectType" checked><span>商品</span>
-            <input type="radio" value="1" name="selectType"><span>券</span>
+            <!-- <input type="radio" value="0" name="selectType" checked><span>商品</span> -->
+            <input type="radio" value="1" name="selectType" checked><span>券</span>
         </div>
     </div>
     <div class="scope_application" id="scope_application">
         <span class="labelName"><i class="required">*</i>券名称：</span>
         <div class="search_ipt" style="position: relative;display: inline;">
             <input type="text" id="searchIpt" autocomplete="off" class="layui-input" placeholder="全部">
-            <input type="text" id="searchIptMall" autocomplete="off" class="layui-input" placeholder="全部">
+            <!-- <input type="text" id="searchIptMall" autocomplete="off" class="layui-input" placeholder="全部"> -->
             <ul id="dataList" style="position: absolute;"></ul>
         </div>
     </div>
@@ -278,8 +278,9 @@
     let showPicture = ''; // 展示图片
     let limit = ''; // 限兑次数
     let itemId = ''; // 
-    let selectType = ''
+    let selectType = '1'
     let type = '';
+    console.log('检测')
     $(document).ready(function() {
         var $summernote = $('#summernote').summernote({
             height: 300,
@@ -551,7 +552,7 @@
             delete data.endTime
         }
         if (selectType == 1) {
-            delete data.targetId
+            // delete data.targetId
             data['type'] = 1
         } else {
             data['type'] = 11