添加安卓系统顶部兼容

App.vue

@@ -19,9 +19,25 @@ export default {
 	contact_name:'',
 	company_name:'',
 	company_logo:'',
+	isAndroid:false
   },
   onLaunch: function () {
     console.log("App Launch");
+	let equType = uni.getSystemInfoSync().platform;
+	 switch(equType){
+	    case 'android':
+	       console.log('运行Android上')
+			setTimeout(()=>{
+				getApp().globalData.isAndroid = true 
+			},100)
+	       break;
+	    case 'ios':
+	       console.log('运行iOS上');
+	       break;
+	    default:
+	       console.log('运行在开发者工具上')
+	       break;
+	}
 	this.loginLoad();
   },
   onShow: function () {

components/foot-tabs/footTabs.vue

@@ -55,7 +55,7 @@ export default {
 		isShow:{
 			type:Boolean,
 			default:true
-		}
+		},
 	},
 	data() {
     return {

components/footer-share/footer-share.vue

@@ -3,7 +3,7 @@
     <button
       class="display-flex-start items-center share-font"
       :style="{ 'border-right': isCollection ? '1px solid #d8d8d8' : 'none' }"
-      open-type="share"
+      open-type="share" style="background: transparent;"
       @click="sharePage()"
     >
       <view style="margin-right: 15rpx; font-size: 26rpx">分享</view>

components/top-title/top-title.vue

@@ -1,6 +1,6 @@
 <template>
-    <view class="title-box" :class="pageScroll > 140 ? 'scroll-style' : ''">
-	      {{titleValue}}
+    <view class="title-box" :class="[pageScroll > 140 ? 'scroll-style' : '', androidFlag ? 'androidHeight' : 'iosHeight']">
+	      <view class="title-font" :style="{top:btnTop + 'px'}">{{titleValue}}</view>
     </view>
   </view>
 </template>
@@ -11,16 +11,27 @@ export default {
   props: {
     titleValue: {
       type: String,
-      default: '空i企',
+      default: 'Air企通',
     },
 	pageScroll:{
 		type:Number,
 		default:0
-	}
+	},
+	btnTop:{
+		type:Number,
+		default:30
+	},
+	androidFlag:{
+		type:Boolean,
+		default:false
+	},
   },
   data() {
     return {};
   },
+  mounted() {
+  	console.log(this.btnTop,this.androidFlag)
+  },
   methods: {
   },
 };
@@ -29,21 +40,26 @@ export default {
 <style>
 .title-box {
     width: 100%;
-    height: 80rpx;
     background: transparent;
     position: fixed;
-    top: 40rpx;
-    color: #fff;
-    letter-spacing: 6rpx;
+    top: 0px;
     z-index: 9999;
     text-align: center;
-	font-weight: 550;
-	line-height: 90rpx;
+}
+.iosHeight{
+	height: 145rpx;
+}
+.androidHeight{
+	height: 200rpx;
 }
 .scroll-style {
 	background: #4AA5E4;
-	top: 0;
-	height: 145rpx;
-	line-height: 160rpx;
+}
+.title-font {
+	position: absolute;
+	left: 41%;
+	font-weight: bold;
+	color: #fff;
+	letter-spacing: 6rpx;
 }
 </style>

pages/activity/activity_deatil.vue

@@ -32,8 +32,8 @@
     </view>
     <view class="share-box">
       <view class="share">
-        <button class="share" @click="shareActive()" open-type="share">
-          <image src="../../static/share_icon.png"></image>
+        <button class="share" @click="shareActive()" open-type="share" style="background: transparent;">
+          <image src="../../static/share_icon.svg"></image>
         </button>
         <view class="shareCount">{{ model.share }}</view>
       </view>
@@ -429,8 +429,8 @@ export default {
       display: flex;
       justify-content: center;
       align-items: center;
-      width: 50rpx;
-      height: 50rpx;
+      width: 60rpx;
+      height: 60rpx;
       position: relative;
       button::after {
         border: none;
@@ -445,8 +445,8 @@ export default {
         justify-content: center;
         align-items: center;
         position: absolute;
-        top: -30%;
-        right: -30%;
+        top: -20%;
+        right: -25%;
         color: #ffffff;
         height: 30rpx;
         width: 30rpx;

pages/activity/index.vue

@@ -388,7 +388,11 @@ export default {
               }
             }
             .inf-way {
-              margin-right: 20rpx;
+              // margin-right: 20rpx;
+			  width: 77%;
+			  overflow: hidden;
+			  text-overflow: ellipsis;
+			  white-space: nowrap;
             }
             .inf-date {
               white-space: nowrap;

pages/index/index.vue

@@ -3,6 +3,8 @@
     <top-title
       :titleValue="title"
       :pageScroll="scrollVal"
+	  :btnTop="btnPos"
+	  :androidFlag="isAndroidFlag"
       style="width: 100%"
     ></top-title>
     <view class="page-section-spacing" style="width: 100%; position: relative">
@@ -53,23 +55,17 @@
       </navigator>
     </view>
 
-    <view class="notice-box">
-      <view class="notice-title-box">
+    <view class="notice-box" style="width:90%;">
+      <view class="notice-title-box" style="margin: 0 auto;margin-bottom: 30rpx;">
         <view class="notice-font">通知公告</view>
         <view class="notice-more-font">
-          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goNotice"
-            >更多</view
-          >
-          <image
-            src="../../static/right-arrow-blue.png"
-            mode="aspectFill"
-            style="width: 12rpx; height: 16rpx"
-          ></image>
+          <view style="margin-right: 8rpx; font-size: 26rpx" @click="goNotice">更多</view>
+          <image src="../../static/right-arrow-blue.png"mode="aspectFill" style="width: 12rpx; height: 16rpx"></image>
         </view>
       </view>
       <view
         class="notice-content-box"
-        style="justify-content: flex-start"
+        style="justify-content: flex-start;border-radius: 0;"
         v-for="(item, index) in noticeList"
         :key="index"
         @click="goNoticeDeatil(item.id)"
@@ -90,7 +86,7 @@
       </view>
     </view>
 
-    <view class="notice-box" style="margin-top: 40rpx">
+    <view class="notice-box" style="margin-top: 40rpx;width: 90%;">
       <view class="notice-title-box">
         <view class="notice-font">推荐园区</view>
         <navigator
@@ -187,8 +183,8 @@
       </view>
     </view>
 
-    <view class="notice-box" style="margin-top: 20rpx">
-      <view class="notice-title-box">
+    <view class="notice-box" style="margin-top: 20rpx;width: 90%;">
+      <view class="notice-title-box" style="margin: 0 auto;margin-bottom: 30rpx;">
         <view class="notice-font">招商专区</view>
         <view class="notice-more-font">
           <view style="margin-right: 8rpx; font-size: 26rpx" @click="goAttract"
@@ -206,7 +202,7 @@
         class="notice-content-box"
         v-for="(item, index) in attractList"
         :key="index"
-        style="justify-content: start; position: relative"
+        style="justify-content: start; position: relative;border-radius: 0;"
         @click="goAttractDeatil(item.id, item.time_type)"
       >
         <view class="maskModal" v-if="item.time_type == 0">
@@ -241,8 +237,8 @@
       </view>
     </view>
 
-    <view class="notice-box" style="margin-top: 20rpx">
-      <view class="notice-title-box">
+    <view class="notice-box" style="margin-top: 40rpx;width:90%;">
+      <view class="notice-title-box" style="margin: 0 auto;margin-bottom: 30rpx;">
         <view class="notice-font">区内活动</view>
         <view class="notice-more-font">
           <view style="margin-right: 8rpx; font-size: 26rpx" @click="goActive"
@@ -260,7 +256,7 @@
         class="notice-content-box"
         v-for="(item, index) in activityList"
         :key="index"
-        style="justify-content: start; padding: 30rpx 0 30rpx 30rpx"
+        style="justify-content: start; padding: 30rpx 0 30rpx 30rpx;border-radius: 0;"
         @click="goActiveDeatil(item.id)"
       >
         <image
@@ -319,6 +315,8 @@ export default {
       title: "Air企通",
       scrollVal: Number,
       footFlag: true,
+	  btnPos:uni.getMenuButtonBoundingClientRect().top + 6,
+	  isAndroidFlag:getApp().globalData.isAndroid,
       swiperList: [
         {
           img: "/static/swiper/swiper1.jpg",
@@ -449,6 +447,7 @@ export default {
     this.getActive();
   },
   onLoad() {
+	  
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -766,7 +765,7 @@ export default {
       this.footFlag = true;
     }
   },
-  onReachBottom() {
+  onReachBottom(e) {
     this.footFlag = false;
   },
 };
@@ -835,13 +834,13 @@ export default {
   /* border-radius: 0 0 10% 10%; */
 /* } */
 .page-nav-box {
-  width: 80%;
+  width: 88%;
   /* height: 320rpx; */
   display: flex;
   flex-wrap: wrap;
   padding: 20rpx 10rpx 30rpx 10rpx;
   box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.1);
-  border-radius: 32rpx;
+  border-radius: 16rpx;
   position: absolute;
   top: 360rpx;
   background-color: #fff;
@@ -876,8 +875,8 @@ export default {
 .notice-font {
   font-family: PingFang SC;
   font-style: normal;
-  font-weight: 600;
-  font-size: 36rpx;
+  font-weight: bold;
+  font-size: 38rpx;
   letter-spacing: 0.02em;
   color: #0d1937;
 }
@@ -890,7 +889,7 @@ export default {
 
 .notice-content-box {
   display: flex;
-  padding: 30rpx;
+  padding: 30rpx 20rpx 30rpx 20rpx;
   background-color: #ffffff;
   box-shadow: 0px 4rpx 32rpx rgba(0, 0, 0, 0.1);
   border-radius: 32rpx;

pages/policy/index.vue

@@ -115,7 +115,7 @@ export default {
   data() {
     return {
       swiperList: [],
-      policyList: ["省级政策", "市级政策", "区级政策", "新城政策"],
+      policyList: ["省级政策", "市级政策", "新区政策", "新城政策"],
       active: 0,
       searchVal: "",
       policyData: new Array(5).fill({

pages/policy/policy_deatil.vue

@@ -179,7 +179,7 @@ export default {
       levelList: {
         1: "省级政策",
         2: "市级政策",
-        3: "区级政策",
+        3: "新区政策",
         4: "新城政策",
       },
       id: "",

pages/selfCenter/collection.vue

@@ -23,7 +23,8 @@
             </view>
           </view>
         </view>
-      </view>
+        <image src="../../static/nodata.svg" mode="aspectFit" style="width: 100%;" v-if="policyData.length === 0"></image>
+	  </view>
       <view class="policy-content" v-if="active == 1">
         <view class="policy-content-item" v-for="(company, index) in companyList" :key="index" @click="toDetail(company.source_id)">
 		   <view class="policy-content-item-left">
@@ -33,9 +34,10 @@
 			 <view class="policy-content-item-left-time">
 			   <p class="moment">收藏时间： {{ company.addtime | globalTime }}</p>
 			 </view>
-       </view>
+			</view>
 		</view>
-      </view>
+        <image src="../../static/nodata.svg" mode="aspectFit" style="width: 100%;" v-if="companyList.length === 0"></image>
+	  </view>
     </view>
   </view>
 </template>

pages/selfCenter/my_activity.vue

@@ -1,12 +1,10 @@
 <template>
   <view class="content">
   <div class="actives">
-    <div
-      v-for="(active, idx) in activeListCopy"
+    <div v-for="(active, idx) in activeListCopy"
       :key="idx"
       class="actives-item"
-      @click="goDeatil(active.id)"
-    >
+      @click="goDeatil(active.id)">
       <div class="active-content">
         <div class="img-box"><img :src="active.url" alt="" /></div>
         <div class="right">
@@ -45,6 +43,7 @@
         <div class="share">分享 {{ active.share }}</div>
       </div>
     </div>
+     <image src="../../static/nodata.svg" mode="aspectFit" style="width: 100%;" v-if="activeListCopy.length === 0"></image>
   </div>
   </view>
 </template>
@@ -233,7 +232,8 @@ export default {
       padding: 20rpx;
       display: flex;
       flex-direction: column;
-	  margin-bottom: 20rpx;
+	  margin-top: 20rpx;
+	  margin-bottom: 10rpx;
       .active-content {
         display: flex;
         .img-box {
@@ -286,7 +286,10 @@ export default {
               }
             }
             .inf-way {
-              margin-right: 20rpx;
+				width: 77%;
+                 overflow: hidden;
+                 text-overflow: ellipsis;
+                 white-space: nowrap;
             }
             .inf-date {
               white-space: nowrap;