修改

components/cm-module/listTemplate/productList.vue

@@ -2,7 +2,7 @@
 	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
 		<list-skeleton v-if="showSkeleton" :listType='0'></list-skeleton>
 		<!-- 搜索框 -->
-		<fuzzy-search placeholder="搜索商品名称" :list="searchList" @fuzzyClick="fuzzyClickHandle" :fixed="true" @input="fuzzyInputHandle"></fuzzy-search>
+		<fuzzy-search placeholder="搜索商品名称"  @fuzzyClick="fuzzyClickHandle" :fixed="true" @input="fuzzyInputHandle"></fuzzy-search>
 		<!-- 内容区域 -->
 		<view class="product-container" v-if="!isShowEmpty">
 			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="productList.length > 0">
@@ -11,11 +11,14 @@
 					<view class="list-details-info">
 						<text class="list-details-title">{{item.name}}</text>
 						<!-- 商品标签 -->
-						<view class="list-details-tags">
+						<!-- <view class="list-details-tags">
 							<tui-tag type="red" class="tag" padding="6rpx" size="20rpx" plain>商品标签</tui-tag>
 							<tui-tag type="red" class="tag" padding="6rpx" size="20rpx" plain>商品标签</tui-tag>
-						</view>
+						</view> -->
 						<text class="list-details-specs">规格：{{item.unit !=null ? item.unit : ''}}</text>
