diff --git a/manifest.json b/manifest.json index d5bfc1e..16f44b9 100644 --- a/manifest.json +++ b/manifest.json @@ -91,7 +91,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wxe044603515ff2cb5", + "appid" : "wx8f883dca5ecc5510", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index a800091..0ff644f 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -297,8 +297,8 @@ 执行{{ item.fraction || 0 }}% - 已匹配({{ - item.keywordsList&&item.keywordsList.length + 已匹配({{ + item.keywordsList.length }}) 未匹配 diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue index 0c4e87e..fa351b7 100644 --- a/pages/center/consumer/index.vue +++ b/pages/center/consumer/index.vue @@ -1185,7 +1185,6 @@ export default { }) } }) - console.log(this.keywordsIds); this.getMyCustom(); }, goSearch() { @@ -1380,7 +1379,6 @@ export default { .content-sec { border-top: 1px solid #e0e0e0; padding: 0 30rpx; - // padding-bottom: 30rpx; position: relative; .content-sec-lab { @@ -1394,6 +1392,7 @@ export default { .content-sec-lab1 { color: #333333; + word-break: break-all; } .content-sec-tips { diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index c6e0a11..2c0c097 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -354,9 +354,9 @@ {{item.name}} 执行{{item.fraction || 0}}% - 已匹配({{ - item.keywordsList&&item.keywordsList.length + item.keywordsList.length }}) 未匹配 diff --git a/pages/reportExcel/dayReport.vue b/pages/reportExcel/dayReport.vue index baed58d..3026d93 100644 --- a/pages/reportExcel/dayReport.vue +++ b/pages/reportExcel/dayReport.vue @@ -12,10 +12,12 @@ 生成时间:{{ weekObj.createTime || '--' }} - + + 此项目今日还没有接待量哦~ + + - @@ -281,18 +283,15 @@ - + - - + 回到管理端 - 复制内容 - + + + @@ -243,6 +245,7 @@ }, data() { return { + nodata: false, tableHead: [{ title: '顾问', style: { @@ -570,18 +573,28 @@ this.$u.get('/zkMessage/findByProjectId', { id: this.id }).then(res => { - console.log(res) - let data = JSON.parse(res.zkMessage.content) - console.log(data) + // console.log(res) + let data = {} + if(res.zkMessage.content){ + data = JSON.parse(res.zkMessage.content) + }else{ + this.nodata = true + this.weekObj = { + ...res.zkMessage, + } + } this.bubbleSort(data.customerInfo1, 'pk') this.bubbleSort(data.customerInfo2, 'pk') data.customerInfo1.reverse() data.customerInfo2.reverse() - - this.weekObj = { - ...res.zkMessage, - ...data + if(res.zkMessage.content){ + data = JSON.parse(res.zkMessage.content) + this.weekObj = { + ...res.zkMessage, + ...data + } } + this.weekObj.createTimeName = this.getTimeLines(this.weekObj.weekDate, 1) console.log(this.weekObj, 'this.weekObj') this.projectName = res.projectName @@ -811,7 +824,18 @@ } } - + .nodata-box{ + width: 400rpx; + height: 400rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #666666; + line-height: 40rpx; + padding-top: 360rpx; + margin: 0 auto; + text-align: center; + } .briefing { background: #fff; diff --git a/static/images/nodata.png b/static/images/nodata.png new file mode 100644 index 0000000..77eeb8c Binary files /dev/null and b/static/images/nodata.png differ