xuhaolan 3 years ago
parent
commit
8426c13f57
2 changed files with 99 additions and 113 deletions
  1. 6 8
      pages.json
  2. 93 105
      pages/index/index.vue

+ 6 - 8
pages.json

@@ -8,11 +8,10 @@
 				"navigationBarTextStyle": "black",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				// "navigationStyle": "custom",
-<<<<<<< HEAD
+
 				"navigationBarTitleText": "恒星币"
-=======
-				"navigationBarTitleText":"恒星币"
->>>>>>> 73974efe3831c0b51b1b6c6f11e99b54236f3a8b
+
+
 			}
 		},
 		{
@@ -21,11 +20,10 @@
 				"navigationBarTextStyle": "black",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				// "navigationStyle": "custom",
-<<<<<<< HEAD
+
 				"navigationBarTitleText": "恒星币"
-=======
-				"navigationBarTitleText":"恒星币"
->>>>>>> 73974efe3831c0b51b1b6c6f11e99b54236f3a8b
+
+
 			}
 		},
 		{

+ 93 - 105
pages/index/index.vue

@@ -7,7 +7,7 @@
 		<view class="bg1">
 			<image src="../../static/index/bg03.png" mode=""></image>
 		</view>
-<<<<<<< HEAD
+
 		<view class="box-top">
 			<view class="bg3 " @click="addShow()">
 				<image src="../../static/index/img14.png" mode=""></image>
@@ -16,9 +16,9 @@
 				<image src="../../static/index/img08.png" mode=""></image>
 			</view>
 		</view>
-=======
-		<top></top>
->>>>>>> 73974efe3831c0b51b1b6c6f11e99b54236f3a8b
+
+		
+
 		<view class="bg5">
 			<image src="../../static/index/img09.png" mode=""></image>
 		</view>
@@ -98,104 +98,94 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	export default {
-		comments: {
-			top,
-			uniPopup
-=======
 	import top from '@/components/top/top.vue'
-	export default {
-		comments: {
-			top
->>>>>>> 73974efe3831c0b51b1b6c6f11e99b54236f3a8b
-		},
-		data() {
-			return {
-				show: false,
-				cdList: [{
-						image: '../../static/img/cd1.png',
-						title: '首页    ',
-						right: '../../static/img/right.png',
-						url: './Expect'
-					},
-					{
-						image: '../../static/img/cd2.png',
-						title: '恒星私募',
-						right: '../../static/img/right.png',
-						url: './Expect'
-					},
-					{
-						image: '../../static/img/cd5.png',
-						title: 'DIFI挖矿',
-						right: '../../static/img/right.png'
-					},
-					{
-						image: '../../static/img/cd4.png',
-						title: '我的推荐',
-						right: '../../static/img/right.png'
-					},
-					{
-						image: '../../static/img/cd3.png',
-						title: '超级节点',
-						right: '../../static/img/right.png'
-					},
-					{
-						image: '../../static/img/cd6.png',
-						title: '游戏版块',
-						right: '../../static/img/right.png'
-					},
-					{
-						image: '../../static/img/cd7.png',
-						title: '好友加速明细',
-						right: '../../static/img/right.png'
-					},
-					{
-						image: '../../static/img/cd8.png',
-						title: '算力奖励明细',
-						right: '../../static/img/right.png'
-					},
-					{
-						image: '../../static/img/cd9.png',
-						title: '社群奖励明细',
-						right: '../../static/img/right.png'
-					},
-					{
-						image: '../../static/img/cd10.png',
-						title: '公会奖励明细',
-						right: '../../static/img/right.png'
-					}
-				]
-			};
-		},
-		methods: {
-			addShow() {
-				this.show = true
-				this.$refs.popup.open()
-				console.log(this.$refs.dd)
-				console.log("陈宫", this.show);
-				if (this.show == false) {
-
-					this.$refs.popup.close()
+		export default {
+			data() {
+				return {
+					show: false,
+					cdList: [{
+							image: '../../static/img/cd1.png',
+							title: '首页    ',
+							right: '../../static/img/right.png',
+							url: './Expect'
+						},
+						{
+							image: '../../static/img/cd2.png',
+							title: '恒星私募',
+							right: '../../static/img/right.png',
+							url: './Expect'
+						},
+						{
+							image: '../../static/img/cd5.png',
+							title: 'DIFI挖矿',
+							right: '../../static/img/right.png'
+						},
+						{
+							image: '../../static/img/cd4.png',
+							title: '我的推荐',
+							right: '../../static/img/right.png'
+						},
+						{
+							image: '../../static/img/cd3.png',
+							title: '超级节点',
+							right: '../../static/img/right.png'
+						},
+						{
+							image: '../../static/img/cd6.png',
+							title: '游戏版块',
+							right: '../../static/img/right.png'
+						},
+						{
+							image: '../../static/img/cd7.png',
+							title: '好友加速明细',
+							right: '../../static/img/right.png'
+						},
+						{
+							image: '../../static/img/cd8.png',
+							title: '算力奖励明细',
+							right: '../../static/img/right.png'
+						},
+						{
+							image: '../../static/img/cd9.png',
+							title: '社群奖励明细',
+							right: '../../static/img/right.png'
+						},
+						{
+							image: '../../static/img/cd10.png',
+							title: '公会奖励明细',
+							right: '../../static/img/right.png'
+						}
+					]
+				};
+			},
+			methods: {
+				addShow() {
+					this.show = true
+					this.$refs.popup.open()
+					console.log(this.$refs.dd)
 					console.log("陈宫", this.show);
-				}
+					if (this.show == false) {
 
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url
-				})
+						this.$refs.popup.close()
+						console.log("陈宫", this.show);
+					}
+
+				},
+				navTo(url) {
+					uni.navigateTo({
+						url
+					})
+				}
+				// open() {
+				// 	console.log('open');
+				// },
+				// close() {
+				// 	this.show = false
+				// 	// console.log('close');
+				// }
 			}
-			// open() {
-			// 	console.log('open');
-			// },
-			// close() {
-			// 	this.show = false
-			// 	// console.log('close');
-			// }
 		}
-	}
 </script>
 
 <style lang="scss">
@@ -216,21 +206,20 @@
 		width: 750rpx;
 		height: 3117rpx;
 	}
-<<<<<<< HEAD
+
 
 	.box-top {
 		display: flex;
 		padding: 36rpx 41rpx 72rpx 41rpx;
 	}
 
-=======
->>>>>>> 73974efe3831c0b51b1b6c6f11e99b54236f3a8b
+
 	.bg1 {
 		position: absolute;
 		width: 750rpx;
 		height: 629rpx;
 	}
-<<<<<<< HEAD
+
 
 	.bg3 {
 		width: 56rpx;
@@ -241,10 +230,9 @@
 		margin-left: 36rpx;
 	}
 
+
 	.bg4 {
-=======
-	.bg4{
->>>>>>> 73974efe3831c0b51b1b6c6f11e99b54236f3a8b
+
 		display: flex;
 		margin: 0 auto;
 		width: 680rpx;
@@ -281,7 +269,7 @@
 	}
 
 	.bg9 {
-		
+
 		position: relative;
 		display: flex;
 		align-items: center;
@@ -293,7 +281,7 @@
 
 	.bg10 {
 		position: absolute;
-		
+
 		width: 590rpx;
 		height: 400rpx;
 	}