From 130baa2618715ff6a6caf06e11263bc2ac8150fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E4=BF=8A=E6=9D=B0?= <741531167@qq.com>
Date: Mon, 1 Mar 2021 15:14:14 +0800
Subject: [PATCH] 01

---
 main.js             |  8 ++++----
 pages/find/find.vue | 14 ++++++++------
 pages/shop/shop.vue | 31 ++++++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/main.js b/main.js
index 54aa023..6a3d80b 100644
--- a/main.js
+++ b/main.js
@@ -19,13 +19,13 @@ Vue.component('large-image-list', largeImageList)
 
 
 // 测试域名
-Vue.prototype.BASE_URL = "https://testapi.reecook.cn"
-Vue.prototype.IMAGE_URL = "https://testcdn.reecook.cn/static"
+// Vue.prototype.BASE_URL = "https://testapi.reecook.cn"
+// Vue.prototype.IMAGE_URL = "https://testcdn.reecook.cn/static"
 
 
 // 正式域名
-// Vue.prototype.BASE_URL = "https://api.reecook.cn"
-// Vue.prototype.IMAGE_URL = "https://cdn.reecook.cn/static"
+Vue.prototype.BASE_URL = "https://api.reecook.cn"
+Vue.prototype.IMAGE_URL = "https://cdn.reecook.cn/static"
 
 
 //腾讯地图key
diff --git a/pages/find/find.vue b/pages/find/find.vue
index 89f5bd5..9a7cbbb 100644
--- a/pages/find/find.vue
+++ b/pages/find/find.vue
@@ -16,9 +16,9 @@
 					<live-videos></live-videos>
 				</swiper-item> -->
 				<!-- 小视频列表 -->
-				<swiper-item>
+				<!-- <swiper-item>
 					<small-videos></small-videos>
-				</swiper-item>
+				</swiper-item> -->
 				<!-- 图文动态列表 -->
 				<swiper-item>
 					<dynamics :showGoodsLink="true"></dynamics>
@@ -36,10 +36,12 @@
 		data() {
 			return {
 				showMybtn:false,
-				currentIndex:1,
-				list: [{
-					name: '视频'
-				}, {
+				currentIndex:0,
+				list: [
+				// {
+				// 	name: '视频'
+				// }, 
+				{
 					name: '图文'
 				}]
 			};
diff --git a/pages/shop/shop.vue b/pages/shop/shop.vue
index c465d5a..ec0f515 100644
--- a/pages/shop/shop.vue
+++ b/pages/shop/shop.vue
@@ -6,7 +6,7 @@
 		</template>
 
 		<!-- 除了会员以外的角色显示数据展示页面 -->
-		<template class="container-B" v-if="roleLevel==400||roleLevel==300||roleLevel==200||roleLevel==100">
+		<template class="container-B" v-else-if="roleLevel==400||roleLevel==300||roleLevel==200||roleLevel==100">
 			<view class="top-box">
 				<image :src="STATIC_URL+'top_bg.png'" style="width: 100%;" mode="widthFix"></image>
 				<view class="bg-box bg-img flex flex-direction justify-between" :style="'background-image: url('+bgImage+');'" v-if="myInfo">
@@ -248,6 +248,13 @@
 				<view class="cancle" @tap="hideModel">取消</view>
 			</u-popup>
 		</template>
+		<template v-else>
+			<view class="loginBtn">
+				<button class="btn" @click="tologin" style="background-color: #ff0000;">
+					<view class="">登录</view>
+				</button>
+			</view>
+		</template>
 	</view>
 </template>
 
@@ -331,6 +338,11 @@
 			}
 		},
 		methods: {
+			tologin() {
+				uni.navigateTo({
+					url: "../login/login"
+				})
+			},
 			postShare() {
 				this.$u.toast("功能暂未开放，敬请期待~");
 			},
@@ -497,6 +509,23 @@
 </script>
 
 <style lang="scss">
+	.loginBtn{
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		.btn{
+			width:110px;
+			margin: 20rpx 30rpx;
+			border-radius: 44rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			color: #FFFFFF;
+		}
+	}
 	.top-box {
 		position: relative;