修改支付宝小程序下的搜索显示
parent
b9f7eac0f5
commit
bb81088ba7
|
|
@ -1007,4 +1007,14 @@ export const time_stamp = (time, date_style = 'horizontal', date_type) => {
|
|||
} else {
|
||||
return `${year}${style.year}${month}${style.month}${day}${style.day}${hours}${style.hour}${minutes}${style.minute}${seconds}${date_style == 'chinese' ? style.second : ''}`;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const video_get_top_left_padding = () => {
|
||||
var pages = getCurrentPages();
|
||||
if (pages.length > 1) {
|
||||
return 'padding-left: 30rpx;box-sizing: border-box;';
|
||||
} else {
|
||||
return 'padding-left: 140rpx;box-sizing: border-box;';
|
||||
}
|
||||
}
|
||||
|
|
@ -22,10 +22,10 @@
|
|||
<view class="form-content margin-top-xxxl padding-top-xxl">
|
||||
<view class="verify pr margin-vertical-main">
|
||||
<input type="text" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" :value="form_input_image_verify_value" @input="form_input_image_verify_event" />
|
||||
<image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="sms" @tap="image_verify_event"></image>
|
||||
<image v-if="(verify_image_url || null) != null" :src="verify_image_url" class="verify-image pa" mode="aspectFit" data-type="sms" @tap.stop="image_verify_event"></image>
|
||||
</view>
|
||||
<view class="margin-top-xxxl margin-bottom-xxxl">
|
||||
<button :class="'bg-main br-main cr-white round text-size' + ( verify_disabled ? ' verify_disabled' : '')" type="default" @tap="popup_image_verify_submit_event" hover-class="none" :disabled="verify_disabled">{{ $t('common.confirm') }}</button>
|
||||
<button :class="'bg-main br-main cr-white round text-size' + ( verify_disabled ? ' verify_disabled' : '')" type="default" @tap.stop="popup_image_verify_submit_event" hover-class="none" :disabled="verify_disabled">{{ $t('common.confirm') }}</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -86,12 +86,12 @@
|
|||
};
|
||||
},
|
||||
watch: {
|
||||
propValue: {
|
||||
handler(newVal) {
|
||||
this.init();
|
||||
},
|
||||
deep: true
|
||||
},
|
||||
// propValue: {
|
||||
// handler(newVal) {
|
||||
// this.init();
|
||||
// },
|
||||
// deep: true
|
||||
// },
|
||||
propKey(val) {
|
||||
// 初始化
|
||||
this.init();
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
forminput_item_id: this.propDataId,
|
||||
accounts: this.form_value,
|
||||
type: 'sms',
|
||||
verify:this.com_data.is_img_sms_verification == '1' ? this.form_input_image_verify_value : ''
|
||||
verify: this.com_data.is_img_sms_verification == '1' ? this.form_input_image_verify_value : ''
|
||||
}
|
||||
let self = this;
|
||||
uni.request({
|
||||
|
|
@ -211,11 +211,11 @@
|
|||
uni.hideLoading();
|
||||
if (res.data.code == 0) {
|
||||
// 是否开启图片验证码
|
||||
if (this.com_data.is_img_sms_verification == '1') {
|
||||
this.setData({
|
||||
if (self.com_data.is_img_sms_verification == '1') {
|
||||
self.setData({
|
||||
popup_image_verify_status: false,
|
||||
});
|
||||
this.z_index_change('');
|
||||
self.z_index_change('');
|
||||
}
|
||||
// 倒计时处理
|
||||
var temp_time = this.verify_time_total;
|
||||
|
|
@ -234,24 +234,30 @@
|
|||
}
|
||||
}, 1000);
|
||||
} else {
|
||||
this.setData({
|
||||
verify_submit_text: this.$t('login.login.s665h5'),
|
||||
self.setData({
|
||||
verify_submit_text: self.$t('login.login.s665h5'),
|
||||
verify_disabled: false,
|
||||
form_input_image_verify_value: '',
|
||||
});
|
||||
this.image_verify_event('sms');
|
||||
// 是否开启图片验证码
|
||||
if (self.com_data.is_img_sms_verification == '1') {
|
||||
self.image_verify_event('sms');
|
||||
}
|
||||
app.globalData.showToast(res.data.msg);
|
||||
}
|
||||
},
|
||||
fail: () => {
|
||||
uni.hideLoading();
|
||||
this.setData({
|
||||
verify_submit_text: this.$t('login.login.s665h5'),
|
||||
self.setData({
|
||||
verify_submit_text: self.$t('login.login.s665h5'),
|
||||
verify_disabled: false,
|
||||
form_input_image_verify_value: '',
|
||||
});
|
||||
this.image_verify_event('sms');
|
||||
app.globalData.showToast(this.$t('common.internet_error_tips'));
|
||||
// 是否开启图片验证码
|
||||
if (self.com_data.is_img_sms_verification == '1') {
|
||||
self.image_verify_event('sms');
|
||||
}
|
||||
app.globalData.showToast(self.$t('common.internet_error_tips'));
|
||||
},
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -3,10 +3,14 @@
|
|||
<!-- 搜索框 -->
|
||||
<view v-if="!show_comment_modal" class="header-top" :style="top_content_style + menu_button_info">
|
||||
<view id="search-height" class="flex-row align-c">
|
||||
<!-- 支付宝小程序自带返回按钮,这里就不给返回按钮了,这里给留出一点空间就行 -->
|
||||
<!-- #ifndef MP-ALIPAY -->
|
||||
<view class="cp" @tap="handle_back">
|
||||
<iconfont name="icon-arrow-left " size="36rpx" color="#333" class="mr-10"></iconfont>
|
||||
</view>
|
||||
<view class="wh-auto ht-auto">
|
||||
<!-- #endif -->
|
||||
{{ header_padding_left }}
|
||||
<view class="wh-auto ht-auto" :style="header_padding_left">
|
||||
<search-component :propIsDisabled="true" @disabled_search="handle_search" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -123,7 +127,7 @@
|
|||
<script>
|
||||
const app = getApp();
|
||||
import videoList from '@/pages/plugins/video/detail/video_list.json';
|
||||
import { get_math, isEmpty } from '@/common/js/common/common.js';
|
||||
import { get_math, isEmpty, video_get_top_left_padding } from '@/common/js/common/common.js';
|
||||
import loadingComponent from '@/pages/plugins/video/components/loading.vue';
|
||||
import commentInfoComponent from '@/pages/plugins/video/components/comment-info.vue';
|
||||
import commentMoreComponent from '@/pages/plugins/video/components/comment-more.vue';
|
||||
|
|
@ -131,8 +135,8 @@
|
|||
import componentSharePopup from '@/components/share-popup/share-popup';
|
||||
// 状态栏高度
|
||||
var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
|
||||
// #ifdef MP-TOUTIAO
|
||||
bar_height = 0;
|
||||
// #ifdef MP-TOUTIAO || H5
|
||||
bar_height = 7;
|
||||
// #endif
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -144,12 +148,7 @@
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
// #ifdef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 7 + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
// #ifndef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
videoData: videoList,
|
||||
display_video_list: [],
|
||||
current_index: 0,
|
||||
|
|
@ -174,6 +173,7 @@
|
|||
menu_button_info: '',
|
||||
share_info: {},
|
||||
params: {},
|
||||
header_padding_left: '',
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -232,7 +232,13 @@
|
|||
}
|
||||
// #endif
|
||||
// #endif
|
||||
// 视频详情页,需要添加padding-left
|
||||
let padding_left = '';
|
||||
// #ifdef MP-ALIPAY
|
||||
padding_left = video_get_top_left_padding();
|
||||
// #endif
|
||||
this.setData({
|
||||
header_padding_left: padding_left,
|
||||
menu_button_info: menu_button_info,
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -5,11 +5,10 @@
|
|||
<!-- 搜索框 -->
|
||||
<view class="header-top">
|
||||
<view class="ht-auto" :style="top_content_style + menu_button_info">
|
||||
<view id="search-height" class="wh-auto ht-auto">
|
||||
<view id="search-height" class="wh-auto ht-auto" :style="header_padding_left">
|
||||
<search-component :propSearchQuery="search_query" :propIsDisabled="true" @disabledSearch="handle_search"/>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<template v-if="recommend_videos.length > 0">
|
||||
<!-- 导航栏 -->
|
||||
<view class="nav-tabs">
|
||||
|
|
@ -52,11 +51,12 @@
|
|||
<script>
|
||||
import searchComponent from '@/pages/plugins/video/components/search.vue';
|
||||
import componentNoData from '@/components/no-data/no-data';
|
||||
import { video_get_top_left_padding } from '@/common/js/common/common.js';
|
||||
const app = getApp();
|
||||
// 状态栏高度
|
||||
var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
|
||||
// #ifdef MP-TOUTIAO
|
||||
bar_height = 0;
|
||||
// #ifdef MP-TOUTIAO || H5
|
||||
bar_height = 7;
|
||||
// #endif
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -65,12 +65,7 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
// #ifdef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 7 + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
// #ifndef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
search_query: '',
|
||||
tabs: ['推荐', 'DIV装修', '商城管理', '多商户', '多门店', '客服','多门店', '客服'],
|
||||
currentTab: 0,
|
||||
|
|
@ -79,6 +74,7 @@ export default {
|
|||
data_list_loding_status: 1,
|
||||
data_list_loding_msg: '',
|
||||
menu_button_info: '',
|
||||
header_padding_left: '',
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -99,8 +95,13 @@ export default {
|
|||
}
|
||||
// #endif
|
||||
// #endif
|
||||
let padding_left = '';
|
||||
// #ifdef MP-ALIPAY
|
||||
padding_left = video_get_top_left_padding();
|
||||
// #endif
|
||||
setTimeout(() => {
|
||||
this.setData({
|
||||
header_padding_left: padding_left,
|
||||
menu_button_info: menu_button_info,
|
||||
data_list_loding_status: 0,
|
||||
recommend_videos: [
|
||||
|
|
@ -136,34 +137,6 @@ export default {
|
|||
});
|
||||
}, 100);
|
||||
},
|
||||
get_top_content_style(custom_height) {
|
||||
const this_ = this;
|
||||
// 获取搜索区域的高度
|
||||
this.$nextTick(() => {
|
||||
const query = uni.createSelectorQuery().in(this_);
|
||||
// 选择我们想要的元素
|
||||
query.select('#search-height').boundingClientRect((res) => {
|
||||
console.log(res, '1144');
|
||||
if ((res || null) != null) {
|
||||
// 判断搜索跟胶囊的大小间隔
|
||||
const top_height = custom_height == 0 ? 0 : (res.height - custom_height) / 2;
|
||||
let top_content_style = '';
|
||||
// #ifdef MP
|
||||
top_content_style = 'padding-top:' + (bar_height + 5 - top_height) + 'px;padding-bottom:10px;';
|
||||
// #endif
|
||||
// #ifdef H5 || MP-TOUTIAO
|
||||
top_content_style = 'padding-top:' + (bar_height + 7 - top_height) + 'px;padding-bottom:10px;';
|
||||
// #endif
|
||||
// #ifdef APP
|
||||
top_content_style = 'padding-top:' + bar_height - top_height + 'px;padding-bottom:10px;';
|
||||
// #endif
|
||||
this_.setData({
|
||||
top_content_style: top_content_style
|
||||
});
|
||||
}
|
||||
}).exec(); // 执行查询
|
||||
});
|
||||
},
|
||||
handle_search() {
|
||||
// 跳转到搜索记录页面
|
||||
app.globalData.url_open(`/pages/plugins/video/search/search-record`, false);
|
||||
|
|
|
|||
|
|
@ -3,10 +3,13 @@
|
|||
<!-- 搜索框 -->
|
||||
<view class="header-top" :style="top_content_style + menu_button_info">
|
||||
<view id="search-height" class="flex-row align-c">
|
||||
<!-- 支付宝小程序自带返回按钮,这里就不给返回按钮了,这里给留出一点空间就行 -->
|
||||
<!-- #ifndef MP-ALIPAY -->
|
||||
<view class="cp" @tap="handle_back">
|
||||
<iconfont name="icon-arrow-left " size="36rpx" color="#333" class="mr-10"></iconfont>
|
||||
</view>
|
||||
<view class="wh-auto ht-auto">
|
||||
<!-- #endif -->
|
||||
<view class="wh-auto ht-auto" :style="header_padding_left">
|
||||
<search-component :propSearchQuery="search_query" @search="handle_search" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -55,12 +58,13 @@
|
|||
<script>
|
||||
import searchComponent from '@/pages/plugins/video/components/search.vue';
|
||||
import loadingComponent from '@/pages/plugins/video/components/loading.vue';
|
||||
import { video_get_top_left_padding } from '@/common/js/common/common.js';
|
||||
const app = getApp();
|
||||
var system = app.globalData.get_system_info(null, null, true);
|
||||
// 状态栏高度
|
||||
var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
|
||||
// #ifdef MP-TOUTIAO
|
||||
bar_height = 0;
|
||||
// #ifdef MP-TOUTIAO || H5
|
||||
bar_height = 7;
|
||||
// #endif
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -69,12 +73,7 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
// #ifdef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 7 + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
// #ifndef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
search_query: '',
|
||||
search_history: [
|
||||
{ text: '软件升级规则' },
|
||||
|
|
@ -95,7 +94,8 @@ export default {
|
|||
{ title: '今天最好的表现是明天最低的要求', hotness: '311' },
|
||||
{ title: '今天最好的表现是明天最低的要求', hotness: '311' }
|
||||
],
|
||||
is_view_more: false
|
||||
is_view_more: false,
|
||||
header_padding_left: '',
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -116,7 +116,13 @@ export default {
|
|||
}
|
||||
// #endif
|
||||
// #endif
|
||||
|
||||
let padding_left = '';
|
||||
// #ifdef MP-ALIPAY
|
||||
padding_left = video_get_top_left_padding();
|
||||
// #endif
|
||||
this.setData({
|
||||
header_padding_left: padding_left,
|
||||
menu_button_info: menu_button_info
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -6,10 +6,13 @@
|
|||
<view class="header-top">
|
||||
<view class="header-search" :style="top_content_style + menu_button_info">
|
||||
<view id="search-height" class="flex-row align-c">
|
||||
<!-- 支付宝小程序自带返回按钮,这里就不给返回按钮了,这里给留出一点空间就行 -->
|
||||
<!-- #ifndef MP-ALIPAY -->
|
||||
<view class="cp" @tap="handle_back">
|
||||
<iconfont name="icon-arrow-left " size="36rpx" color="#333" class="mr-10"></iconfont>
|
||||
</view>
|
||||
<view class="wh-auto ht-auto">
|
||||
<!-- #endif -->
|
||||
<view class="wh-auto ht-auto" :style="header_padding_left">
|
||||
<search-component :propSearchQuery="search_query" @search="handle_search" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -76,11 +79,12 @@ import searchComponent from '@/pages/plugins/video/components/search.vue';
|
|||
import componentPopup from '@/components/popup/popup';
|
||||
import loadingComponent from '@/pages/plugins/video/components/loading.vue';
|
||||
import componentNoData from '@/components/no-data/no-data';
|
||||
import { video_get_top_left_padding } from '@/common/js/common/common.js';
|
||||
const app = getApp();
|
||||
// 状态栏高度
|
||||
var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
|
||||
// #ifdef MP-TOUTIAO
|
||||
bar_height = 0;
|
||||
// #ifdef MP-TOUTIAO || H5
|
||||
bar_height = 7;
|
||||
// #endif
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -91,12 +95,7 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
// #ifdef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 7 + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
// #ifndef H5 || MP-TOUTIAO
|
||||
top_content_style: 'padding-top:' + bar_height + 'px;padding-bottom:10px;',
|
||||
// #endif
|
||||
search_query: '',
|
||||
tabs: ['推荐', 'DIV装修', '商城管理', '多商户', '多门店', '客服','多门店', '客服'],
|
||||
currentTab: 0,
|
||||
|
|
@ -148,6 +147,7 @@ export default {
|
|||
scope: '1',
|
||||
},
|
||||
is_more_loading: false,
|
||||
header_padding_left: '',
|
||||
};
|
||||
},
|
||||
onLoad(params) {
|
||||
|
|
@ -175,7 +175,13 @@ export default {
|
|||
}
|
||||
// #endif
|
||||
// #endif
|
||||
|
||||
let padding_left = '';
|
||||
// #ifdef MP-ALIPAY
|
||||
padding_left = video_get_top_left_padding();
|
||||
// #endif
|
||||
this.setData({
|
||||
header_padding_left: padding_left,
|
||||
menu_button_info: menu_button_info,
|
||||
});
|
||||
// 获取头部的高度
|
||||
|
|
|
|||
Loading…
Reference in New Issue