Merge branch 'dev/v1.0.53_yf' of jianyu/web into feature/v1.0.53

apps/bigmember_pc/src/views/collection/model/modules/data-collect-tag.js

@@ -167,7 +167,7 @@ export function dataCollectTagModel (params) {
         if (params.lids !== '') {
           saveChooseTags(params, function () {
             $('.tags-footer .button-cancel').trigger('click')
-            $bus.$emit('bidding:updateCollectList')
+            $bus.$emit('bidding:updateCollectList', { label: '' })
             // getLabelQuery()
           })
         }

apps/bigmember_pc/src/views/search/bidding/index.vue

@@ -638,6 +638,10 @@ const articleRef = ref({
       color: #999999;
       line-height: 22px;
     }
+    .el-date-editor.el-input,
+    .el-date-editor.el-input__inner{
+      width: 228px;
+    }
   }
   .over-run-tips {
     color: #686868;

apps/bigmember_pc/src/views/search/bidding/model/base.js

@@ -91,8 +91,8 @@ export default function () {
 
   // 是否在工作台内
   // 本地调试，可改为工作台内isInApp = ref(true)，  isInWeb = ref(false)   提交记得改回！
-  const isInApp = ref(InContainer.inApp)
-  const isInWeb = ref(InContainer.inWeb)
+  const isInApp = ref(true)
+  const isInWeb = ref(false)
 
   // 是否是渠道商
   const cooperateCode = ref(false)

apps/bigmember_pc/src/views/search/ent/model/base.js

@@ -144,7 +144,7 @@ export default function () {
   const listState = reactive({
     finished,
     loading,
-    pageNum: 0,
+    pageNum: 1,
     pageSize: 10,
     total
   })
@@ -267,7 +267,7 @@ export default function () {
   function getParams() {
     return {
       match: inputKeywordsState.value.input,
-      pageNum: listState.pageNum,
+      pageNum: listState.pageNum - 1,
       pageSize: listState.pageSize,
       ...getFormatAPIParams()
     }