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

apps/bigmember_pc/src/components/selector/TimeSelectorContent.vue

@@ -37,6 +37,7 @@
           :start-placeholder="dateTimePickerState.startPlaceHolder"
           :end-placeholder="dateTimePickerState.endPlaceHolder"
           :append-to-body="false"
+          :placement="placement"
           @change="onDateRangeChange"
         >
         </el-date-picker>
@@ -53,6 +54,7 @@
           :placeholder="dateTimePickerState.startPlaceHolder"
           :picker-options="startPickerOptions"
           :append-to-body="false"
+          :placement="placement"
           @change="startDatePickerChange"
           @focus="showConfirmHandle"
         >
@@ -68,6 +70,7 @@
           :placeholder="dateTimePickerState.endPlaceHolder"
           :picker-options="endPickerOptions"
           :append-to-body="false"
+          :placement="placement"
           @change="endDatePickerChange"
           @focus="showConfirmHandle"
         >
@@ -394,6 +397,10 @@ export default {
     isDateRange: {
       type: Boolean,
       default: false
+    },
+    placement: {
+      type: String,
+      default: 'bottom-start'
     }
   },
   data() {
@@ -467,9 +474,6 @@ export default {
       this.dateTimePickerState.end = value[1]
       this.setTimeSelectListState()
       this.onChange()
-      // if(this.showConfirmButton) {
-      //   this.showConBtn = true
-      // }
     },
     calcTimeSelectList() {
       let timeSelectList = []
@@ -543,7 +547,6 @@ export default {
             this.timeSelectList.forEach((v) => (v.selected = false))
             this.dateTimePickerState.start = data.start ? new Date(data.start) : null
             this.dateTimePickerState.end =data.end ?  new Date(data.end) : null
-            // 
             this.dateTimeRangeState = [data.start, data.end]
             break
           }
@@ -610,6 +613,7 @@ export default {
     clearDateTimePicker() {
       this.dateTimePickerState.start = ''
       this.dateTimePickerState.end = ''
+      this.dateTimeRangeState = []
     },
     // 计算lately7/lately30/lastYear等的开始和结束时间
     // endTime传入一个时间戳

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

@@ -640,7 +640,9 @@ const articleRef = ref({
     }
     .el-date-editor.el-input,
     .el-date-editor.el-input__inner{
-      width: 228px;
+      width: unset;
+      background: transparent;
+      padding: 0;
     }
   }
   .over-run-tips {

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

@@ -320,18 +320,18 @@ export default function () {
     }
     const seoUrl = `/qy/${seoId}.html${BIPage}`
     const url = `/swordfish/page_big_pc/free/loading/ent/${encodeURIComponent(id)}`
+    // 渠道合作投放用户（匿名用户）不能查看画像 提示登录
     if (cooperateCode.value) {
       return goLogin()
+    }
+    if (!isLogin.value) {
+      window.open(seoUrl)
     } else {
       saveViewHistoryQuery({
         type: 'ent',
         name: `${name}_${id}`
       })
-      if (!isLogin.value) {
-        window.open(seoUrl)
-      } else {
-        window.open(url)
-      }
+      window.open(url)
     }
   }
 

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

@@ -266,14 +266,14 @@ export default function () {
     }
     const seoUrl = `/dw/${seo_id}.html${BIPage}`
     const url = `/swordfish/page_big_pc/free/loading/buyer/${buyer}`
+    // 渠道合作投放用户（匿名用户）
     if (cooperateCode.value) {
       return goLogin()
+    }
+    if (!isLogin.value) {
+      window.open(seoUrl)
     } else {
-      if (!isLogin.value) {
-        window.open(seoUrl)
-      } else {
-        window.open(url)
-      }
+      window.open(url)
     }
   }
   /**