diff --git a/components/highlight-text/index.js b/components/highlight-text/index.js
new file mode 100644
index 0000000..aa49468
--- /dev/null
+++ b/components/highlight-text/index.js
@@ -0,0 +1,35 @@
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ properties: {
+ content: { type: String, value: '' },
+ keyword: { type: String, value: '' },
+ keywordColor: { type: String, value: '#008aff' }
+ },
+ observers: {
+ 'keyword': function () {
+ this.setContent()
+ }
+ },
+ data: {
+ contain: false
+ },
+ methods: {
+ setContent: function () {
+ if(this.data.keyword == null || '' == this.data.keyword || this.data.keyword.length == 0){
+ this.setData({contain: false})
+ return
+ }
+ var index = this.data.content.indexOf(this.data.keyword)
+ if(index < 0){
+ this.setData({contain: false})
+ } else {
+ var textstrA = this.data.content.substring(0, index)
+ var textstrB = this.data.content.substring(index + this.data.keyword.length)
+ this.setData({contain: true, textstrA, textstrB})
+ }
+ }
+ }
+})
\ No newline at end of file
diff --git a/components/highlight-text/index.json b/components/highlight-text/index.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/components/highlight-text/index.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+}
\ No newline at end of file
diff --git a/components/highlight-text/index.wxml b/components/highlight-text/index.wxml
new file mode 100644
index 0000000..36d2718
--- /dev/null
+++ b/components/highlight-text/index.wxml
@@ -0,0 +1,6 @@
+
+ {{textstrA}}
+ {{keyword}}
+ {{textstrB}}
+
+{{content}}
\ No newline at end of file
diff --git a/components/highlight-text/index.wxss b/components/highlight-text/index.wxss
new file mode 100644
index 0000000..cc6bf07
--- /dev/null
+++ b/components/highlight-text/index.wxss
@@ -0,0 +1,3 @@
+.keyword {
+ color: #008aff;
+}
\ No newline at end of file
diff --git a/components/popup/index.wxss b/components/popup/index.wxss
index 28686f1..75bfdfb 100644
--- a/components/popup/index.wxss
+++ b/components/popup/index.wxss
@@ -9,7 +9,7 @@
transform: translate(-50%,-50%)
}
.wux-popup-position.wux-popup-position--center .wux-popup__content {
- border-radius: 6rpx
+ border-radius: 24rpx
}
.wux-popup-position.wux-popup-position--center .wux-popup__hd {
padding: 1.3em 1.6em .5em
@@ -72,7 +72,7 @@
height: 100%;
text-align: center;
overflow: hidden;
- border-radius: 12rpx 12rpx 0rpx 0rpx;
+ border-radius: 24rpx 24rpx 0rpx 0rpx;
}
.wux-popup__title {
font-weight: 400;
diff --git a/pages/agent/order-item/index.js b/pages/agent/order-item/index.js
index b3164d6..e77a094 100644
--- a/pages/agent/order-item/index.js
+++ b/pages/agent/order-item/index.js
@@ -5,6 +5,7 @@ Component({
multipleSlots: true
},
properties: {
+ keyword: { type: String, value: null },
item: { type: Object, value: null }
},
methods: {
diff --git a/pages/agent/order-item/index.json b/pages/agent/order-item/index.json
index 4e8af46..fb73563 100644
--- a/pages/agent/order-item/index.json
+++ b/pages/agent/order-item/index.json
@@ -1,6 +1,7 @@
{
"component": true,
"usingComponents": {
+ "highlight-text": "/components/highlight-text/index",
"wux-button": "/components/button/index",
"wux-image": "/components/image/index",
"wux-timeline": "/components/timeline/index",
diff --git a/pages/agent/order-item/index.wxml b/pages/agent/order-item/index.wxml
index 8af5585..189f89a 100644
--- a/pages/agent/order-item/index.wxml
+++ b/pages/agent/order-item/index.wxml
@@ -7,7 +7,7 @@
- {{item.paperMillName}}
+
{{item.orderItems.length}}辆车
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f30b969..d057933 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -13,8 +13,7 @@
-
+
diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js
index 4c0e439..9a1ee05 100644
--- a/pages/mall/search-list/index.js
+++ b/pages/mall/search-list/index.js
@@ -18,6 +18,13 @@ Page({
pageSize: 10,
pageNum: 1
},
+ taskList: [
+ ['极客小寨小程序开发_百度百科',
+ '极客小寨微信小程序正式上线',
+ '极客小寨微信小程序有哪些?关注极客小寨微信公众号获取微信小程序最全汇总?',
+ '公众号出售-公众号价格-公众号买卖-A5公众号交易平台',
+ '如何运营出一个有吸引力的微信公众号? - 微信公众平台号 - 知乎']
+ ]
},
/**
* 生命周期函数--监听页面加载
@@ -60,7 +67,7 @@ Page({
if(!util.isEmpty(this.data.form.name) && strList.indexOf(this.data.form.name) < 0){
strList.splice(0, 0, this.data.form.name)
}
- this.setData({ rearchStringList: strList.slice(0, 24), focus: false })
+ this.setData({ rearchStringList: strList.slice(0, 24), focus: false, ['form.name']: detail.value })
},
tagClick: function(e){
this.setData({ ['form.name']: this.data.rearchStringList[e.currentTarget.dataset.index] })
diff --git a/pages/mall/search-list/index.json b/pages/mall/search-list/index.json
index c7baeb8..0569323 100644
--- a/pages/mall/search-list/index.json
+++ b/pages/mall/search-list/index.json
@@ -2,6 +2,9 @@
"usingComponents": {
"free-input":"/components/free-input/index",
"wux-divider": "/components/divider/index",
- "wux-tabi": "/components/tabi/index"
+ "wux-tabi": "/components/tabi/index",
+ "info-item": "/pages/moment/info-item/index",
+ "order-item": "/pages/agent/order-item/index",
+ "moment-item": "/pages/moment/moment-item/index"
}
}
\ No newline at end of file
diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml
index 477f0f9..65fdbb7 100644
--- a/pages/mall/search-list/index.wxml
+++ b/pages/mall/search-list/index.wxml
@@ -34,7 +34,11 @@
-
+
+
+
+
+
diff --git a/pages/moment/info-item/index.js b/pages/moment/info-item/index.js
index 4455db9..4a0daa7 100644
--- a/pages/moment/info-item/index.js
+++ b/pages/moment/info-item/index.js
@@ -8,6 +8,7 @@ Component({
},
properties: {
item: { type: Object, value: null },
+ keyword: { type: String, value: '第二轮' },
mclick: { type: Boolean, value: true }
},
methods: {
diff --git a/pages/moment/info-item/index.json b/pages/moment/info-item/index.json
index 8dee24a..3dfeb44 100644
--- a/pages/moment/info-item/index.json
+++ b/pages/moment/info-item/index.json
@@ -1,6 +1,7 @@
{
"component": true,
"usingComponents": {
+ "highlight-text": "/components/highlight-text/index",
"wux-image": "/components/image/index"
}
}
\ No newline at end of file
diff --git a/pages/moment/info-item/index.wxml b/pages/moment/info-item/index.wxml
index ee68258..97286ff 100644
--- a/pages/moment/info-item/index.wxml
+++ b/pages/moment/info-item/index.wxml
@@ -1,7 +1,7 @@
- 市生态环境局召开动员会,迎接第二轮第四批中央生态环境市生态环境局召开动员会,迎接第二轮第四批中央生态环
+
境局召开动
diff --git a/pages/moment/moment-item/index.json b/pages/moment/moment-item/index.json
index 8627bff..7cc56b7 100644
--- a/pages/moment/moment-item/index.json
+++ b/pages/moment/moment-item/index.json
@@ -1,6 +1,7 @@
{
"component": true,
"usingComponents": {
+ "highlight-text": "/components/highlight-text/index",
"wux-divider": "/components/divider/index",
"wux-button": "/components/button/index"
}