diff --git a/pages/commercialBI/formatDetail.vue b/pages/commercialBI/formatDetail.vue index c7f1776..ecd08c2 100644 --- a/pages/commercialBI/formatDetail.vue +++ b/pages/commercialBI/formatDetail.vue @@ -13,7 +13,8 @@
-
+ +
@@ -180,11 +181,11 @@ export default { }, handleShopDetail(item){ console.log('item',item) - if (item.COOPMERCHANTS_ID && item.COOPMERCHANTS_ID!=='-1'){ - uni.navigateTo({ - url:`/pages/commercialBI/shopDetail?id=${item.COOPMERCHANTS_ID}&COOPMERCHANTSID=${item.COOPMERCHANTS_ID_Encrypted}` - }) - } + // if (item.COOPMERCHANTS_ID && item.COOPMERCHANTS_ID!=='-1'){ + // uni.navigateTo({ + // url:`/pages/commercialBI/shopDetail?id=${item.COOPMERCHANTS_ID}&COOPMERCHANTSID=${item.COOPMERCHANTS_ID_Encrypted}` + // }) + // } } } diff --git a/pages/commercialBI/formatPortrait.vue b/pages/commercialBI/formatPortrait.vue index d2b093c..01be0d6 100644 --- a/pages/commercialBI/formatPortrait.vue +++ b/pages/commercialBI/formatPortrait.vue @@ -12,23 +12,23 @@
-
- -
-
- - - - - 安徽驿达 - - - - - -
-
-
+ + + + + + + + + + + + + + + + +
@@ -50,7 +50,7 @@
- +
@@ -64,11 +64,14 @@
{{item.BUSINESSTRADE_NAME}}
{{item.BRAND_TYPENAME}}
-
- {{item.MerchantName || ''}} - - -
+ +
+ {{item.MerchantName || ''}} + + +
+ +
@@ -193,6 +196,14 @@ export default { url:`/pages/map/index?page=${this.page}&chartType=${true}&serviceInfo=${JSON.stringify(this.serviceInfo)}` }) }, + handleShopDetail(item){ + console.log('item',item) + if (item.MerchantID && item.MerchantID!=='-1'){ + uni.navigateTo({ + url:`/pages/commercialBI/shopDetail?id=${item.MerchantID}&COOPMERCHANTSID=${item.MerchantID_Encrypt}` + }) + } + }, //返回上一级s handleBack(){ if (this.backType==='userCenter'){ @@ -336,6 +347,7 @@ export default { width: 100vw; background: url("https://eshangtech.com/ShopICO/ahyd-BID/brand/headerBg.svg")no-repeat; background-size: cover; + background-position-y: -5px; .box{ padding: 0 16px; position: absolute; @@ -598,6 +610,7 @@ export default { } } .suggest{ + display: inline-block; min-height: 25px; padding: 0 8px; background: linear-gradient(90deg, RGBA(222, 231, 255, 1) 0%, RGBA(241, 246, 255, 1) 100%); diff --git a/pages/index/index.vue b/pages/index/index.vue index ac907f8..863726f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,7 +4,7 @@ + :style="{height:loadMore?`calc(${(776/750)*phoneWidth + 260}px)`:`calc(${(776/750)*phoneWidth - 10}px)`}">
@@ -23,10 +23,10 @@
- + - + @@ -159,52 +159,87 @@ 查看更多 - +
- -

{{ showTableData.Different_Price_More?$util.fmoney(showTableData.Different_Price_More,2):'-' }}

-

长款金额/元

- - -

{{ showTableData.Different_Price_Less?$util.fmoney(showTableData.Different_Price_Less,2):'-' }}

-

短款金额/元

- - -

{{showTableData.TotalOffAmount?$util.fmoney(showTableData.TotalOffAmount,2):'-' }}

-

优惠金额/元

- - -

-

-

- {{showTableData.Revenue_Upload?showTableData.Revenue_Upload:'-'}}/{{showTableData.TotalShopCount?showTableData.TotalShopCount:'-'}} -

-
- 门店上传 -
!
-
- - -

