diff --git a/manifest.json b/manifest.json index 16c8fd4..aa299d1 100644 --- a/manifest.json +++ b/manifest.json @@ -91,7 +91,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wx8f883dca5ecc5510", + "appid" : "wxe044603515ff2cb5", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index f3c3776..8098360 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -425,7 +425,7 @@ 客户意向{{ `${customerInfo.levelFraction||'0'}%` }} - x + @@ -1769,13 +1769,7 @@ transform: translateY(-50%); width: 45rpx; height: 45rpx; - border: 1px solid #E0E0E0; - border-radius: 50%; text-align: center; - line-height: 45rpx; - font-size: 26rpx; - font-weight: bold; - color: #E0E0E0; } } diff --git a/pages/center/consumer/index.vue b/pages/center/consumer/index.vue index 0868309..cd06a90 100644 --- a/pages/center/consumer/index.vue +++ b/pages/center/consumer/index.vue @@ -576,7 +576,8 @@ onLoad(options) { this.LOADING = true; this.isnorefresh = options.refresh; - if (options.dataType) this.activeTotal = options.dataType + if (options.dateType != null || options.dateType != undefined) this.activeTotal = options.dateType + console.log(this.activeTotal, options.dateType) if (options.staTime) this.screen.staTime = options.staTime if (options.endTime) this.screen.endTime = options.endTime }, diff --git a/pages/index/index.vue b/pages/index/index.vue index e894c7d..66eae83 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -151,7 +151,7 @@ {{max100(realtimeobj.wordFinishFraction)}}% 平均挖掘率 - + {{realtimeobj.sumLevelFraction || 0}}% @@ -205,7 +205,7 @@ 平均执行率 - + {{Thisweekobj.sumLevelFraction || 0}}% @@ -453,20 +453,22 @@ methods: { // 跳转客户详情 toCustomerManagement(str) { - if (str != 'dateType=0') { + console.log(str) + if (str != 'dateType') { // dateType == 2 // if (this.zhixingcenterindex != 7) { uni.navigateTo({ - url: `/pages/center/consumer/index?refresh=refresh&dataType=${this.zhixingcenterindex}` + url: `/pages/center/consumer/index?refresh=refresh&dateType=${this.zhixingcenterindex}` }) } else { uni.navigateTo({ - url: `/pages/center/consumer/index?refresh=refresh&dataType=4&staTime=${this.statDateStart}&endTime=${this.statDateEnd}` + url: `/pages/center/consumer/index?refresh=refresh&dateType=4&staTime=${this.statDateStart}&endTime=${this.statDateEnd}` }) } } else { + console.log('adasdasljdlks', str) uni.navigateTo({ - url: `/pages/center/consumer/index?refresh=refresh&${str}` + url: `/pages/center/consumer/index?refresh=refresh&dateType=0` }) } }, diff --git a/static/images/close.png b/static/images/close.png new file mode 100644 index 0000000..b728cb1 Binary files /dev/null and b/static/images/close.png differ