Bläddra i källkod

Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/konggang-city-miniprogram

adminthw 4 år sedan
förälder
incheckning
4f426f2b9a

+ 1 - 0
App.vue

@@ -23,6 +23,7 @@ export default {
   },
   onShow: function () {
     console.log("App Show");
+    uni.hideTabBar({})
   },
   onHide: function () {
     console.log("App Hide");

+ 53 - 74
components/foot-tabs/footTabs.vue

@@ -1,22 +1,23 @@
 <template>
-  <view class="hover_content">
-    <view class="hover_menu flex">
-      <div class="sider" :class="isSider ? 'hoverd' : 'hover'"></div>
-      <view
+  <div class="hover_content">
+    <div class="hover_menu flex">
+      <div
         class="menu_icon"
         v-for="(menu, i) in menus"
         :key="i"
         @tap="click(i, menu.pagePath)"
       >
-        <view class="iconBox">
-          <span class="iconfont" :class="[menu.icon, (selectedIndex == i)? 'hoverd' : 'hover']"></span>
-        </view>
-      </view>
-    </view>
-  </view>
+        <!-- <uni-transition mode-class="fade" show="true" v-if="selectedIndex == i"> -->
+          <!-- <img :src="menu.selectedIconPath" /> -->
+		  <image class="tabbar-list-li-icon-image" :src="selectedIndex == i ? menu.selectedIconPath : menu.iconPath" mode=""></image>
+       <!-- </uni-transition> -->
+<!--        <uni-transition mode-class="fade" show="true" v-else>
+          <img :src="menu.iconPath" />
+        </uni-transition> -->
+      </div>
+    </div>
+  </div>
 </template>
-<style scoped src="../../static/iconfont.css">
-</style>
 <style lang="scss" scoped>
 .hover_content {
   z-index: 999;
@@ -32,89 +33,67 @@
   .hover_menu {
     display: flex;
     justify-content: space-around;
-    align-items: center;
-    margin-top: 10rpx;
-    .sider {
-      position: absolute;
-      width: 60rpx;
-      height: 60rpx;
-      border-radius: 50%;
-      left: 14%;
-      transition: all 0.1s;
-      background: rgb(14, 92, 246);
-      &.hover {
-        left: 14%;
-        background: rgb(14, 92, 246);
-      }
-      &.hoverd {
-        left: 61%;
-        background: rgb(14, 92, 246);
-      }
-    }
+	margin-top: 10rpx;
     .menu_icon {
-      position: relative;
-      .iconBox {
+      transition: all 0.5s;
+      image {
         width: 60rpx;
         height: 60rpx;
-        border-radius: 50%;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        .iconfont {
-          z-index: 999;
-          color: #fff;
-          font-size: 30rpx;
-          font-family: "iconfont" !important;
-          -webkit-font-smoothing: antialiased;
-          -moz-osx-font-smoothing: grayscale;
-          &.hover{
-            color: rgb(187, 187, 187);
-          }
-          &.hoverd{
-            color: #fff;
-          }
-        }
+        border-radius: 100rpx;
       }
     }
   }
 }
 </style>
 <script>
-import app from '../../App'
 export default {
-  data() {
+	props: ['selectedIndex'],
+	data() {
     return {
-      selectedIndex: app.globalData.selectedIndex,
-      showselected: false,
-      isSider: app.globalData.isSider,
+      // selectedIndex: 0,
+      // showselected: false,
       menus: [
         {
-          pagePath: "pages/index/index",
-          icon: "icon-zhuye",
-          text: "首页",
+          pagePath: "/pages/index/index",
+          iconPath: "/static/tabbar/home-select.png",
+          selectedIconPath: "/static/tabbar/home-selected.png",
+          text: "Ê×Ò³",
         },
         {
-          pagePath: "pages/selfCenter/index",
-          icon: "icon-geren",
-          text: "我的",
+          pagePath: "/pages/selfCenter/index",
+          iconPath: "/static/tabbar/user-select.png",
+          selectedIconPath: "/static/tabbar/user-selected.png",
+          text: "ÎÒµÄ",
         },
       ],
     };
   },
   methods: {
     click(index, src) {
-     this.selectedIndex = index
-     app.globalData.selectedIndex = index
-      if (index == 0) {
-        this.isSider = false;
-        app.globalData.isSider = false
-      } else {
-        this.isSider = true;
-        app.globalData.isSider = true
-      }
-      uni.redirectTo({
-        url: "/" + src,
-      });
+  //    let that = this;		
+  //    that.selectedIndex = index
+  //    getApp().globalData.selectedIndex = index 
+  //     if (index == 0) {
+		// that.isSider = false;
+		// getApp().globalData.isSider = false;
+  //     } else {
+		// that.isSider = true;
+		// getApp().globalData.isSider = true;
+  //     }
+	  uni.switchTab({
+	  	url:src,
+	  })
+	 // var pages = getCurrentPages();
+	 // uni.navigateTo({
+		// url: "/" + src,
+		// // animationType: 'pop-in',
+		// // animationDuration: 200
+	 // });
+	 // if(pages.length > 9){
+		//  uni.reLaunch({
+		// 	url: "/" + src,
+		//  });
+	 // }
     },
   },
 };

+ 5 - 1
components/footer-share/footer-share.vue

@@ -20,7 +20,7 @@
     >
       <view style="margin-right: 15rpx; font-size: 26rpx">收藏</view>
       <image
-        src="../../static/collection.png"
+        :src="isCollectedIcon ? '../../static/collected.png' : '../../static/collection.png'"
         mode="aspectFill"
         style="width: 40rpx; height: 40rpx"
       ></image>
@@ -36,6 +36,10 @@ export default {
       type: Boolean,
       default: false,
     },
+	isCollectedIcon: {
+	  type: Boolean,
+	  default: false,
+	},
   },
   data() {
     return {};

+ 53 - 25
pages.json

@@ -1,10 +1,9 @@
 {
-	"pages": [ 
-		{
+	"pages": [{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "空i企",
-				 "navigationStyle":"custom"  
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -12,14 +11,17 @@
 			"style": {
 				"navigationBarTitleText": "园区概况",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
 			"path": "pages/selfCenter/index",
 			"style": {
 				"navigationBarTitleText": "我的",
-				 "navigationStyle":"custom"  
+				"navigationStyle": "custom",
+			    "app-plus": {  
+			      "popGesture": "none"  
+			    }  
 			}
 		},
 		{
@@ -27,36 +29,39 @@
 			"style": {
 				"navigationBarTitleText": "我的收藏",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
 			"path": "pages/appeal/index",
 			"style": {
-				"navigationBarTitleText": "提建议",	
+				"navigationBarTitleText": "提建议",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
 			"path": "pages/appeal/myAppeal",
 			"style": {
-				"navigationBarTitleText": "我的诉求",				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTitleText": "我的诉求",
+				"navigationBarBackgroundColor": "#02A7F0",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
 			"path": "pages/appeal/putAppeal",
 			"style": {
-				"navigationBarTitleText": "提交诉求",				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTitleText": "提交诉求",
+				"navigationBarBackgroundColor": "#02A7F0",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
 			"path": "pages/appeal/appeal_detail",
 			"style": {
-				"navigationBarTitleText": "诉求详情",				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTitleText": "诉求详情",
+				"navigationBarBackgroundColor": "#02A7F0",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -72,11 +77,19 @@
 			}
 		},
 		{
+			"path": "pages/policy/search",
+			"style": {
+				"navigationBarTitleText": "政策搜索",
+				"navigationBarBackgroundColor": "#02A7F0",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
 			"path": "pages/park/index",
 			"style": {
 				"navigationBarTitleText": "园区专区",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -84,10 +97,10 @@
 			"style": {
 				"navigationBarTitleText": "地图找园区",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
-	
+
 		{
 			"path": "pages/activity/index",
 			"style": {
@@ -105,7 +118,7 @@
 			"style": {
 				"navigationBarTitleText": "供需管理",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -113,7 +126,7 @@
 			"style": {
 				"navigationBarTitleText": "发布供需",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -121,7 +134,7 @@
 			"style": {
 				"navigationBarTitleText": "我的供需",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -129,7 +142,7 @@
 			"style": {
 				"navigationBarTitleText": "供需详情",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -137,7 +150,7 @@
 			"style": {
 				"navigationBarTitleText": "查企业",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -145,7 +158,7 @@
 			"style": {
 				"navigationBarTitleText": "企业详情",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -153,7 +166,7 @@
 			"style": {
 				"navigationBarTitleText": "企业详情",
 				"navigationBarBackgroundColor": "#02A7F0",
-				"navigationBarTextStyle":"white"
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -198,5 +211,20 @@
 		"navigationBarTitleText": "空i企",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
+	},
+	"tabBar": {
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "/static/tabbar/home-select.png",
+				"selectedIconPath": "/static/tabbar/home-selected.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/selfCenter/index",
+				"iconPath": "/static/tabbar/user-select.png",
+				"selectedIconPath": "/static/tabbar/user-selected.png",
+				"text": "我的"
+			}
+		]
 	}
-}
+}

+ 1 - 0
pages/enterprise/enterprise_detail.vue

@@ -172,6 +172,7 @@ export default {
 <style lang="scss" scoped>
 .content {
   padding: 4%;
+  font-size: 30rpx;
   .blue{
       color: #02a7f0;
     }

+ 1 - 0
pages/enterprise/product_detail.vue

@@ -36,6 +36,7 @@ export default {
 <style lang="scss">
 .content {
   padding: 4%;
+  font-size: 30rpx;
   .title {
     display: flex;
     align-items: center;

+ 17 - 6
pages/index/index.vue

@@ -6,7 +6,7 @@
         indicator-dots="false"
         autoplay="true"
         duration="500"
-        style="height: 400rpx"
+        style="height: 440rpx"
         @change="swiperChange"
       >
         <swiper-item
@@ -74,7 +74,7 @@
           mode="aspectFit"
           style="width: 34px; height: 34px"
         ></image>
-        <view class="notice-content display-around-column">
+        <view class="notice-content display-around-column" style="width: 88%;">
           <view class="notice-content-font" style="margin-left: 40rpx">{{
             item.title
           }}</view>
@@ -272,13 +272,17 @@
         </view>
       </view>
     </view>
-    <foot-tabs></foot-tabs>
+    <foot-tabs :selectedIndex='0'></foot-tabs>
   </view>
 </template>
 
 <script>
 import md5 from "@/common/md5.js";
+import footTabs from '@/components/foot-tabs/footTabs.vue';
 export default {
+	components: {
+		'foot-tabs': footTabs
+	},
   data() {
     return {
       swiperList: [
@@ -406,12 +410,18 @@ export default {
       ],
     };
   },
+  onShow() {
+	  uni.hideTabBar({})
+  },
   onLoad() {
     this.getSwiperList();
     this.getPark();
     this.getNotice();
     //   this.loginLoad();
   },
+  onShareAppMessage() {
+  	url:'/pages/index/index'
+  },
   methods: {
     swiperChange(e) {
       this.swiperCurrent = e.detail.current;
@@ -593,6 +603,7 @@ export default {
   flex-direction: column;
   align-items: center;
   justify-content: center;
+  position: relative;
 }
 
 .logo {
@@ -622,7 +633,7 @@ export default {
 .rowDot {
   display: flex;
   position: absolute;
-  top: 270rpx;
+  top: 310rpx;
   left: 80rpx;
 }
 .dots {
@@ -654,7 +665,7 @@ export default {
   box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.1);
   border-radius: 32rpx;
   position: absolute;
-  top: 300rpx;
+  top: 360rpx;
   background-color: #fff;
 }
 .nav-content {
@@ -674,7 +685,7 @@ export default {
 }
 .notice-box {
   width: 83%;
-  margin-top: 300rpx;
+  margin-top: 320rpx;
   margin-bottom: 20rpx;
 }
 .notice-title-box {

+ 0 - 1
pages/notice/notice_deatil.vue

@@ -46,7 +46,6 @@ export default {
       let postData = {
         id: this.id,
       };
-
       //获取文章
       uni.request({
         url: url,

+ 12 - 8
pages/park/park_deatil.vue

@@ -138,12 +138,12 @@
 		data() {
 			return {
 			    swiperList:[
-					{
-						img:'/static/swiper/swiper1.jpg'
-					},
-					{
-						img:'/static/swiper/swiper2.jpg'
-					},
+					// {
+					// 	img:'/static/swiper/swiper1.jpg'
+					// },
+					// {
+					// 	img:'/static/swiper/swiper2.jpg'
+					// },
 				],
 				nowId:'',
 				levelList:{
@@ -268,8 +268,12 @@
 					data:postData,
 					success: (res) => {
 						if(res.data.code === 200){
-							res.data.data.park_pics.forEach((item)=>{item.pic_path = getApp().globalData.shareUrl + item.pic_path})
-							this.swiperList = res.data.data.park_pics;
+							if(res.data.data.park_pics.length){
+								res.data.data.park_pics.forEach((item)=>{item.pic_path = getApp().globalData.shareUrl + item.pic_path})
+								this.swiperList = res.data.data.park_pics;
+							}else{
+								this.swiperList = [{pic_path:'/static/park/1.png'}]
+							}
 							this.detailObj = res.data.data;
 							this.detailObj.location = this.detailObj.location.split(',');
 							this.latitude = this.detailObj.location[0];

+ 7 - 37
pages/policy/index.vue

@@ -19,7 +19,7 @@
     </view>
     <view class="input-box">
       <image src="/static/policy/u377.png" alt="" />
-      <input type="text" placeholder="请输入政策关键词搜索" confirm-type="search" @confirm="searchPoliy()" v-model="searchVal"/>
+      <input type="text" placeholder="请输入政策关键词搜索" confirm-type="search" @confirm="searchPoliy()" v-model="searchVal" @focus="search"/>
     </view>
     <view class="policy-box">
       <view class="policy-title"><p>最新政策</p></view>
@@ -64,12 +64,6 @@ export default {
   data() {
     return {
       swiperList: [
-        // {
-        //   img: "/static/swiper/swiper1.jpg",
-        // },
-        // {
-        //   img: "/static/swiper/swiper2.jpg",
-        // },
       ],
       policyList: ["省级政策", "市级政策", "区级政策", "新城政策"],
       active: 0,
@@ -88,6 +82,11 @@ export default {
 	  this.getPolicyList()
   },
   methods: {
+    search() {
+      uni.redirectTo({
+        url: "./search",
+      });
+    },
     enterPolicyDeatil(id) {
       uni.navigateTo({
         url: "/pages/policy/policy_deatil?id=" + id,
@@ -111,35 +110,6 @@ export default {
 				break;			
 		}
 	},
-	searchPoliy(){
-		let md5Sign = md5(
-		  "method=" +
-		    "common" +
-		    "&timestamp=" +
-		    getApp().globalData.globalTimestamp +
-		    "&secret=" +
-		    getApp().globalData.secret
-		);
-		let url = getApp().globalData.shareUrl +"api/api.php" +"?method=common&source=policy&action=list&timestamp=" +getApp().globalData.globalTimestamp +"&sign=" +md5Sign;
-			  uni.request({
-				url: url,
-				method: "POST",
-				header: {
-				  "content-type": "application/x-www-form-urlencoded",
-				},
-				data: {
-				  ss_content_text:this.searchVal   //1.省 2.市 3.区 4.新城
-				},
-				success: (res) => {
-				  console.log(res);
-				  if (res.data.code === 200) {
-				  }
-				},
-				fail: () => {
-				  console.log("连接失败");
-				},
-		});
-	},
 	getPolicySwiper() {
 	  let md5Sign = md5(
 	    "method=" +
@@ -229,7 +199,7 @@ export default {
   .input-box {
     width: 100%;
     height: 100rpx;
-    background-color: #6ea0ec;
+    background-color: #02a7f0;
     display: flex;
     justify-content: center;
     align-items: center;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 397 - 175
pages/policy/policy_deatil.vue


+ 186 - 0
pages/policy/search.vue

@@ -0,0 +1,186 @@
+<template>
+  <view class="content">
+    <view class="input-box">
+      <image src="/static/policy/u377.png" alt="" />
+      <input type="text" placeholder="请输入政策关键词搜索" confirm-type="search" @confirm="searchPoliy()" v-model="searchVal"/>
+    </view>
+    <view class="policy-box">
+      <view class="policy-content">
+        <view
+          class="policy-content-item"
+          v-for="(item, idx) in policyData"
+          :key="idx"
+          @click="enterPolicyDeatil(item.id)"
+        >
+          <view class="policy-content-item-left">
+            <p class="policy-content-item-left-title" style="height: 70rpx;">{{ 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">{{ (item.project_end_date | globalTime) || '长期可申报' }}</p>
+            </view>
+          </view>
+          <view class="policy-content-item-img">
+            <image :src="'https://kiq.xazhima.com'+item.pic_url" alt="" />
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import md5 from "@/common/md5.js";
+export default {
+  data() {
+    return {
+      active: 0,
+	    searchVal:'',
+      policyData: [],
+    };
+  },
+  methods: {
+    enterPolicyDeatil(id) {
+      uni.navigateTo({
+        url: "/pages/policy/policy_deatil?id=" + id,
+      });
+    },
+	searchPoliy(){
+		let md5Sign = md5(
+		  "method=" +
+		    "common" +
+		    "&timestamp=" +
+		    getApp().globalData.globalTimestamp +
+		    "&secret=" +
+		    getApp().globalData.secret
+		);
+		let url = getApp().globalData.shareUrl +"api/api.php" +"?method=common&source=policy&action=list&timestamp=" +getApp().globalData.globalTimestamp +"&sign=" +md5Sign;
+			  uni.request({
+				url: url,
+				method: "POST",
+				header: {
+				  "content-type": "application/x-www-form-urlencoded",
+				},
+				data: {
+				  ss_content_text:this.searchVal   //1.省 2.市 3.区 4.新城
+				},
+				success: (res) => {
+          if (res.data.code === 200) {
+            this.policyData = res.data.data.list
+            console.log(res.data.data.list);
+				  }
+				},
+				fail: () => {
+				  console.log("连接失败");
+				},
+		});
+	},
+  },
+};
+</script>
+
+<style lang="scss">
+.content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  .input-box {
+    width: 100%;
+    height: 100rpx;
+    background-color: #02a7f0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: relative;
+    image {
+      position: absolute;
+      left: 72rpx;
+	  width: 30rpx;
+	  height: 30rpx;
+    }
+    input {
+      background-color: #ffffff;
+      width: 90%;
+      height: 70%;
+      border-radius: 50rpx;
+      padding: 3rpx;
+      font-size: 26rpx;
+      padding-left: 80rpx;
+      box-sizing: border-box;
+    }
+  }
+  .policy-box {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    .policy-content {
+      width: 100%;
+      display: flex;
+      box-sizing: border-box;
+      flex-direction: column;
+	  margin-top: 10rpx;
+      .policy-content-item {
+        margin: 0 20rpx;
+        display: flex;
+        box-shadow: 0px 4rpx 32rpx rgba(0, 0, 0, 0.1);
+        border-radius: 32rpx;
+        padding-bottom: 10rpx;
+        margin-top: 20rpx;
+        padding: 30rpx;
+        justify-content: space-between;
+        .policy-content-item-left {
+          display: flex;
+          flex-direction: column;
+          width: 70%;
+          .policy-content-item-left-title {
+            text-overflow: -o-ellipsis-lastline;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            line-clamp: 2;
+            -webkit-box-orient: vertical;
+            font-size: 25rpx;
+            margin-bottom: 10rpx;
+          }
+          .policy-content-item-left-time {
+            width: 100%;
+            display: flex;
+            align-items: center;
+            .moment {
+              color: #c1c1c1;
+              font-size: 20rpx;
+              margin-right: 20rpx;
+            }
+            .maxMony {
+              font-size: 20rpx;
+              color: #00bfbf;
+              border: 1px solid #00bfbf;
+              padding: 10rpx;
+              margin-right: 20rpx;
+              border-radius: 12rpx;
+            }
+            .leftDay {
+              font-size: 20rpx;
+              background: #f7bbc3;
+              color: #e32579;
+              padding: 10rpx;
+              border: 1px solid #f7bbc3;
+              border-radius: 12rpx;
+            }
+          }
+        }
+        .policy-content-item-img {
+          image {
+            width: 180rpx;
+            height: 120rpx;
+            border-radius: 12rpx;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

+ 10 - 10
pages/selfCenter/index.vue

@@ -1,18 +1,13 @@
 <template>
   <view class="content">
-    <foot-tabs></foot-tabs>
     <div class="self-inf">
       <div class="img-name-box" v-if="isAuth">
-        <image
-          :src="userHeadImg"
-          alt=""
-          class="heade-img"
-          mode="aspectFill"
-        ></image>
+        <image :src="userHeadImg" class="heade-img" mode="aspectFill"></image>
         <p class="nickname">{{ userNickName }}</p>
       </div>
       <view class="img-name-box" v-if="!isAuth">
-        <button @click="goAuthPage()" class="auth-btn">点击去授权</button>
+		<image src="/static/auth-icon.png" class="heade-img" mode="aspectFill"></image>
+        <button @click="goAuthPage()" class="auth-btn">授权登录</button>
       </view>
       <image class="bg-img" :src="swiperBackground" mode="aspectFill"></image>
       <image src="../../static/Intersect.svg" class="groove-img"></image>
@@ -35,12 +30,17 @@
         </div>
       </div>
     </div>
+	<foot-tabs :selectedIndex='1'></foot-tabs>
   </view>
 </template>
 
 <script>
 import md5 from "@/common/md5.js";
+import footTabs from '@/components/foot-tabs/footTabs.vue';
 export default {
+	components: {
+		'foot-tabs': footTabs
+	},
   data() {
     return {
       message: "我的",
@@ -256,8 +256,8 @@ export default {
       display: flex;
       align-items: center;
       .auth-btn {
-        margin-left: 80rpx;
-        margin-top: 50rpx;
+		margin-left: 30rpx;
+		margin-top: 20rpx;
         font-size: 28rpx;
         background-color: #02a7f0;
         color: #fff;

BIN
static/attract/u2043.png


BIN
static/auth-icon.png


BIN
static/collected.png