ylj/ahyd_DIB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.16 22.23

Browse Source
This commit is contained in:
cclu 2023-06-16 22:23:13 +08:00
parent 980b0b77e1
commit 8b91be08b2
3 changed files with 135 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pages/commercialBI/formatDetail.vue
View File

@ -12,7 +12,8 @@
</div>
</div>
<div class="detail" :style="{top:(menu.bottom + 22) + 'px'}">
<div class="box" >
<!-- -->
<div class="box" :style="{height:( (status.screenWidth - 32) / 2.09)+'px'}">
<div class="left">
<image v-if="detail.BRAND_STATE === 1" class="img" :src="detail.BRAND_INTRO"></image>
</div>
@ -34,9 +35,10 @@
<text class="typeItem">{{detail.BUSINESSTRADE_NAME}}</text>
<text class="typeItem">{{detail.BRAND_TYPENAME}}</text>
</div>
<div class="suggest">
<text class="value">{{detail.COMMISSION_RATIO}}</text>
<text class="text">建议提成比例</text>
<div class="suggest" v-if="detail.MerchantName">
{{detail.MerchantName || ''}}
<!-- <text class="value">{{detail.COMMISSION_RATIO}}</text>-->
<!-- <text class="text">建议提成比例</text>-->
</div>
</div>
<div class="typeBox">
@ -63,10 +65,13 @@
</div>
<div class="content">
<text class="name">{{item.SERVERPART_NAME}}</text>
<div class="type">
<div class="type" v-if="item.SERVERPART_TYPE">
<image class="typeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/typeIcon.svg"></image>
<text class="text">{{item.SERVERPART_TYPE}}</text>
</div>
<div v-else style="height: 16px;">
</div>
</div>
</div>
<div class="right">
@ -101,7 +106,7 @@
<div class="bottomItem">
<image class="bottomIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/date.svg"></image>
<text class="text">{{ item.PROJECT_STARTDATE && item.PROJECT_ENDDATE ?`${item.PROJECT_STARTDATE}-${item.PROJECT_ENDDATE}`:'-' }}</text>
<text class="text">{{ item.PROJECT_STARTDATE || item.PROJECT_ENDDATE ?`${item.PROJECT_STARTDATE || ''}-` + `${item.PROJECT_ENDDATE || ''}`:'-' }}</text>
</div>
</div>
</div>
@ -121,6 +126,7 @@ export default {
data() {
return {
menu:{},
status:{},
detail:{},// 详情信息
serviceList:[],// 服务区列表
descTop:0,// 悬浮框的高度
@ -130,6 +136,9 @@ export default {
},
onLoad(query){
this.menu = uni.getMenuButtonBoundingClientRect()
let systemInfo = uni.getSystemInfoSync()
this.status = systemInfo
console.log('this.status',this.status)
console.log('query',query)
console.log('query',JSON.parse(query.detail))
this.detail = JSON.parse(query.detail)
@ -171,9 +180,11 @@ export default {
},
handleShopDetail(item){
console.log('item',item)
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}`
})
}
}
}
@ -252,6 +263,7 @@ export default {
}
}
.right{
flex:1;
margin-left: 12px;
.top{
display: flex;
@ -307,7 +319,7 @@ export default {
}
}
.typeList{
margin-top: 18px;
margin-top: 4px;
border-radius: 2px;
.typeItem{
display: inline-block;
@ -322,6 +334,7 @@ export default {
}
}
.suggest{
min-height: 25px;
margin-top: 8px;
background: linear-gradient(90deg, rgba(72,119,255,0.15) 0%, rgba(72, 119, 255, 0) 100%);
border-radius: 2px;

16
pages/commercialBI/formatPortrait.vue
View File

@ -50,7 +50,7 @@
<image class="more" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/more.svg" @click="handleShowFilter($event)"></image>
</div>
</div>
<!-- height: calc(100vh - 404px);-->
<scroll-view class="list" :style="{height: `calc(100vh - ${status.screenWidth / 1.37}px - 132px)`}" :show-scrollbar="false" scroll-y="true" :scroll-top="scrollTop" @scroll="handleScroll" :scroll-with-animation="true">
<div class="listItem" v-for="(item,index) in tableList" :key="index" @click="handleToDetail(item)">
@ -64,9 +64,10 @@
<div class="labelItem">{{item.BUSINESSTRADE_NAME}}</div>
<div class="labelItem">{{item.BRAND_TYPENAME}}</div>
</div>
<div class="suggest">
<text class="value">{{item.COMMISSION_RATIO || '-'}}</text>
<text class="text">建议提成比例</text>
<div class="suggest" v-if="item.MerchantName">
{{item.MerchantName || ''}}
<!-- <text class="value">{{item.COMMISSION_RATIO || '-'}}</text>-->
<!-- <text class="text">建议提成比例</text>-->
</div>
</div>
<div class="type">
@ -571,11 +572,8 @@ export default {
}
}
.right{
height: 88px;
flex:1;
margin-left: 12px;
display: flex;
flex-direction: column;
justify-content: space-between;
.title{
display: inline-block;
width: 150px;
@ -600,9 +598,11 @@ export default {
}
}
.suggest{
min-height: 25px;
padding: 0 8px;
background: linear-gradient(90deg, RGBA(222, 231, 255, 1) 0%, RGBA(241, 246, 255, 1) 100%);
border-radius: 2px;
margin-top: 10px;
.value{
font-size: 14px;
font-family: DINAlternate-Bold, DINAlternate;

163
pages/commercialBI/shopDetail.vue
View File

@ -13,9 +13,9 @@
</div>
<div class="detail" :style="{top:(menu.bottom + 22) + 'px'}">
<div class="box" >
<div class="left">
<image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/storeIcon.png"></image>
</div>
<!-- <div class="left">-->
<!-- <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/storeIcon.png"></image>-->
<!-- </div>-->
<div class="right">
<div class="top">
<text class="title" :style="{fontSize:detail.BRAND_NAME.length>8?'12px':'16px'}">{{detail.COOPMERCHANTS_NAME}}</text>
@ -38,9 +38,12 @@
</div>
<div class="brandList">
<div class="imgBox" v-if="subItem.ico" v-for="(subItem,subIndex) in detail.BrandList" :key="subIndex" >
<img class="brandItem" :src="subItem.ico"/>
</div>
<scroll-view scroll-x="true" style="width: 100%;height: 80px;white-space: nowrap;">
<div class="imgBox" v-for="(subItem,subIndex) in detail.BrandList" :key="subIndex" >
<img class="brandItem" :src="subItem.ico || 'https://eshangtech.com/ShopICO/ahyd-BID/brand/defaultIcon.png'"/>
<span class="value">{{subItem.label}}</span>
</div>
</scroll-view>
</div>
<!-- <div class="descBox">-->
@ -77,7 +80,7 @@
<text class="projectTitle">经营项目</text>
<text v-if="serviceList && serviceList.length>0" class="number">({{`${serviceList.length}`}})</text>
</div>
<scroll-view class="list" scroll-y="true" :scroll-with-animation="true">
<scroll-view v-if="serviceList && serviceList.length>0" class="list" scroll-y="true" :scroll-with-animation="true">
<div class="listItem" v-for="(item,index) in serviceList" :key="index" @click="handleShopDetail(item)">
<div class="itemTop">
<div class="left">
@ -112,20 +115,34 @@
<text class="unit" >( 万元 )</text>
</div>
</div>
<!-- <div class="bottomItem">-->
<div class="bottomItem">
<text class="text">{{businessType[item.BUSINESS_TRADE] || '-'}}</text>
<!-- <image class="bottomIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/storeIcon.svg"></image>-->
<!-- <text class="text">{{item.COOPMERCHANTS_NAME || '-'}}</text>-->
<!-- </div>-->
<div class="bottomItem">
<image class="bottomIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/fixed.svg"></image>
<text class="text">{{item.SERVERPARTSHOP_NAME || '-'}}</text>
</div>
<div class="bottomItem">
<image class="bottomIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/date.svg"></image>
<text class="text">{{ item.PROJECT_STARTDATE && item.PROJECT_ENDDATE ?`${item.PROJECT_STARTDATE}-${item.PROJECT_ENDDATE}`:'-' }}</text>
<div class="bottom">
<div class="bottomItemLeft">
<div class="bottomItem">
<image class="bottomIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/fixed.svg"></image>
<text class="text">{{item.SERVERPARTSHOP_NAME || '-'}}</text>
</div>
<div class="bottomItem">
<image class="bottomIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/date.svg"></image>
<text class="text">{{ item.PROJECT_STARTDATE && item.PROJECT_ENDDATE ?`${item.PROJECT_STARTDATE}-${item.PROJECT_ENDDATE}`:'-' }}</text>
</div>
<div class="bottomItem">
<div class="bottomIcon"></div>
<text class="text">{{item.progress}}</text>
</div>
</div>
<div class="bottomItemRight">
<image class="icon" :src="item.BUSINESSPROJECT_ICO"></image>
</div>
</div>
</div>
</div>
</scroll-view>
@ -157,6 +174,14 @@ export default {
'3000':'C类',
'4000':'D类'
},
businessType:{
// 经营业态
1: '主餐饮类',
2: '面馆小吃类',
3: '轻饮食、食品类',
4: '特产、工艺品等其他类',
5: '汽修类',
},
personList:[]
}
},
@ -222,9 +247,20 @@ export default {
const data = await request.$webGet(`EShangApiMain/BusinessProject/GetMerchantsReceivables`,req)
console.log('list',data)
this.serviceList = data.Result_Data.AccountReceivablesList
this.serviceList.forEach(item=>{
item.SECTIONFLOW_NUM = this.$util.noDecimal(item.SECTIONFLOW_NUM)
})
if (this.serviceList && this.serviceList.length>0){
this.serviceList.forEach(item=>{
const nowDay = new Date().getTime()
const startDay = new Date(item.PROJECT_STARTDATE).getTime()
const endDay = new Date(item.PROJECT_ENDDATE).getTime()
const day = endDay - nowDay
if (day<0){
item.progress = '100%'
}else{
item.progress =((((nowDay-startDay) / (1000*60*60*24)) / item.PROJECT_DAYS).toFixed(2) * 100 + '').substr(0,5) + '%'
}
item.SECTIONFLOW_NUM = this.$util.noDecimal(item.SECTIONFLOW_NUM)
})
}
console.log('this.serviceList',this.serviceList)
uni.hideLoading()
},
@ -293,6 +329,7 @@ export default {
width: 100%;
box-sizing: border-box;
padding: 0 16px;
min-height: 164px;
position: absolute;
.box{
width: 100%;
@ -304,21 +341,8 @@ export default {
padding: 12px;
display: flex;
position: relative;
.left{
width: 72px;
height: 72px;
border-radius: 8px;
background: #fff;
display: flex;
align-items: center;
justify-content: center;
.img{
width: 40px;
height: 40px;
}
}
.right{
margin-left: 12px;
width: 100%;
.top{
display: flex;
align-items: center;
@ -383,18 +407,21 @@ export default {
width: 100%;
display: flex;
margin-top: 10px;
.imgBox{
width: 60px;
height: 60px;
border-radius: 6px;
margin-right: 8px;
overflow: hidden;
.brandItem{
width: 60px;
height: 60px;
.imgBox{
display: inline-block;
border-radius: 6px;
margin-right: 8px;
text-align: center;
.brandItem{
width: 50px;
height: 50px;
border-radius: 4px;
}
.value{
display: block;
font-size: 12px;
}
}
}
}
@ -680,25 +707,43 @@ export default {
}
}
}
.bottomItem{
.bottom{
display: flex;
align-items: flex-start;
margin-bottom: 4px;
.bottomIcon{
width: 16px;
height: 16px;
margin-right: 4px;
margin-top: 2px;
align-items: center;
justify-content: space-between;
.bottomItemLeft{
.bottomItem{
display: flex;
align-items: flex-start;
margin-bottom: 4px;
.bottomIcon{
width: 16px;
height: 16px;
margin-right: 4px;
margin-top: 2px;
}
.text{
flex: 1;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #5C5773;
line-height: 22px;
}
}
}
.text{
flex: 1;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #5C5773;
line-height: 22px;
.bottomItemRight{
width: 60px;
height: 60px;
border-radius: 8px;
overflow: hidden;
.icon{
width: 100%;
height: 100%;
}
}
}
}
}
::-webkit-scrollbar {