Commit 0958ff95 authored by zhengke's avatar zhengke

no message

parent 7fc2f016
...@@ -169,6 +169,7 @@ ...@@ -169,6 +169,7 @@
let items = value.data.map(item => { let items = value.data.map(item => {
let obj = {} let obj = {}
obj['key'] = value.letter obj['key'] = value.letter
obj['Id'] = item.Id
obj['img'] = item.Logo obj['img'] = item.Logo
obj['name'] = item.Name obj['name'] = item.Name
obj['itemIndex'] = index obj['itemIndex'] = index
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
"quickapp" : {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxacd9f8cc3480d29e", "appid" : "wx974a776429e03ee6",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"minified" : false "minified" : false
......
<template>
<view class="u-search" :style="{'margin':margin}">
<view
class="u-content"
:style="{
backgroundColor: bgColor,
borderRadius: radius+'px',
border: borderStyle,
height: height + 'rpx'
}"
>
<view class="u-icon-wrap"><u-icon class="u-clear-icon" :size="30" name="search" color="#909399"></u-icon></view>
<input
confirm-type="search"
@blur="blur"
:value="value"
@confirm="search"
@input="inputChange"
:disabled="disabled"
@focus="getFocus"
:focus="focus"
placeholder-class="u-placeholder-class"
:placeholder="placeholder"
class="u-input"
type="text"
:style="[{
textAlign: inputAlign,
color:textColor
}, inputStyle]"
/>
<view class="u-close-wrap" v-if="keyword && clearabled && focused" @touchstart="clear">
<u-icon class="u-clear-icon" name="cross" :size="16" color="#fff" @touchstart="clear"></u-icon>
</view>
</view>
<view :style="[actionStyle]" class="u-action"
:class="[showActionBtn || show ? 'u-action-active' : '']"
@touchstart.stop.prevent="custom"
>{{ actionText }}</view>
</view>
</template>
<script>
/**
* search 搜索框
* @description 搜索组件,集成了常见搜索框所需功能,用户可以一键引入,开箱即用。
* @tutorial https://www.uviewui.com/components/search.html
* @property {String} shape 搜索框形状,round-圆形,square-方形(默认round)
* @property {String} bg-color 搜索框背景颜色(默认#f2f2f2)
* @property {String} border-color 边框颜色,配置了颜色,才会有边框
* @property {String} placeholder 占位文字内容(默认“请输入关键字”)
* @property {Boolean} clearabled 是否启用清除控件(默认true)
* @property {Boolean} focus 是否自动获得焦点(默认false)
* @property {Boolean} show-action 是否显示右侧控件(默认true)
* @property {String} action-text 右侧控件文字(默认“搜索”)
* @property {Object} action-style 右侧控件的样式,对象形式
* @property {String} input-align 输入框内容水平对齐方式(默认left)
* @property {Boolean} disabled 是否启用输入框(默认false)
* @property {Boolean} animation 是否开启动画,见上方说明(默认false)
* @property {String} value 输入框初始值
* @property {Boolean} input-style input输入框的样式,可以定义文字颜色,大小等,对象形式
* @property {String Number} height 输入框高度,单位rpx(默认64)
* @event {Function} change 输入框内容发生变化时触发
* @event {Function} search 用户确定搜索时触发,用户按回车键,或者手机键盘右下角的"搜索"键时触发
* @event {Function} custom 用户点击右侧控件时触发
* @example <u-search placeholder="日照香炉生紫烟" v-model="keyword"></u-search>
*/
export default {
name: "u-search",
props: {
// 搜索框形状,round-圆形,square-方形
shape: {
type: String,
default: 'round'
},
textColor:{
type: String,
default: '#000'
},
margin:{
type: String,
default: '0'
},
// 搜索框背景色,默认值#f2f2f2
bgColor: {
type: String,
default: '#FFFFFF'
},
radius:{
type: Number,
default: 5
},
// 占位提示文字
placeholder: {
type: String,
default: '请输入关键字'
},
// 是否启用清除控件
clearabled: {
type: Boolean,
default: true
},
// 是否自动聚焦
focus: {
type: Boolean,
default: false
},
// 是否在搜索框右侧显示取消按钮
showAction: {
type: Boolean,
default: true
},
// 右边控件的样式
actionStyle: {
type: Object,
default() {
return {};
}
},
// 取消按钮文字
actionText: {
type: String,
default: '搜索'
},
// 输入框内容对齐方式,可选值为 left|center|right
inputAlign: {
type: String,
default: 'left'
},
// 是否启用输入框
disabled: {
type: Boolean,
default: false
},
// 开启showAction时,是否在input获取焦点时才显示
animation: {
type: Boolean,
default: false
},
// 边框颜色,只要配置了颜色,才会有边框
borderColor: {
type: String,
default: 'none'
},
// 输入框的初始化内容
value: {
type: String,
default: ''
},
// 搜索框高度,单位rpx
height: {
type: [Number, String],
default: 64
},
// input输入框的样式,可以定义文字颜色,大小等,对象形式
inputStyle: {
type: Object,
default() {
return {}
}
}
},
data() {
return {
keyword: '',
showClear: false, // 是否显示右边的清除图标
show: false,
// 标记input当前状态是否处于聚焦中,如果是,才会显示右侧的清除控件
focused: this.focus
// 绑定输入框的值
// inputValue: this.value
};
},
watch: {
keyword(nVal) {
// 双向绑定值,让v-model绑定的值双向变化
this.$emit('input', nVal);
// 触发change事件,事件效果和v-model双向绑定的效果一样,让用户多一个选择
this.$emit('change', nVal);
},
value: {
immediate: true,
handler(nVal) {
this.keyword = nVal;
}
},
},
computed: {
showActionBtn() {
if (!this.animation && this.showAction) return true;
else return false;
},
// 样式,根据用户传入的颜色值生成,如果不传入,默认为none
borderStyle() {
if (this.borderColor) return `1px solid ${this.borderColor}`;
else return 'none';
}
},
methods: {
// 目前HX2.6.9 v-model双向绑定无效,故监听input事件获取输入框内容的变化
inputChange(e) {
this.keyword = e.detail.value;
},
// 清空输入
// 也可以作为用户通过this.$refs形式调用清空输入框内容
clear() {
this.keyword = '';
},
// 确定搜索
search() {
this.$emit('search', this.keyword);
// 收起键盘
uni.hideKeyboard();
},
// 点击右边自定义按钮的事件
custom() {
this.$emit('custom', this.keyword);
// 收起键盘
uni.hideKeyboard();
},
// 获取焦点
getFocus() {
this.focused = true;
// 开启右侧搜索按钮展开的动画效果
if (this.animation && this.showAction) this.show = true;
this.$emit('focus', this.keyword);
},
// 失去焦点
blur() {
this.focused = false;
this.show = false;
this.$emit('blur', this.keyword);
}
}
};
</script>
<style lang="scss" scoped>
.u-search {
display: flex;
align-items: center;
flex: 1;
}
.u-content {
display: flex;
align-items: center;
padding: 0 18rpx;
flex: 1;
}
.u-clear-icon {
display: flex;
align-items: center;
}
.u-input {
flex: 1;
font-size: 28rpx;
line-height: 1;
margin: 0 10rpx;
color: $u-tips-color;
}
.u-close-wrap {
width: 34rpx;
height: 34rpx;
display: flex;
align-items: center;
justify-content: center;
background-color: rgb(200, 203, 204);
border-radius: 50%;
}
.u-placeholder-class {
color: $u-tips-color;
}
.u-action {
font-size: 28rpx;
color: $u-main-color;
width: 0;
overflow: hidden;
transition: all 0.3s;
white-space: nowrap;
text-align: center;
}
.u-action-active {
width: 80rpx;
margin-left: 10rpx;
}
</style>
...@@ -65,6 +65,10 @@ ...@@ -65,6 +65,10 @@
export default { export default {
name: 'u-upload', name: 'u-upload',
props: { props: {
obj:{
type: Object,
default: {}
},
//是否显示组件自带的图片预览功能 //是否显示组件自带的图片预览功能
showUploadList: { showUploadList: {
type: Boolean, type: Boolean,
...@@ -195,7 +199,8 @@ ...@@ -195,7 +199,8 @@
immediate: true, immediate: true,
handler(val) { handler(val) {
val.map(value => { val.map(value => {
this.lists.push({url: value.url, error: false, progress: 100}); let data = {url: value.url?value.url:value.Path, error: false, progress: 100}
this.lists.push(JSON.parse(JSON.stringify(data)));
}) })
} }
}, },
...@@ -326,7 +331,7 @@ ...@@ -326,7 +331,7 @@
this.lists[index].response = res.data; this.lists[index].response = res.data;
this.lists[index].progress = 100; this.lists[index].progress = 100;
this.lists[index].error = false; this.lists[index].error = false;
this.$emit('on-success', res.data, index, this.lists); this.$emit('on-success', res.data, index, this.lists,this.obj);
} }
}, },
fail: (e) => { fail: (e) => {
...@@ -419,10 +424,10 @@ ...@@ -419,10 +424,10 @@
width: 200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
overflow: hidden; overflow: hidden;
margin: 10rpx; /* margin: 10rpx; */
background: rgb(244, 245, 246); background: rgb(244, 245, 246);
position: relative; position: relative;
border-radius: 10rpx; /* border-radius: 10rpx; */
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
......
...@@ -84,20 +84,20 @@ ...@@ -84,20 +84,20 @@
} }
] ]
}, },
{ // {
"root": "pages/live", //赞羊、甲鹤、罗演的杂货铺 // "root": "pages/live", //赞羊、甲鹤、罗演的杂货铺
"plugins": { // "plugins": {
"live-player-plugin": { // "live-player-plugin": {
"version": "1.3.2", // "version": "1.3.2",
"provider": "wx2b03c6e691cd7370" // "provider": "wx2b03c6e691cd7370"
} // }
}, // },
"pages": [{ // "pages": [{
"path": "index" // "path": "index"
}, { // }, {
"path": "share" // "path": "share"
}] // }]
}, // },
{ {
"root": "pages/user-center", "root": "pages/user-center",
"pages": [{ "pages": [{
...@@ -880,6 +880,8 @@ ...@@ -880,6 +880,8 @@
"path": "Valuation" //我要估价 "path": "Valuation" //我要估价
},{ },{
"path": "myValuation" //等我估价 "path": "myValuation" //等我估价
},{
"path": "ValuationDetails" //估价详情
} }
] ]
} }
......
<template> <template>
<div v-if="!isloading"> <div v-if="!isloading">
<view class="ctrl-box"> <view class="ctrl-box">
<u-search action-text="搜索" :focus="true" :clearabled="true" :show-action="false" <u-searchB action-text="搜索" :focus="true" :clearabled="true" :show-action="false"
radius="40" v-model="Keywords" radius="40" v-model="Keywords"></u-searchB>
></u-search>
<!-- @search="searchHandler" @custom="searchHandler" @change="changeHandler" --> <!-- @search="searchHandler" @custom="searchHandler" @change="changeHandler" -->
</view> </view>
<!-- <view class="search-box" :style="{ background: bg }" @click="goSearch"> <!-- <view class="search-box" :style="{ background: bg }" @click="goSearch">
...@@ -172,7 +171,6 @@ ...@@ -172,7 +171,6 @@
arr = arr.filter(item=>{ arr = arr.filter(item=>{
return item.Name.indexOf(value)!=-1 return item.Name.indexOf(value)!=-1
}) })
console.log(arr,'--==')
if(arr.length>0){ if(arr.length>0){
arr.forEach(item=>{ arr.forEach(item=>{
this.list.forEach(i=>{ this.list.forEach(i=>{
...@@ -245,19 +243,16 @@ ...@@ -245,19 +243,16 @@
this.marginStyle=`${this.styleStr.top??0}px ${this.styleStr.right??0}px ${this.styleStr.bottom??0}px ${this.styleStr.left??0}px ` this.marginStyle=`${this.styleStr.top??0}px ${this.styleStr.right??0}px ${this.styleStr.bottom??0}px ${this.styleStr.left??0}px `
}, },
methods: { methods: {
// 我要估价
bindClick(e){ bindClick(e){
console.log(e,'--')
uni.navigateTo({ uni.navigateTo({
url: '/pages/Luxury/Valuation?id=1' url: '/pages/Luxury/Valuation?BrandId='+e.item.Id
}); });
}, },
chooseType(item){ chooseType(item){
this.classObj = item this.classObj = item
this.getBrand() this.getBrand()
}, },
goHome() {
uni.redirectTo({ url: "/pages/index/main" });
},
// changeHandler(){ // changeHandler(){
// }, // },
...@@ -273,7 +268,7 @@ ...@@ -273,7 +268,7 @@
{ {
url: '/api/AppletAssess/GetBrandDropList', url: '/api/AppletAssess/GetBrandDropList',
data: { data: {
CategoryId: 1 CategoryId: this.classObj.Id?this.classObj.Id:1
} }
}, },
res => { res => {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment