From 2930cf729847db28fe000fae01d8f5f30b4b73d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com>
Date: Fri, 12 Nov 2021 14:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/shopIndex.vue | 14 +++++++-------
 pages/my/index.vue        |  4 ++--
 pages/public/login.vue    |  4 +---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pages/index/shopIndex.vue b/pages/index/shopIndex.vue
index ee20586..1562970 100644
--- a/pages/index/shopIndex.vue
+++ b/pages/index/shopIndex.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="header">
 			<view class="shopName">
-				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 120px;left:35rpx;top:30rpx">
+				<u-dropdown :active-color="colors" title-size='34' style="position: absolute;width: 70%;left:35rpx;top:30rpx">
 					<u-dropdown-item v-model="value1" height='600rpx' :title="title" :options="options1"
 						@change="changes">
 					</u-dropdown-item>
@@ -95,7 +95,7 @@
 					</view>
 				</view>
 			</view> --> 
-			<view style="margin-top: 40rpx;" v-if="options1.length > 0">
+			<view class="shop-list-box" v-if="options1.length > 0">
 				<view class="title">店铺管理</view>
 				<view class="shopList" v-for="(item,index) in options1">
 					<view class="shopManagement">
@@ -126,7 +126,7 @@
 		data() {
 			return {
 				colors: '#FF4701',
-				merchantLogo: '../../static/img/logo.jpg',
+				merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg',
 				merchantId: 0,
 				startDate: 0,
 				endDate: 0,
@@ -514,7 +514,7 @@
 		// background: #000000;
 		background: #F5F5F5;
 	}
-
+	
 	.tui-scroll-h {
 		height: 100%;
 	}
@@ -533,9 +533,9 @@
 		}
 		
 		.picture{
-		position: absolute;
-		top:45px;
-		right:20px;
+			position: absolute;
+			top:45px;
+			right:20px;
 		}
 		
 		.bottom{
diff --git a/pages/my/index.vue b/pages/my/index.vue
index bc8f7d5..4175bb5 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -138,7 +138,7 @@
 	export default {
 		data() {
 			return {
-				avatar: "/static/img/logo.jpg",
+				avatar: "https://download.cyjyyjy.com/fq-logo.jpg",
 				member: 0,
 				total: 0,
 				tuiguang: '',
@@ -182,7 +182,7 @@
 			if (avatar && avatar !== 'undefined') {
 				this.avatar = avatar;
 			} else {
-				this.avatar = '/static/img/logo.jpg';
+				this.avatar = 'https://download.cyjyyjy.com/fq-logo.jpg';
 			}
 			let nickName = this.$queue.getData('nickName');
 			if (nickName && nickName !== 'undefined') {
diff --git a/pages/public/login.vue b/pages/public/login.vue
index 225945a..988c714 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -5,7 +5,7 @@
 		<view class="mp_wxBox">
 			<view>
 				<view class="headers">
-					<image src="../../static/img/logo.jpg" style="border-radius: 50%;"></image>
+					<image src="https://download.cyjyyjy.com/fq-logo.jpg" style="border-radius: 50%;"></image>
 				</view>
 				<view class="content">
 					<view>申请获取以下权限</view>
@@ -31,8 +31,6 @@
 					<!-- 协议地址 -->
 					<navigator url="/pages/member/mimi" open-type="navigate">《隐私政策》</navigator>和
 					<navigator url="/pages/member/xieyi" open-type="navigate">《用户服务协议》</navigator>
-
-
 				</view>
 			</view>
 		</view>