修改

components/views/activity-view.vue

@@ -4,7 +4,7 @@
 			<search-bar :disabled="true"></search-bar>
 		</view>
 		<view class="padding-tb bg-white">
-			<u-swiper height="350" mode="none" :list="imgList" :effect3d="true" bg-color="#fff" interval="5000"></u-swiper>
+			<u-swiper height="350" mode="none" :list="imgList" :effect3d="true" bg-color="#fff" interval="5000" @click="navByIcon('/pages/activity/activityDetail')"></u-swiper>
 		</view>
 		<view class="flex justify-around text-center padding-tb bg-white">
 			<block v-for="(item,index) in icons" :key="index">
@@ -15,36 +15,36 @@
 			</block>
 		</view>
 		<view class="margin-top-sm bg-white flex justify-around align-end" style="height: 350upx;">
-			<view class="second text-center">
+			<view class="second text-center" @click="navWithParm">
 				<view class="margin-top-sm">
 					<u-avatar src="/static/avatar.png" size="120"></u-avatar>
 				</view>
 				<view class="text-bold text-lg text-black">1230545</view>
-				<view class="flex justify-center" @click="navWithParm">
+				<view class="flex justify-center">
 					<view class="hot-btn margin-top-xs">
 						<text class="cuIcon-hotfill padding-right-xs"></text>
 						<text>打榜</text>
 					</view>
 				</view>
 			</view>
-			<view class="first text-center">
+			<view class="first text-center" @click="navWithParm">
 				<view class="margin-top-sm">
 					<u-avatar src="/static/avatar.png" size="130"></u-avatar>
 				</view>
 				<view class="margin-top-xs text-bold text-lg text-black">1230545</view>
-				<view class="flex justify-center" @click="navWithParm">
+				<view class="flex justify-center">
 					<view class="hot-btn margin-top-xs">
 						<text class="cuIcon-hotfill padding-right-xs"></text>
 						<text>打榜</text>
 					</view>
 				</view>
 			</view>
-			<view class="third text-center">
+			<view class="third text-center" @click="navWithParm">
 				<view class="margin-top-sm">
 					<u-avatar src="/static/avatar.png" size="120"></u-avatar>
 				</view>
 				<view class="text-bold text-lg text-black">1230545</view>
-				<view class="flex justify-center" @click="navWithParm">
+				<view class="flex justify-center">
 					<view class="hot-btn margin-top-xs">
 						<text class="cuIcon-hotfill padding-right-xs"></text>
 						<text>打榜</text>
@@ -53,7 +53,7 @@
 			</view>
 		</view>
 		<block v-for="(item, index) in 6" :key="index">
-			<view class="padding-sm flex justify-between align-center bg-white">
+			<view class="padding-sm flex justify-between align-center bg-white" @click="navWithParm">
 				<view class="flex justify-around align-center">
 					<view class="padding-right text-black text-bold">{{index + 4}}</view>
 					<view class="padding-right">
@@ -96,9 +96,10 @@
 		data() {
 			return {
 				icons: [
-					{image: '/static/activity.png', name: '活动介绍', url: '/pages/activity/activityDetail'},
+					{image: '/static/song.png', name: '活动介绍', url: '/pages/activity/activityDetail'},
 					{image: '/static/signUp.png', name: '点击报名', url: '/pages/activity/signUp'},
 					{image: '/static/hot.png', name: '热度榜', url: '/pages/activity/hot'},
+					{image: '/static/activity.png', name: '我的奖金', url: '/pages/activity/awards'},
 					{image: '/static/more.png', name: '更多', url: '/pages/activity/songRank'},
 				],
 			}
@@ -114,7 +115,7 @@
 				uni.navigateTo({
 					url: "/pages/activity/boost"
 				})
-			}
+			},
 		}
 	}
 </script>

pages.json

@@ -49,6 +49,14 @@
             }
             
         }
