修改页面细节

App.vue

@@ -23,21 +23,21 @@ export default {
   },
   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;
-	}
+	// 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/top-title/top-title.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="title-box" :class="[pageScroll > 140 ? 'scroll-style' : '', androidFlag ? 'androidHeight' : 'iosHeight']">
+    <view class="title-box" :class="[pageScroll > 140 ? 'scroll-style' : '', btnTop > 35 ? 'androidHeight' : 'iosHeight']">
 	      <view class="title-font" :style="{top:btnTop + 'px'}">{{titleValue}}</view>
     </view>
   </view>
@@ -19,18 +19,13 @@ export default {
 	},
 	btnTop:{
 		type:Number,
-		default:30
-	},
-	androidFlag:{
-		type:Boolean,
-		default:false
+		default:0
 	},
   },
   data() {
     return {};
   },
   mounted() {
-  	console.log(this.btnTop,this.androidFlag)
   },
   methods: {
   },

pages/activity/activity_deatil.vue

@@ -5,7 +5,7 @@
         <view class="title">
           {{ model.title }}
         </view>
-        <view class="read">阅读量 {{ model.read }}</view>
+        <view class="read">浏览量 {{ model.read }}</view>
       </view>
       <!-- <view class="header-image">
         <image :src="model.url" alt="" />

pages/enterprise/index.vue

@@ -221,7 +221,7 @@ export default {
       border-radius: 20rpx;
       box-shadow: rgba(0, 0, 0, 0.35) 0rpx 5rpx 15rpx;
       padding: 2%;
-      margin: 2% 0;
+      margin: 3% 0;
       .title {
         display: flex;
         align-items: center;

pages/index/index.vue

@@ -4,7 +4,6 @@
       :titleValue="title"
       :pageScroll="scrollVal"
 	  :btnTop="btnPos"
-	  :androidFlag="isAndroidFlag"
       style="width: 100%"
     ></top-title>
     <view class="page-section-spacing" style="width: 100%; position: relative">
@@ -316,7 +315,6 @@ export default {
       scrollVal: Number,
       footFlag: true,
 	  btnPos:uni.getMenuButtonBoundingClientRect().top + 6,
-	  isAndroidFlag:getApp().globalData.isAndroid,
       swiperList: [
         {
           img: "/static/swiper/swiper1.jpg",

pages/policy/index.vue

@@ -48,61 +48,23 @@
           :key="idx"
           @click="enterPolicyDeatil(item.id)"
         >
-          <view class="policy-content-item-left">
             <p class="policy-content-item-left-title" style="height: 86rpx">
               {{ item.title }}
             </p>
             <view class="policy-content-item-left-time">
               <p class="moment">{{ item.publish_time | globalTime }}</p>
-              <p class="maxMony">{{ item.project_money }}</p>
-              <p
-                class="leftDay"
-                v-if="
-                  item.project_end_date &&
-                  Math.floor(
-                    new Date(
-                      new Date(item.project_end_date).getTime() -
-                        new Date().getTime()
-                    ).getTime() /
-                      (1 * 24 * 60 * 60 * 1000)
-                  ) +
-                    1 >=
-                    1
-                "
-              >
-                剩{{
-                  Math.floor(
-                    new Date(
-                      new Date(item.project_end_date).getTime() -
-                        new Date().getTime()
-                    ).getTime() /
-                      (1 * 24 * 60 * 60 * 1000)
-                  ) + 1
-                }}天
+              <p class="maxMony" v-if="item.project_money!=='-'">{{ item.project_money }}</p>
+              <p class="leftDay" v-if=" item.project_end_date && Math.floor( new Date( new Date(item.project_end_date).getTime() -new Date().getTime() ).getTime() /(1 * 24 * 60 * 60 * 1000) ) +1 >= 1">
+                剩{{ Math.floor(new Date(new Date(item.project_end_date).getTime() -new Date().getTime()).getTime() /(1 * 24 * 60 * 60 * 1000)) + 1}}天
               </p>
-              <p
-                class="leftDay"
-                v-if="
-                  item.project_end_date &&
-                  Math.floor(
-                    new Date(
-                      new Date(item.project_end_date).getTime() -
-                        new Date().getTime()
-                    ).getTime() /
-                      (1 * 24 * 60 * 60 * 1000)
-                  ) +
-                    1 <
-                    1
-                "
-              >
+              <p class="leftDay"  v-if="item.project_end_date && Math.floor(new Date(new Date(item.project_end_date).getTime() - new Date().getTime()).getTime() / (1 * 24 * 60 * 60 * 1000)) + 1 < 1 ">
                 申报结束
               </p>
               <p class="leftDay" v-if="!item.project_end_date">长期可申报</p>
             </view>
-          </view>
-          <view class="policy-content-item-img">
+      <!--    <view class="policy-content-item-img">
             <image :src="item.pic_url" alt="" mode="aspectFill"/>
-          </view>
+          </view> -->
         </view>
       </view>
     </view>
@@ -332,13 +294,11 @@ export default {
         padding: 30rpx;
         justify-content: space-between;
 		align-items: center;
-        .policy-content-item-left {
-          display: flex;
-          flex-direction: column;
-          width: 75%;
+		flex-direction: column;
           .policy-content-item-left-title {
+			width: 100%;
             text-overflow: -o-ellipsis-lastline;
-            // overflow: hidden;
+            overflow: hidden;
             text-overflow: ellipsis;
             display: -webkit-box;
             -webkit-line-clamp: 2;
@@ -355,6 +315,7 @@ export default {
               color: #c1c1c1;
               font-size: 24rpx;
               margin-right: 20rpx;
+			  white-space: nowrap;
             }
             .maxMony {
               font-size: 24rpx;
@@ -363,6 +324,11 @@ export default {
               padding: 10rpx;
               margin-right: 20rpx;
               border-radius: 12rpx;
+			  overflow: hidden;
+			  text-overflow: ellipsis;
+			  white-space: nowrap;
+			  // width: 46%;
+			  // text-align: center;
             }
             .leftDay {
               font-size: 24rpx;
@@ -371,9 +337,9 @@ export default {
               padding: 10rpx;
               border: 1px solid #f7bbc3;
               border-radius: 12rpx;
+			  white-space: nowrap;
             }
           }
-        }
         .policy-content-item-img {
           image {
             width: 170rpx;

pages/selfCenter/collection.vue

@@ -238,6 +238,7 @@ export default {
           -webkit-box-orient: vertical;
           font-size: 32rpx;
           margin-bottom: 20rpx;
+		  height: 86rpx;
         }
         .policy-content-item-left-time {
           width: 100%;

pages/supply/index.vue

@@ -190,7 +190,7 @@ export default {
     .supplyCard {
       display: flex;
       width: 92%;
-      margin: 2% 0;
+      margin: 3% 0;
       padding: 2% 4%;
       height: 5%;
       border-radius: 30rpx;