commit - m 测试优化

components/cm-module/cm-seller/home.vue

@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 	</view>
 </template>
 

components/cm-module/scrollTop/scrollTop.vue

@@ -1,7 +1,7 @@
 <template name="scrollTop">
 	<!-- 商品详情价格判断 -->
 	<view>
-		<view class="scrollTop">
+		<view class="scrollTop" :style="{bottom:bottom+'rpx'}">
 			<view class="icon msg">
 				<!-- #ifdef MP-WEIXIN -->
 				<button class="contact-btn" open-type="contact" @bindcontact="handleContact">
@@ -20,6 +20,10 @@
 	export default{
 		name:'scrollTop',
 		props:{
+			bottom:{
+				type:Number,
+				default:100
+			},
 			isScrollTop:{
 				type:Boolean,
 				default:false
@@ -56,7 +60,6 @@
 		height: 200rpx;
 		position: fixed;
 		right: 20rpx;
-		bottom: 12%;
 		.icon{
 			width: 80rpx;
 			height: 80rpx;

components/cm-module/supplier/home.vue

@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 	</view>
 </template>
 

h5/pages/activity/activity.vue

@@ -2,7 +2,7 @@
 	<view class="activity">
 	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
 	   <!-- 侧边 -->
-	   <scroll-top :isScrollTop="isScrollTop"></scroll-top>
+	   <scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 	</view>
 </template>
 

pages/goods/goods-instrument.vue

@@ -30,7 +30,7 @@
 			</view>
 		</template>
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 	</view>
 </template>
 

pages/goods/goods-secondary.vue

@@ -73,7 +73,7 @@
 			</template>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 	</view>
 </template>
 <script>

pages/goods/instrument-details.vue

@@ -121,7 +121,7 @@
 				</view>	
 			</tui-bottom-popup>	
 			<!-- 侧边 -->
-			<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+			<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 		</view>
 	</view>
 </template>

pages/goods/product.vue

@@ -250,7 +250,7 @@
 					</view>
 				</view>
 				<!-- 侧边 -->
-				<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+				<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 			</view>
 		</template>
 	</view>

pages/login/bindwechat.vue

@@ -3,66 +3,68 @@
 		<view class="login-main">
 			<text class="logo-text">您的微信尚未绑定公司账号，填写以下资料进行绑定后，您能通过微信快速登录。</text>
 		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="text" 
-					   v-model="bindLinkName"  
-					   maxlength="30" 
-					   class="input" 
-					   placeholder="请输入姓名"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="number" 
-					   v-model="bindLinkPhone"  
-					   maxlength="11" 
-					   class="input" 
-					   placeholder="请输入手机号"
-				/>
+		<view class="login-container">
+			<view class="login-form clearfix">
+				<view class="login-input">
+					<input type="text" 
+						   v-model="bindLinkName"  
+						   maxlength="30" 
+						   class="input" 
+						   placeholder="请输入姓名"
+					/>
+				</view>
 			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="text" 
-					   v-model="imageCode"  
-					   maxlength="4" 
-					   class="input" 
-					   placeholder="请输入右侧图形验证码"
-				/>
+			<view class="login-form clearfix">
+				<view class="login-input">
+					<input type="number" 
+						   v-model="bindLinkPhone"  
+						   maxlength="11" 
+						   class="input" 
+						   placeholder="请输入手机号"
+					/>
+				</view>
 			</view>
-			<view class="login-input img-btn">
-				<view class="vscodeimg">
-					<image :src="imageCodeUrl" mode=""></image>
+			<view class="login-form clearfix">
+				<view class="login-input code">
+					<input type="text" 
+						   v-model="imageCode"  
+						   maxlength="4" 
+						   class="input" 
+						   placeholder="请输入右侧图形验证码"
+					/>
 				</view>
-				<view class="vscod-refresh"  @click.stop="getVerificationCode">
-					<text class="iconfont icon-shuaxin"></text>
-					<text class="ref-text">刷新</text>
+				<view class="login-input img-btn">
+					<view class="vscodeimg">
+						<image :src="imageCodeUrl" mode=""></image>
+					</view>
+					<view class="vscod-refresh"  @click.stop="getVerificationCode">
+						<text class="iconfont icon-shuaxin"></text>
+						<text class="ref-text">刷新</text>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="number" 
-					   v-model="mobildeCode"  
-					   maxlength="6" 
-					   class="input" 
-					   placeholder="请输入短信验证码"
-				/>
+			<view class="login-form clearfix">
+				<view class="login-input code">
+					<input type="number" 
+						   v-model="mobildeCode"  
+						   maxlength="6" 
+						   class="input" 
+						   placeholder="请输入短信验证码"
+					/>
+				</view>
+				<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
+					<button type="button"
+							@click.stop="getMobileCodeFn"
+							:disabled="isMobileDisabled"
+						    class="input">
+							{{ mobileCodeText }}
+					</button>
+				</view>
 			</view>
-			<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
-				<button type="button"
-						@click.stop="getMobileCodeFn"
-						:disabled="isMobileDisabled"
-					    class="input">
-						{{ mobileCodeText }}
-				</button>
+			<view class="login-form none clearfix">
+				<view class="login-btn"  @click="bindWechatInfo">绑定并登录</view>
 			</view>
 		</view>
-		<view class="login-form clearfix">
-			<view class="login-btn"  @click="bindWechatInfo">绑定并登录</view>
-		</view>
 	</view>
 </template>
 
@@ -228,6 +230,7 @@
 	.login{
 		width: 100%;
 		height: auto;
+		box-sizing: border-box;
 		border-top: 1px solid #F7F7F7;
 		.model-warp.none{
 			display: none;			
@@ -236,7 +239,7 @@
 			display: block;
 		}
 		.login-main{
-			width: 702rpx;
+			width: 100%;
 			background: rgba(225, 86, 22, 0.1);
 			display: flex;
 			flex-direction: column;
@@ -244,27 +247,35 @@
 			height: 68rpx;
 			padding: 20rpx 24rpx;
 			margin: 24rpx 0 118rpx 0;
+			box-sizing: border-box;
 			.logo-text{
 				font-size: 24rpx;
 				line-height: 34rpx;
 				color: $color-system;
 			}
 		}
+		.login-container{
+			width: 100%;
+			height: auto;
+			padding: 0 24rpx;
+			box-sizing: border-box;
+		}
 		.login-form{
 			width: 100%;
 			height: auto;
-			padding: 0 30rpx;
 			box-sizing: border-box;
+			border-bottom: 1px solid #E1E1E1;
+			&.none{
+				border-bottom: none;
+			}
 			.login-input{
 				width: 100%;
-				height: 40rpx;
-				padding: 24rpx 0;
-				margin-bottom: 20rpx;
+				height: 60rpx;
+				padding: 20rpx 0;
 				background: #FFFFFF;
 				display: flex;
 				flex-direction: column;
 				align-items: center;
-				border-bottom: 1px solid #E1E1E1;
 				&.code{
 					width: 370rpx;
 					float: left;
@@ -277,7 +288,7 @@
 					float: left;
 					background: $btn-confirm;
 					border-radius: 32rpx;
-					margin-top: 10rpx;
+					margin-top: 15rpx;
 					.input{
 						width: 220rpx;
 						height: 64rpx;
@@ -303,7 +314,7 @@
 					background: #FFFFFF;
 					display: block;
 					border-bottom: none;
-					margin-top: 10rpx;
+					margin-top: 16rpx;
 					.vscodeimg{
 						width: 160rpx;
 						height: 64rpx;

pages/tabBar/home/home.vue

@@ -152,7 +152,7 @@
 		<!-- 透明模态层 -->
 		<modal-layer v-if='modallayer'></modal-layer>
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
 	</view>
 </template>
 

pages/tabBar/home/index.vue

@@ -34,7 +34,7 @@
 			</view>
 		</view>
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
 	</view>
 </template>
 
@@ -144,9 +144,9 @@
 							uni.removeStorageSync('sessionid')
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 							if(response.data.userIdentity ==1){
-								this.$api.navigateTo('/seller/pages/index/index')
+								this.$api.redirectTo('/seller/pages/index/index')
 							}else if(response.data.userIdentity === 3){
-								this.$api.navigateTo('/supplier/pages/index/index')
+								this.$api.redirectTo('/supplier/pages/index/index')
 							}
 							this.getHomeInformation()
 						}).catch(error =>{

second/pages/product/product-details.vue

@@ -118,7 +118,7 @@
 				</view>	
 			</tui-bottom-popup>	
 			<!-- 侧边 -->
-			<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+			<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 			</view>
 	</view>
 </template>

supplier/pages/user/my-product.vue

@@ -18,7 +18,7 @@
 				<!-- 空白页 -->
 				<view class="empty-container" v-if="isEmpty">
 					<image class="empty-container-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"></image>
-					<text class="error-text">暂无数据^_^</text>
+					<text class="error-text">暂未发布任何商品~</text>
 				</view>
 				<!-- 列表 -->
 				<checkbox-group @change="buyChange" class="tui-group">
@@ -635,6 +635,9 @@
 	page{
 		background:#FFF;
 	}
+	.empty-container{
+		z-index: 9999;
+	}
 	.superv-header{
 		width: 100%;
 		height: 80rpx;

supplier/pages/user/my-shop.vue

@@ -225,7 +225,7 @@
 			</view>
 		</template>
 		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop"></scroll-top>
+		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
 	</view>
 </template>