+		,{
+		    "path" : "pages/activity/awards",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": ""
+		    }
+		    
+		}
         ,{
             "path" : "pages/activity/boost",
             "style" :                                                                                    
@@ -96,14 +104,6 @@
                 "navigationBarTitleText": "我的公益"
             }
             
-        }
-        ,{
-            "path" : "pages/mine/myAwards",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": ""
-            }
-            
         }
         ,{
             "path" : "pages/mine/myGift",

pages/activity/hot.vue

@@ -1,9 +1,12 @@
 <template>
 	<view>
+		<view class="searchBar">
+			<search-bar :disabled="true"></search-bar>
+		</view>
 		<block v-for="(item, index) in hotList" :key="index">
-			<view class="padding-sm flex justify-between align-center bg-white">
+			<view class="padding-sm flex justify-between align-center bg-white" @click="navWithParm">
 				<view class="flex justify-around align-center">
-					<view class="padding-right text-black text-bold">{{index + 1}}</view>
+					<view class="padding-right text-center text-black text-bold" style="width: 60upx;">{{index + 1}}</view>
 					<view class="padding-right">
 						<u-avatar :src="item.avatar" size="130"></u-avatar>
 					</view>
@@ -24,7 +27,11 @@
 </template>
 
 <script>
+	import searchBar from "@/components/basic/search-bar.vue";
 	export default {
+		components: {
+			searchBar,
+		},
 		data() {
 			return {
 				hotList: [
@@ -45,7 +52,12 @@
 			console.log("到底了")
 		},
 		methods: {
-			
+			//跳转需要带惨方法
+			navWithParm() {
+				uni.navigateTo({
+					url: "/pages/activity/boost"
+				})
+			}
 		}
 	}
 </script>

pages/mine/myAwards.vue

@@ -1,85 +0,0 @@
-<template>
-	<view>
-		<view class="bg-img" style="background-image: url('/static/bgimg.png');height: 310upx;"></view>
-		<view class="container" style="margin: -80upx 30upx 30upx 30upx;">
-			<view class="padding">
-				<text class="text-bold text-black padding-right-sm">账户热力值</text>
-				<text class="text-bold" style="color: #f87a3a;">可兑换到账288元</text>
-			</view>
-			<view class="padding-lr flex justify-between align-center">
-				<view>
-					<text style="font-size: 60upx;font-family: PingFang SC;font-weight: 800;color: #F3484E;">28216</text>
-					<text class="padding-left-xs" style="font-size: 24upx;font-family: PingFang SC;font-weight: 800;color: #878787;">热力值</text>
-				</view>
-				<button class="cu-btn round text-white" style="background-color: #f75757;width: 140upx;">提现</button>
-			</view>
-			<view style="margin: 10upx 20upx;">
-				<u-line color="#e0e0e0"></u-line>
-			</view>
-			<view style="padding: 20upx 0upx 0upx 30upx;">
-				<text class="title">已提现：</text>
-				<text class="number">100</text>
-				<text class="title padding-left-xs">元</text>
-			</view>
-			<view style="padding: 10upx 0upx 20upx 30upx;">
-				<text class="title">可提现：</text>
-				<text class="number">188</text>
-				<text class="title padding-left-xs">元</text>
-			</view>
-		</view>
-		<view class="container margin-lr">
-			<view class="padding flex align-center">
-				<view class="cuIcon-text text-bold padding-right-xs" style="font-size: 38upx;"></view>
-				<view class="title">提现明细</view>
-			</view>
-			<block v-for="(item, index) in 6" :key="index">
-				<view class="flex align-center justify-between">
-					<view class="padding-lr">
-						<view class="title">热力提现</view>
-						<view style="font-size: 24upx;font-family: PingFang SC;font-weight: bold;color: #686868;">2020-11-24 00:32</view>
-					</view>
-					<view class="padding-right">
-						<text style="font-size: 36upx;font-family: PingFang SC;font-weight: bold;color: #F3484E;">+45</text>
-						<text class="text-bold padding-left-xs">元</text>
-					</view>
-				</view>
-				<view style="padding: 20upx;">
-					<u-line color="#e0e0e0"></u-line>
-				</view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-	.container {
-		background-color: #FFFFFF;
-		border-radius: 16upx;
-		box-shadow: 0px 3px 79px 0px rgba(132, 132, 132, 0.22);
-	}
-	.title {
-		font-size: 28upx;
-		font-family: PingFang SC;
-		font-weight: 800;
-		color: #000000;
-	}
-	.number {
-		font-size: 30upx;
-		font-family: PingFang SC;
-		font-weight: 800;
-		color: #F3484E;
-	}
-</style>

pages/mine/myWelfare.vue

@@ -26,10 +26,21 @@
 				<view class="text-sm">积分 {{total}}</view>
 			</view>
 			<view>
-				<button class="cu-btn round text-white theme-bg-color" style="width: 180upx;height: 80upx;margin-right: 30upx;">兑换</button>
+				<button class="cu-btn round text-white theme-bg-color" style="width: 180upx;height: 80upx;margin-right: 30upx;" @click="confirm">兑换</button>
 				<button class="cu-btn round line-gray" style="width: 180upx;height: 80upx;" @click="selectShow = false">取消</button>
 			</view>
 		</view>
+		<u-popup v-model="dialogShow" mode="center" width="500" height="480" border-radius="30">
+			<view class="bg-img text-center" style="background-image: url('/static/dialogBgImg.png');height: 600rpx;">
+				<view style="height: 80upx;"></view>
+				<view style="font-size: 50upx;font-family: PingFang SC;font-weight: 600;color: #ffffff;">恭喜你</view>
+				<view class="text-bold text-black" style="padding: 80upx 0 10upx 0;">积分兑换成功！</view>
+				<view class="text-bold text-black">{{total}}积分到账</view>
+				<view class="padding">
+					<u-button class="custom-style" shape="circle" @click="dialogShow = false">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -46,7 +57,8 @@
 					{image: '/static/welfare/welfare3.png', count: 2, points: 200, selected: false},
 					{image: '/static/welfare/welfare4.png', count: 1, points: 200, selected: false},
 					{image: '/static/welfare/welfare5.png', count: 1, points: 200, selected: false},
-				]
+				],
+				dialogShow: false,
 			}
 		},
 		methods: {
@@ -85,6 +97,16 @@
 					    item.selected = false;	
 					}
 				}
