6.16 22.23

pages/commercialBI/formatDetail.vue

@@ -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">
+              <div class="suggest"  v-if="detail.MerchantName">
-                <text class="value">{{detail.COMMISSION_RATIO}}</text>
+                {{detail.MerchantName || ''}}
-                <text class="text">建议提成比例</text>
+<!--                <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,11 +180,13 @@ 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}`
         })
       }
     }
+  }
 
 }
 </script>
@@ -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;

pages/commercialBI/formatPortrait.vue

@@ -64,9 +64,10 @@
                   <div class="labelItem">{{item.BUSINESSTRADE_NAME}}</div>
                   <div class="labelItem">{{item.BRAND_TYPENAME}}</div>
                 </div>
-                <div class="suggest">
+                <div class="suggest" v-if="item.MerchantName">
-                  <text class="value">{{item.COMMISSION_RATIO || '-'}}</text>
+                  {{item.MerchantName || ''}}
-                  <text class="text">建议提成比例</text>
+<!--                  <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;

pages/commercialBI/shopDetail.vue

@@ -13,9 +13,9 @@
         </div>
         <div class="detail" :style="{top:(menu.bottom + 22) + 'px'}">
           <div class="box" >
-            <div class="left">
+<!--            <div class="left">-->
-              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/storeIcon.png"></image>
+<!--              <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/brand/storeIcon.png"></image>-->
-            </div>
+<!--            </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" >
+                <scroll-view scroll-x="true" style="width: 100%;height: 80px;white-space: nowrap;">
-                  <img  class="brandItem" :src="subItem.ico"/>
+                    <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,11 +115,14 @@
                 <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>
 
+            <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>
@@ -126,6 +132,17 @@
                   <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
+      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;
@@ -384,17 +408,20 @@ export default {
               display: flex;
               margin-top: 10px;
                 .imgBox{
-                width: 60px;
+                  display: inline-block;
-                height: 60px;
                   border-radius: 6px;
                   margin-right: 8px;
-                overflow: hidden;
+                  text-align: center;
                   .brandItem{
-                  width: 60px;
+                    width: 50px;
-                  height: 60px;
+                    height: 50px;
+                    border-radius: 4px;
+                  }
+                  .value{
+                    display: block;
+                    font-size: 12px;
                   }
                 }
-
             }
 
 
@@ -680,6 +707,11 @@ export default {
               }
             }
           }
+          .bottom{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            .bottomItemLeft{
               .bottomItem{
                 display: flex;
                 align-items: flex-start;
@@ -700,6 +732,19 @@ export default {
                 }
               }
             }
+            .bottomItemRight{
+              width: 60px;
+              height: 60px;
+              border-radius: 8px;
+              overflow: hidden;
+              .icon{
+                width: 100%;
+                height: 100%;
+              }
+            }
+          }
+
+        }
       }
       ::-webkit-scrollbar {
         width: 4px;