{{ showTableData.TotalCount?$util.noDecimal(showTableData.TotalCount):'-' }}

-

商品出售/件

- - -

{{ showTableData.countave?showTableData.countave:'-' }}

-

商品均价/元

- - -

{{carInfo.Vehicle_Count?carInfo.Vehicle_Count:'-'}}

-

第三方未传

-

日均入区/辆

- - -

{{carInfo.Entry_Rate?carInfo.Entry_Rate :'-' }}

-

入区率/%

- - -

{{carInfo.Stay_Times?carInfo.Stay_Times:'-' }}

-

停留时长/分钟

+ + + + 126.32 + 年度累计/亿元 + + + + + + 11.07% + + 同比 + + + + + + 对客营收/环比 + +19.54% + + + 自营收入/环比 + +19.54% + + + 外租收入/环比 + +19.54% + + + + + + + + 入区车流 + + + +198.54% + /同比 + + + +198.54% + /环比 + + + + + + + 入区率 + + + +198.54% + /同比 + + + +198.54% + /环比 + + + + + + + 停留时长 + + + +198.54% + /同比 + + + +198.54% + /环比 + + + @@ -273,7 +308,7 @@ - {{showTableData.compared?showTableData.compared+'%':'-'}} + {{showTableData.compared?showTableData.compared>0?'+'+showTableData.compared+'%':showTableData.compared+'%':'-'}} @@ -301,7 +336,7 @@ - 节日特刊 + 经营品牌库 @@ -313,8 +348,10 @@ - +
+ +
@@ -687,8 +724,9 @@ export default { { imgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg', path: '/pages/commercialBI/carPortrait', name: '车流画像'}, { imgUrl: '/static/images/index/guest.svg', path: '/pages/commercialBI/guestPortrait', name: '客群画像' }, { imgUrl: '/static/images/index/business_icon.svg', path: '/pages/commercialBI/managePortrait', name: '经营画像' }, - { imgUrl: '/static/images/index/trade.svg', path: '/pages/commercialBI/businessPortrait', name: '交易画像' }, - { imgUrl: '/static/images/index/brand.svg', path: '/pages/commercialBI/formatPortrait', name: '业态品牌' }], + { imgUrl: '/static/images/index/trade.svg', path: '/pages/commercialBI/businessPortrait', name: '交易画像' } + ], + // { imgUrl: '/static/images/index/brand.svg', path: '/pages/commercialBI/formatPortrait', name: '业态品牌' } detailTypeList:[{ name: '分润门店', unit: '/个', value: '-',yesterValue:'-', add: '', imgIcon: '/static/images/index/store.svg' }, { name: '驿达分润', unit: '/元', value: '-',yesterValue:'-', imgIcon: '/static/images/index/yidaFenrun.svg' }, { name: '订单配送', unit: '/单', value: '-',yesterValue:'-', add: '', imgIcon: '/static/images/index/orderDelivery.svg' }, @@ -697,7 +735,7 @@ export default { // { name: '经营模式', value: 1 }, { name: '区域营收', value: 2 }, { name: '经营业态', value: 1 }], - selectTab:1, // 选项卡的指针 + selectTab:2, // 选项卡的指针 monthAmountAdd:'',//月累计 yearAmountAdd:'',//年累计 mobileData :{}, // 移动支付分账接口返回的数据 @@ -844,23 +882,21 @@ export default { onLoad(option){ // 顶部显示的时间 this.single = timestampToTimeMonth((new Date(this.lastDay).getTime())) - // 拿到当前真实的时间 - const realDate = new Date() - // 获取手机参数对页面进行适配 主要是用于拿到胶囊的位置 let systemInfo = uni.getSystemInfoSync() this.statusBarHeight = Number(systemInfo.statusBarHeight) this.menu = uni.getMenuButtonBoundingClientRect() + // 拿到用户手机的宽 用设计图的宽高比去设定上半部的高度 this.phoneWidth = systemInfo.windowWidth - console.log('systemInfo',systemInfo) // 拿到昨天的时间戳 const date = new Date(this.lastDay) - // 拿到今天的月份 + // 拿到选择日期的月份 this.nowMonth = date.getMonth() + 1 // 默认选择的月份 this.selectMonth = date.getMonth() + 1 + // 设置顶部时间选择器的开始时间 因为不能选去年数据 所以只能从当前日期的年份开始计算 this.startDate = `${date.getFullYear()}-01` - // 顶部卡片滚动的第几个 + // 顶部卡片滚动的第几个 月份减1 就是卡片的index this.selectDetail = this.nowMonth - 1 // 设置顶部选时间的显示 结束时间不能是大于等于今天 this.endData = new Date() @@ -1118,17 +1154,14 @@ export default { }) } //判断是否从推送进来 - console.log('option',option) if (option.ProvinceCode) { // 从推送进入 this.theRequest = option option.time = this.$util.cutDate(option.time, 'YYYY-MM-DD') option.month = this.$util.cutDate(option.time, 'YYYYMM') if (!type){ this.lastDay = this.$util.cutDate(option.time, 'YYYY-MM-DD') - console.log('this.lastDay',this.lastDay) //修改时间选择器里面的时间 this.single = timestampToTimeMonth((new Date(this.lastDay).getTime())) - console.log('this.single',this.single) // //显示当前选择的时间是星期几 // const date = new Date(this.lastDay) // this.thisDay = getThisDay(date.getDay()) @@ -1235,7 +1268,8 @@ export default { this.showPortrait = !this.showPortrait }, handleFestival(){ - uni.showToast({title: '栏目建设中', icon: 'none'}) + this.$util.toNextRoute('navigateTo', `/pages/commercialBI/formatPortrait?time=${this.lastDay}&serviceInfo=${JSON.stringify(this.nearServiceInfo)}`) + // uni.showToast({title: '栏目建设中', icon: 'none'}) }, handleSearch(type){ if (type ==='special'){ @@ -1295,10 +1329,8 @@ export default { Statistics_Date:`${y}-${m}-${day}` } } - console.log('monthDate',monthDate) request.$webGet('CommercialApi/Revenue/GetRevenueBudget',monthDate).then(res=>{ // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理 - console.log('res.Result_Data', res.Result_Data) this.plan = res.Result_Data this.plan.percentageMonth = res.Result_Data.MonthBudget_Degree this.plan.percentageYear = res.Result_Data.YearBudget_Degree @@ -1504,7 +1536,6 @@ export default { request.$webGet('CommercialApi/Revenue/GetSummaryRevenueMonth',req).then(lastData=>{ flag3 = true let result = lastData.Result_Data - console.log('result',result) let progressAll = 0 result.BusinessTypeList.forEach(item=>{ @@ -1528,8 +1559,6 @@ export default { owner:Number(((this.typeList[0].value / progressAll)*100).toFixed(2)), other:100-Number(((this.typeList[0].value / progressAll)*100).toFixed(2)) } - console.log('progressAll',progressAll) - console.log('progressObj',this.progressObj) // 计算百分比 this.regionProgress = result.BusinessTradeList @@ -1640,10 +1669,7 @@ export default { const realDate = new Date(this.lastDay) - console.log('this.lastDay',this.lastDay) const realMonth = realDate.getMonth()+1 - console.log('this.selectMonth',this.selectMonth) - console.log('realMonth',realMonth) if (this.selectMonth>realMonth){ isOnRefresh = false }else{ @@ -1858,15 +1884,16 @@ $iphoneHeight: env(safe-area-inset-bottom); margin-right: 4px; } .uni-input { - font-size: 24rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #ae664e; - line-height: 36rpx; + font-size: 32rpx; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #2249A2; + line-height: 44rpx; } .icon { - width: 24px; - height: 16px; + width: 12px; + height: 12px; + margin-left: 16rpx; } } } @@ -1928,6 +1955,7 @@ $iphoneHeight: env(safe-area-inset-bottom); .staticIcon{ width: 32rpx; height: 32rpx; + opacity: 0.25; } } .revenueBox{ @@ -1947,8 +1975,8 @@ $iphoneHeight: env(safe-area-inset-bottom); line-height: 56rpx; } .moreIcon{ - width: 28rpx; - height: 28rpx; + width: 12px; + height: 12px; display: flex; align-items: center; justify-content: center; @@ -1957,7 +1985,7 @@ $iphoneHeight: env(safe-area-inset-bottom); color: #A69E9F; font-size: 12px; font-weight: 600; - margin-left: 7px; + margin-left: 6px; position: relative; .realBox{ position: absolute; @@ -1992,11 +2020,11 @@ $iphoneHeight: env(safe-area-inset-bottom); } .revenueNav{ - margin-top: 4px; display: flex; align-items: center; justify-content: space-between; .leftNav{ + margin-top: 2px; font-size: 28rpx; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; @@ -2105,7 +2133,6 @@ $iphoneHeight: env(safe-area-inset-bottom); } } .messageBottom{ - margin-top: 4px; margin-left: 20px; display: flex; align-items: center; @@ -2154,55 +2181,154 @@ $iphoneHeight: env(safe-area-inset-bottom); width: 100%; .detail{ width: 100%; - height: 200px; + height: 290px; box-sizing: border-box; - padding: 16px 0; + padding: 16px; border-radius: 8rpx; //margin-top: 12px; - .detailItem { - width: 33%; - box-sizing: border-box; - padding-left: 16px; - height: 42px; - text-align: left; - float: left; - margin-bottom: 16px; - .itemName { - font-size: 14px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #782717; - opacity: 0.8; - line-height: 40rpx; - margin-bottom: 2px; - .prompt{ - width: 12px; - height: 12px; - border: 1px solid #782717; - border-radius:50%; - display: flex; - align-items: center; - justify-content: center; - font-size: 10px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 600; - color: #782717; + .detailMessage{ + width: 100%; + height: 100%; + .otherDetailTop{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .otherDetailTopLeft{ + .yearAll{ + font-size: 40rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + .yearLabel{ + margin-top: 4rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + .unit{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #C5846F; + line-height: 40rpx; + margin-left: 4rpx; + } + } } - .itemUnit { - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #C8806C; - line-height: 40rpx; - margin-left: 2px; + .otherDetailRight{ + .otherDetailAddBox{ + display: flex; + align-items: center; + .otherDetailAddIcon{ + width: 28rpx; + height: 28rpx; + margin-right: 6rpx; + } + .otherDetailAddValue{ + font-size: 36rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E83944; + line-height: 40rpx; + } + } + .otherDetailAddLabel{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + text-align: right; + } } } - .price { - font-size: 16px; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #782717; - line-height: 40rpx; + + .otherDetailMiddle{ + margin-top: 42rpx; + .middleItem{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .itemLabel{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + .itemText{ + width: 70rpx; + height: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #C5836E; + line-height: 40rpx; + } + } + .itemValue{ + font-size: 32rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + } + } + + .otherDetailBottom{ + margin-top: 40rpx; + .bottomItem{ + display: flex; + align-items: center; + justify-content: space-between; + .itemLeft{ + width: 140rpx; + display: flex; + align-items: center; + .leftIcon{ + width: 32rpx; + height: 32rpx; + margin-right: 8rpx; + } + .itemTitle{ + font-size: 26rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + text-align: left; + } + } + .itemCenter,.itemRight{ + width: calc((100% - 140rpx)/2); + .itemValue{ + font-size: 28rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + .itemText{ + font-size: 26rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + margin-left: 4rpx; + } + } + .itemCenter{ + text-align: right; + } + .itemRight{ + text-align: right; + } + } } } } @@ -2222,8 +2348,8 @@ $iphoneHeight: env(safe-area-inset-bottom); .monthBox{ display: inline-block; position: absolute; - right: 0;top: 0; - padding: 4rpx 22rpx; + right: 1px;top: 1px; + padding: 4rpx 26rpx; font-size: 28rpx; font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; @@ -2410,7 +2536,6 @@ $iphoneHeight: env(safe-area-inset-bottom); } } .messageBottom{ - margin-top: 4px; margin-left: 20px; display: flex; align-items: center; @@ -2452,7 +2577,7 @@ $iphoneHeight: env(safe-area-inset-bottom); } .searchIcon{ width: 25px; - height: 14px; + height: 16px; } } .otherDetail{ @@ -2877,6 +3002,37 @@ $iphoneHeight: env(safe-area-inset-bottom); background: linear-gradient(134deg, #A6DDFF 0%, #BCEFFF 100%)!important; color: #025B93!important; } + .otherDetail{ + .detail{ + .yearAll{ + color: #013F66!important; + } + .yearLabel{ + color: #013F66!important; + .unit{ + color: #649BB9!important; + } + } + .otherDetailAddLabel{ + color: #5E97B7!important; + } + .itemLabel{ + color: #013F66!important; + .itemText{ + color: #6199B9!important; + } + } + .itemValue{ + color: #013F66!important; + } + .itemTitle{ + color: #013F66!important; + } + .itemText{ + color: #5B95B7!important; + } + } + } } } } @@ -2898,6 +3054,37 @@ $iphoneHeight: env(safe-area-inset-bottom); background: linear-gradient(134deg, #B9CEFF 0%, #CADFFF 100%)!important; color: #2249A2!important; } + .otherDetail{ + .detail{ + .yearAll{ + color: #002780!important; + } + .yearLabel{ + color: #002780!important; + .unit{ + color: #6786C5!important; + } + } + .otherDetailAddLabel{ + color: #6483C4!important; + } + .itemLabel{ + color: #002780!important; + .itemText{ + color: #6786C5!important; + } + } + .itemValue{ + color: #002780!important; + } + .itemTitle{ + color: #002780!important; + } + .itemText{ + color: #6786C5!important; + } + } + } } } } @@ -2919,6 +3106,37 @@ $iphoneHeight: env(safe-area-inset-bottom); background: linear-gradient(134deg, #FFCDA3 0%, #FFE8CA 100%)!important; color: #783F0F!important; } + .otherDetail{ + .detail{ + .yearAll{ + color: #572800!important; + } + .yearLabel{ + color: #572800!important; + .unit{ + color: #B08C6B!important; + } + } + .otherDetailAddLabel{ + color: #AC8766!important; + } + .itemLabel{ + color:#572800!important; + .itemText{ + color: #B08C6B!important; + } + } + .itemValue{ + color: #572800!important; + } + .itemTitle{ + color: #572800!important; + } + .itemText{ + color: #B08C6B!important; + } + } + } } } } @@ -2939,7 +3157,7 @@ $iphoneHeight: env(safe-area-inset-bottom); width: calc(100% - 64rpx); margin-left: 32rpx; height: 378rpx; - margin-bottom: 32rpx; + margin-bottom: 16px; .firstBox{ display: flex; margin-bottom: 18rpx; @@ -3038,8 +3256,8 @@ $iphoneHeight: env(safe-area-inset-bottom); } } .typeImg{ - width: 120rpx; - height: 120rpx; + width: 52px; + height: 52px; position: absolute; right: 0;bottom: 0; } @@ -3070,8 +3288,8 @@ $iphoneHeight: env(safe-area-inset-bottom); margin-top: 96rpx; } .typeImg{ - width: 104rpx; - height: 104rpx; + width: 52px; + height: 52px; position: absolute; bottom: 0;right: 0; } @@ -3125,6 +3343,15 @@ $iphoneHeight: env(safe-area-inset-bottom); justify-content: space-between; background: #F3F4F4; border-radius: 16rpx; + position: relative; + .san{ + width: 16px; + height: 16px; + position: absolute; + top: -8px;left: 108rpx; + background: #F3F4F4; + transform: rotate(-45deg); + } .funItem{ width: 25%; display: flex; diff --git a/static/public/font2/swmcfSKy9zYa.woff2 b/static/public/font2/swmcfSKy9zYa.woff2 index bf074aa..cb882e8 100644 Binary files a/static/public/font2/swmcfSKy9zYa.woff2 and b/static/public/font2/swmcfSKy9zYa.woff2 differ