+			},
+			confirm() {
+				if (this.total == 0) {
+					uni.showToast({
+						title: "请至少选择一个勋章",
+						icon: "none"
+					})
+				} else {
+					this.dialogShow = true;
+				}
 			}
 		}
 	}
@@ -103,4 +125,9 @@
 		border-radius: 20upx;
 		background-color: #ffffff;
 	}
+	.custom-style {
+		background-color: #5b3ee7;
+		width: 250upx;
+		color: #ffffff;
+	}
 </style>

pages/mine/order/address.vue

@@ -14,7 +14,7 @@
 				<view class="flex align-center" :class="region.startsWith('例') ? 'eg': ''" style="height: 70upx;">
 					 {{region}}
 				</view>
-				<u-picker v-model="regionShow" mode="region" @confirm="getRegion"></u-picker>
+				<city-select v-model="regionShow" @city-change="getRegion"></city-select>
 			 </view>
 			 <view class="flex align-center" style="padding: 20upx 30upx;">
 				<view style="width: 160upx;font-family: PingFang SC;font-weight: bold;color: #000000;">详细地址：</view>
@@ -28,7 +28,11 @@
 </template>
 
 <script>
+	import citySelect from '@/components/basic/u-city-select.vue';
 	export default {
+		components: {
+			citySelect
+		},
 		data() {
 			return {
 				name: '',