productDev/preselect.git

			@@ -2,8 +2,8 @@
			<view class="box">
			<view class="box_bg" :style="{backgroundImage: 'url(' + Config.resourcePath + Config.bgImg + ')'}"></view>
			<view class="box_user">
			<text>欢迎{{User.username}}登录</text>
			<view class="box_user_btn" @click="loginOut">退出登录</view>
			<text>{{User.username}}</text>
			<image src="@/static/ic_logout@2x.png" mode="widthFix" @click="loginOut"></image>
			</view>
			<view class="box_content" :style="{maxWidth: Config.rangeSize + 'px', minWidth: Config.rangeSize + 'px'}">
			<!-- 广告图 -->
			@@ -246,16 +246,6 @@
			</view>
			</template>

			<!-- 查看大图 -->
			<bigImg
			ref="bigImg"
			:imgList="imgList"/>
			<!-- 查看大图 -->
			<bigImg1
			ref="bigImg1"
			:imgList="imgList"/>
			<!-- 搜索 -->

			<!-- 搜索组件 -->
			<search
			ref="search"
			@@ -270,8 +260,6 @@
			</template>

			<script>
			import bigImg from '@/components/bigImg.vue'
			import bigImg1 from '@/components/bigImg1.vue'
			import search from '@/components/search.vue'
			import noData from '@/components/noData.vue'
			import { mapState } from 'vuex'
			@@ -352,7 +340,7 @@
			page: 1
			}
			},
			components: { bigImg, search, noData, bigImg1 },
			components: { search, noData },
			onLoad() {
			var that = this
			// 监听键盘组合键
			@@ -1110,7 +1098,7 @@
			background-size: 100% 100%;
			}
			.box_user {
			z-index: 99;
			z-index: 9;
			position: fixed;
			top: 30px;
			right: 40px;
			@@ -1122,19 +1110,11 @@
			font-weight: 500;
			color: #FFFFFF;
			}
			.box_user_btn {
			width: 80px;
			height: 34px;
			line-height: 34px;
			text-align: center;
			border-radius: 8px;
			border: 2px solid #FFFFFF;
			font-size: 16px;
			font-family: PingFangSC-Regular, PingFang SC;
			font-weight: 400;
			color: #FFFFFF;
			margin-left: 22px;
			image {
			width: 18px;
			height: 18px;
			cursor: pointer;
			margin-left: 10px;
			}
			}
			.box_content {