+						<text class="list-details-specs">商品编码：{{item.productCode !=null ? item.productCode : ''}}</text>
+						<!-- <text class="list-details-miniQuantity">起订量：{{ item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text> -->
+						
 						<!-- 价格 -->
 						<view class="list-details-price">
 							<view class="list-shop">
@@ -31,6 +34,7 @@
 							</view>
 							<button class="add-cart-btn" @click.stop="operationHanld(item)">购买</button>
 						</view>
+						<!-- 活动标签 -->
 						<view class="list-details-price" v-if="item.actStatus==1">
 							<view class="floor-item-act">
 								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
@@ -112,12 +116,12 @@
 				pullFlag: true,
 				fromRegularPurchasePage: false,
 				cartQuantity: 0,
-				showRegularBtn: false,
-				isPrecedence:false,
-				searchList:['第一条记录','第二条记录']     //模糊搜索匹配的内容
+				showRegularBtn: true,
+				isPrecedence:false
 			}
 		},
 		created() {
+			// 设置测试数据
 			this.productList = productList
 			this.setScrollHeight();		
 			this.$api.getStorage().then((resolve) =>{

components/vcode-input/vcode-input.vue

@@ -46,11 +46,11 @@
 			},
 			borderValueColor:{
 				type:String,
-				default:'#e8e8e8'
+				default:'#424456'
 			},
 			borderActiveColor:{
 				type:String,
-				default:'#e8e8e8'
+				default:'#FF6B00'
 			},
 			isAutoComplete:{
 				type: Boolean,

pages.json

@@ -37,10 +37,17 @@
 		{
 			"path": "pages/goods/list",
 			"style": {
-				"navigationBarTitleText":"立即下单"
+				"navigationBarTitleText": "立即下单"
+			}
+		},
+		{
+			"path":"pages/goods/product",
+			"style":{
+				"navigationBarTitleText":"商品详情"
 			}
 		}
-    ],
+
+	],
 	"subPackages": [{
 		"root": "pages/user/", //机构个人中心模块
 		"pages": [{
@@ -48,8 +55,7 @@
 				"style": {
 					"navigationBarTitleText": "机构列表"
 				}
-			},
-			{
+			}, {
 				"path": "cart/cart",
 				"style": {
 					"navigationBarTitleText": "购物车"
@@ -140,6 +146,7 @@
 			}
 		]
 	}],
+
 	"tabBar": {
 		"height": "80",
 		"color": "#999999",

pages/goods/list.vue

@@ -5,7 +5,8 @@
 		<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
 			<!-- 遮罩层 -->
 			<view class="mask"></view>
-			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-460rpx' : '-294rpx'}">
+			<!-- :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-460rpx' : '-400rpx'}" -->
+			<view class="layer" @tap.stop="discard">
 				<view class="content">
 					<view class="layer-smimg">
 						<image :src="handleData.mainImage" mode=""></image>
@@ -249,7 +250,7 @@
 		.layer {
 			position: fixed;
 			z-index: 22;
-			bottom: -294rpx;
+			bottom: -420rpx;
 			width: 702rpx;
 			padding: 24rpx 24rpx 36rpx 24rpx;
 			height: 360rpx;

pages/goods/product.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="product" :style="{paddingBottom: userIdentity==1 && userIdentity == 3 ? '0rpx' :'188rpx',paddingTop:CustomBar+'px'}">
-		<custom-p   v-if="isHeaderPoduct"
+		<!-- <custom-p   v-if="isHeaderPoduct"
 					:systeminfo='systeminfo' 
 					:navbar-data='nvabarData' 
 					:headerBtnPosi ="headerBtnPosi" 
 					:headerColor="headerColor" 
 					:type="isShareType"
 					:page='backPage'>
-		</custom-p>
+		</custom-p> -->
 		<view class="product-topnav" v-if='isNavbarFiexd' :class="navbarFiexd" :style="{top:CustomBar +'px'}">
+			<!-- 搜索区域 -->
 			<view class="search-input">
 				<view class="gosearch-btn" :class="navbarFiexd" @click="this.$api.navigateTo(clickPath)">
 					<view class="search-icon">
@@ -17,6 +18,7 @@
 					<view class="search-text">搜索商品/供应商/项目仪器</view>
 				</view>
 			</view>
+			<!-- 导航栏 -->
 			<view class="navbar">
 				<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
 					<text>详情</text>
@@ -34,6 +36,7 @@
 		</view>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<template v-else >
+			<!-- 如果商品下架 -->
 			<view class="cart-content empty" v-if="isInvalid">
 				<view  class="empty-container">
 					<image class="empty-container-image" :src="productNoneImage" mode="aspectFit"></image>
@@ -41,9 +44,11 @@
 					<view class="login-btn"  @click="goIndex">去商城</view>
 				</view>
 			</view>
+			
 			<view class="container-product tui-skeleton" v-else>
 				<view class="container-product-main">
 					<view class="product-top">
+						<!-- 轮播图 -->
 						<view class="banner-section">
 							<uni-swiper-dot :info="productImage" :current="current" field="content" :mode="mode" >
 								<swiper class="banner tui-banner tui-skeleton-rect"  @change="swiperChange" :duration='800' :autoplay="false" :circular="true" >
@@ -59,6 +64,7 @@
 						<view class="product-wrap clearfix">
 							<view class="wrap-top" :class="goodsData.isNoneDisabled ? 'none' : ''">
 								<view class="wrap-top-price">
+									<!-- 价格 -->
 									<cm-price v-if="isRequest"
 											  :product="product"
 											  :userIdentity="userIdentity"
@@ -67,22 +73,27 @@
 											  :ladderPriceList="ladderPriceList"/>
 								</view>
 								<view class="p-title tui-skeleton-fillet">
+									<!-- 美博会 -->
 									<view class="mclap-tag" v-if="product.beautyActFlag == '1'">美博会</view>
 									<view class="p-title-name" :class="product.beautyActFlag == '1' ? 'indent' : ''"> {{product.name == undefined ? '' : product.name}} </view>
+									<!-- 分享 -->
 									<button open-type="share" class="p-title-share tui-share-position" @tap="onShare">
 										<view class=""><text class="iconfont icon-fenxiang1"></text></view>
 										<view class="">分享</view>
 									</button>
 								</view>
+								<!-- 产品标签 -->
 								<view class="wrap-label" v-if="product.tagsList.length>0">
 									<view class="label-a tui-skeleton-fillet" v-for="(label,index) in  product.tagsList" :key="index">{{label}}</view>
 								</view>
+								<!-- 承诺 -->
 								<view class="product-seve">
 									<text class="label">采美承诺：</text>
 									<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">无忧退货</text></text>
 									<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">快速退款</text></text>
 									<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">正品保证</text></text>
 								</view>
+								<!-- 备注信息 -->
 								<view class="productRemarks"  v-if="product.productRemarks!=''&&product.productRemarks!=null">
 									备注:{{product.productRemarks}}
 								</view>
@@ -93,12 +104,14 @@
 						<image class="none-image" :src="productNoneImage" mode=""></image>
 						<view class="none-text">此商品已{{goodsData.disabledText}}，请浏览以下推荐商品~</view>
 					</view>
+					<!-- 选择商品参数按钮 -->
 					<view class="product-parameter" @click="showPopup" v-if="!goodsData.isNoneDisabled">
 						<text class="title">参数：</text>
 						<text class="name">品牌  起订量  分类...</text>
 						<text class="iconfont icon-chakangengduo"></text>
 					</view>
-					<view class="product-supplier" @click="goSupplier">
+					<!-- 机构满意度评分 -->
+					<!-- <view class="product-supplier" @click="goSupplier">
 						<view class="logo"><img :src="shop.logo ? shop.logo :'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 						<view class="main">
 							<view class="name">{{shop.name}}</view>
@@ -113,7 +126,7 @@
 							</view>
 						</view>
 						<view class="right"><text class="iconfont icon-chakangengduo"></text></view>
-					</view>
+					</view> -->
 				</view>
 				<view class="product-details product-details0">
 					<!-- 商品详情 -->
@@ -137,15 +150,15 @@
 						<text>暂无服务项目</text>
 					</view>
 				</view>	
-				<view class="product-details recommend product-details2">
-					<!-- 相关推荐 -->
+				<!-- 相关推荐 -->
+				<!-- <view class="product-details recommend product-details2">
 					<view class="title">
 						<view class="title-tab">相关推荐</view>
 					</view>
 					<view class="content hot">
 						<recommend :query-productid="product.productID" :query-type="product.recommendType" v-if="isRequest"></recommend>
 					</view>
-				</view>	
+				</view>	 -->
 				<!-- 商品参数 -->
 				<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
 					<view class="tui-popup-box clearfix">
@@ -190,6 +203,7 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
+				<!-- 加入购物车
 				<view class="menu" v-if="isShowButton">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
@@ -226,9 +240,9 @@
 						</view>
 					</view>	
 				</view>
+				 -->
 				<!--底部选择模态层弹窗组件 -->	
-				<view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
-					<!-- 遮罩层 -->
+				<!-- <view class="popup spec" :class="specClass"  @touchmove.stop.prevent="discard" @tap="hideSpec">
 					<view class="mask"></view>
 					<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-352rpx' : '-296rpx'}">
 						<view class="content">
@@ -257,7 +271,7 @@
 						</view>
 						<view class="btn"><view class="button" @click.stop="btnConfirm">确定</view></view>
 					</view>
-				</view>
+				</view> -->
 				<!-- 侧边 -->
 				<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 			</view>

pages/index/index.vue

@@ -20,9 +20,6 @@
 			</view>
 			<view class="line"></view>
 			<view class="order-nav">
-				<view class="order-nav-item" @click="navigator('/pages/order/order-list?listType=1')">
-					<image src="@/static/ws/dh_dqr_01.png" mode="widthFix"></image> <text>待确认</text>
-				</view>
 				<view class="order-nav-item" @click="navigator('/pages/order/order-list?listType=2')">
 					<image src="@/static/ws/dh_dfk_02.png" mode="widthFix"></image> <text>待付款</text>
 				</view>
@@ -33,7 +30,7 @@
 					<image src="@/static/ws/dh_yfh_04.png" mode="widthFix"></image> <text>已发货</text>
 				</view>
 				<view class="order-nav-item" @click="navigator('/pages/order/order-list?listType=5')"> 
-					<image src="../../static/ws/dh_tk_05.png" mode="widthFix"></image> <text>退款</text> 
+					<image src="../../static/ws/dh_tk_05.png" mode="widthFix"></image> <text>退货/款</text> 
 				</view>
 			</view>
 		</view>
@@ -378,6 +375,7 @@ export default {
 			text {
 				font-size: 26rpx;
 				line-height: 37rpx;
+				margin-top: 8rpx;
 			}
 		}
 	}

pages/login/login.vue

@@ -1,29 +1,102 @@
 <template>
 	<view class="container login">
-		<view class="login-main"> <image class="logo" src="/static/ws/logo.png" mode="widthFix"></image> </view>
-		<view class="login-title"> <image src="/static/ws/invitation_code.png" mode="widthFix"></image> <text>邀请码</text> </view>
+		<!-- logo区域 -->
+		<view class="login-main">
+			<image class="logo" src="/static/ws/logo.png" mode="widthFix"></image>
+		</view>
+		<!-- 邀请码标题 -->
+		<view class="login-title">
+			<image src="/static/ws/invitation_code.png" mode="widthFix"></image> <text>邀请码</text>
+		</view>
+		<!-- 邀请码 -->
 		<view class="login-input">
-			<!-- 邀请码输入框 -->
-			<vcode-input ref="VcodeInput" @vcodeInput="vcodeInput"></vcode-input>
+			<vcode-input ref="vcodeInputRef" @vcodeInput="vcodeInput" sum="6"></vcode-input>
 		</view>
-		<view class="logo-message"><text>邀请码错误，请联系采美客服获取最新邀请码</text> </view> <button class="login-btn">登录</button>
+		<!-- 提示信息 -->
+		<view class="logo-message"><text>邀请码错误，请联系采美客服获取最新邀请码</text> </view>
+		<button class="login-btn" :disabled="!isCodeEmpty">登录</button>
 	</view>
 </template>
 
 <script>
+import authorize from '@/common/config/authorize.js'
+import wxLogin from '@/common/config/wxLogin.js'
 import VcodeInput from '@/components/vcode-input/vcode-input'
+import { mapState, mapMutations } from 'vuex'
+import { invitationCodeLogin } from '@/services/use.js'
 export default {
-	components: {
-		VcodeInput
-	},
+	components: { VcodeInput },
 	data() {
-		return {}
+		return {
+			invitationCode: '' //获取用户登录的邀请码
+		}
+	},
+	onLoad(option) {},
+	computed: {
+		...mapState(['isWxAuthorize', 'isLoginType', 'isLoginProductId', 'isLoginOrderId']),
+		isCodeEmpty() {
+			return this.invitationCode.length > 0
+		}
 	},
-	onLoad() {},
 	methods: {
+		...mapMutations(['login']),
+		goLogin() {
+			if (this.invitationCode == '') {
+				this.$util.msg('请输入邀请码', 2000)
+				return
+			}
+			wx.getUserInfo({
+				success: res => {
+					this.isUserInfo = false
+					this.userInfo = res.userInfo
+					let params = {
+						invitationCode: this.invitationCode,
+						nickName: res.userInfo.nickName,
+						headimgurl: res.userInfo.avatarUrl
+					}
+					invitationCodeLogin(params)
+						.then(response => {
+							this.login(response.data)
+							wxLogin.wxLoginAuthorize()
+							if (response.data.userIdentity === 3) {
+								setTimeout(() => {
+									this.$api.navigateTo('/supplier/pages/index/index')
+								}, 1000)
+							} else {
+								setTimeout(() => {
+									switch (this.isLoginType) {
+										case 9:
+											this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+											break
+										case 8:
+											this.$api.navigateTo(
+												`/pages/goods/product?id=${this.isLoginProductId}`
+											)
+											break
+										case 7:
+											this.$api.navigateTo(
+												`/pages/user/order/order-details?type=share&orderID=${
+													this.isLoginOrderId
+												}`
+											)
+											break
+										default:
+											this.$api.switchTabTo('/pages/tabBar/user/user')
+									}
+								}, 1000)
+							}
+						})
+						.catch(error => {
+							this.$util.msg(error.msg, 2000)
+							this.isUserInfo = false
+						})
+				}
+			})
+		},
 		// 用户输入的值
 		vcodeInput(val) {
 			console.log(val)
+			this.invitationCode = val
 		},
 		// 控制组件获取焦点
 		setFocus() {
@@ -39,72 +112,6 @@ export default {
 		}
 	}
 }
-/*
-import authorize from '@/common/config/authorize.js'
-import wxLogin from "@/common/config/wxLogin.js"
-import {mapState,mapMutations } from 'vuex';
-import { invitationCodeLogin  } from '@/services/use.js'
-export default{
-	data() {
-		return{
-			invitationCode:'',  //获取用户登录的邀请码
-		}
-	},
-	onLoad(option) {
-
-	},
-	computed: {
-		...mapState(['isWxAuthorize','isLoginType','isLoginProductId','isLoginOrderId'])
-	},
-	methods:{
-		...mapMutations(['login']),
-		goLogin() {
-			if( this.invitationCode == ''){
-				this.$util.msg('请输入邀请码',2000)
-				return
-			}
-			wx.getUserInfo({
-				success: res => {
-					this.isUserInfo = false
-					this.userInfo = res.userInfo;
-					let params ={
-							invitationCode:this.invitationCode,
-							nickName:res.userInfo.nickName,
-							headimgurl:res.userInfo.avatarUrl,
-					}
-					invitationCodeLogin(params).then(response =>{
-						this.login(response.data)
-						wxLogin.wxLoginAuthorize()
-						if(response.data.userIdentity === 3){
-							setTimeout(()=>{
-								this.$api.navigateTo('/supplier/pages/index/index')
-							},1000)
-						}else{
-							setTimeout(()=>{
-								switch(this.isLoginType){
-									case 9:
-										this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-										break;
-									case 8:
-										this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-										break;
-									case 7:
-										this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-										break;
-									default:
-										this.$api.switchTabTo('/pages/tabBar/user/user')
-								}
-							},1000)
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-						this.isUserInfo = false
-					})
-				}
-			})
-		}
-	}
-}*/
 </script>
 
 <style lang="scss">
@@ -161,9 +168,9 @@ export default{
 			display: block;
 			width: 22rpx;
 			height: 22rpx;
-			background: #ff2a2a;
+			border: 1px solid #ff2a2a;
 			border-radius: 50%;
-			color: #fff;
+			color: #ff2a2a;
 			text-align: center;
 			line-height: 22rpx;
 			margin-right: 6rpx;

pages/user/club/club-list.vue

@@ -17,12 +17,8 @@
 				/>
 				<text class="iconfont icon-guanbi" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
-			<!-- 模糊搜索区域 -->
-			<view class="mask" v-if="showSearchModal">
-				<view class="mask-item"> 公司名公司名公司名公司名公司名公司名公司名公司名公司名公司名 </view>
-				<view class="mask-item"> <text>公司名公司名</text> <text>联系人联系人</text> </view>
-				<view class="mask-item"> <text>公司名公司名</text> <text>联系人联系人</text> </view>
-				<view class="mask-item"> <text>公司名公司名</text> <text>联系人联系人</text> </view>
+			<view class="search-btn">
+				<button class="search-btn" type="default" @click.stop="searchClubList">搜索</button>
 			</view>
 		</view>
 		<view class="club-main">
@@ -36,6 +32,7 @@
 			</view>
 			<view v-else class="club-list">
 				<scroll-view scroll-y="true">
+					<!-- 机构数据 -->
 					<view class="list" v-for="item in 10">
 						<view class="list-left">
 							<view class="list-head"
@@ -260,40 +257,28 @@ page,
 	width: 100vw;
 	height: 100vh;
 	z-index: 888;
-	background: rgba(0,0,0,.2);
+	background: rgba(0,0,0,.4);
 }
 .club-search {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 	height: 74rpx;
-	width: 750rpx;
-	padding-bottom: 40rpx;
+	width: 702rpx;
+	padding: 20rpx 24rpx;
 	background: #ffffff;
 	position: fixed;
 	top: 0;
 	left: 0;
 	z-index: 999;
-	.mask{
-		padding: 0 24rpx 40rpx 90rpx;
-		line-height: 60rpx;
-		background-color: #fff;
-		text-align: left;
-		font-size: $font-size-30;
-		color: $text-color;
-		box-sizing: border-box;
-		.mask-item{
-			width: 100%;
-			white-space: nowrap;
-			overflow: hidden;
-			height: 60rpx;
-			text-overflow: ellipsis;
-		}
-	}
 	.search-from {
-		margin: 24rpx;
-		width: 702rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		flex: 1;
 		height: 64rpx;
 		background: #f7f7f7;
 		border-radius: 32rpx;
-		float: left;
 		position: relative;
 		.icon-sousuo {
 			width: 64rpx;
@@ -302,7 +287,6 @@ page,
 			text-align: center;
 			display: block;
 			font-size: $font-size-28;
-			float: left;
 			color: #999999;
 		}
 		.icon-guanbi {
@@ -314,25 +298,22 @@ page,
 			line-height: 64rpx;
 			text-align: center;
 			top: 0;
-			right: 0;
 			z-index: 10;
 		}
 		.input {
-			width: 500rpx;
+			width: 570rpx;
 			height: 64rpx;
-			float: left;
 			line-height: 64rpx;
 			color: $text-color;
 			font-size: $font-size-24;
 		}
 	}
 	.search-btn {
-		width: 120rpx;
+		width: 100rpx;
 		line-height: 64rpx;
 		text-align: center;
 		font-size: $font-size-28;
 		color: $color-system;
-		float: left;
 		background: #ffffff;
 	}
 }

pages/user/order/orderShareLogin.vue

@@ -1,17 +1,22 @@
  <template>
 	<view class="container login">
+		<!-- logo区域 -->
 		<view class="login-main">
 			<image class="logo" :src="imagePath" mode=""></image>
 		</view>
+		<!-- 输入框 -->
 		<view class="login-input">
 			<input type="number" 
 				   v-model="shareCode"
-				   maxlength="4" 
+				   maxlength="6" 
 				   class="input" 
 				   placeholder="请输入分享码"
 			/>
 		</view>
-		<view class="login-btn"  @click="goLogin">查看订单</view>
+		<!-- 提示信息 -->
+		<view class="logo-message" v-if="false"><text>分享码错误，请联系对方获取分享码</text> </view>
+		<!-- 登录按钮 -->
+		<button class="login-btn" :disabled="!canSubmit" @click="goLogin">查看订单</button>
 	</view>
 </template>
 <script>
@@ -19,7 +24,7 @@
 	export default{
 		data() {
 			return{
-				imagePath:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAQhKoAAKWfqqSIds292.png',
+				imagePath:'/static/ws/logo.png',
 				shareCode:'',  		//获取用户登录的邀请码
 				isUserInfo:false,	//控制显示授权弹窗
 				nickName:'',		//存储用户名
@@ -34,6 +39,11 @@
 			this.orderID = e.orderID
 			this.userID = e.userID
 		},
+		computed:{
+			canSubmit(){
+				return this.shareCode.trim().length>=6
+			}
+		},
 		methods:{
 			goLogin() {
 				if(this.shareCode == ''){
@@ -83,19 +93,19 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			padding: 128rpx 0;
+			padding: 178rpx 0 140rpx;
 			.logo{
-				width: 658rpx;
-				height: 354rpx;
+				width: 152rpx;
+				height: 152rpx;
 				display: block;
 			}
 		}
 		.login-input{
-			width: 600rpx;
+			width: 550rpx;
 			height: 40rpx;
 			padding: 24rpx 0;
 			margin: 0 auto;
-			margin-bottom: 60rpx;
+			margin-bottom: 30rpx;
 			background: #FFFFFF;
 			border-bottom: 1px solid #E1E1E1;
 			.input{
@@ -109,12 +119,12 @@
 		}
 		.login-btn{
 			width: 600rpx;
-			height: 88rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
+			height: 90rpx;
+			font-size: $font-size-30;
+			line-height: 90rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
-			margin-top: 100rpx;
+			margin-top: 64rpx;
 			text-align: center;
 			background: $btn-confirm;
 			border-radius: 44rpx;
@@ -153,5 +163,25 @@
 				}
 			}
 		}
+		.logo-message {
+			font-size: 24rpx;
+			line-height: 33rpx;
+			color: #ff2a2a;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			&::before {
+				content: '!';
+				display: block;
+				width: 22rpx;
+				height: 22rpx;
+				border: 1px solid #ff2a2a;
+				border-radius: 50%;
+				color: #ff2a2a;
+				text-align: center;
+				line-height: 22rpx;
+				margin-right: 6rpx;
+			}
+		}
 	}
 </style>