机构

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -2,7 +2,7 @@
 	<view class="button-template" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 		<!-- 底部按钮 -->
 		<view class="button-content">
-			<view class="btn btn-cancel"  @click.stop="btnConfirm('agan',order)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnConfirm('again',order)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel"  @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete"  @click.stop="btnConfirm('delete',order)">删除订单</view>
 			<view class="btn btn-cancel" @click.stop="onShareCode">

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -107,9 +107,9 @@
 		float: left;
 		background: #FFFFFF;
 		.button-content{
-			width: 702rpx;
+			// width: 702rpx;
 			height: auto;
-			float: left;
+			float: right;
 			position: relative;
 			margin: 20rpx 0;
 			.share-code{
@@ -132,7 +132,8 @@
 				color: #FFFFFF;
 				text-align: center;
 				border-radius:32rpx;
-				float: right; 
+				// float: right; 
+				display: inline-block;
 			}
 			.btn-color{
 				background: $btn-confirm;
@@ -142,7 +143,7 @@
 				border: 2rpx solid #999999;
 				background:#FFFFFF;
 				color: #666666;
-				float: left;
+				// float: left;
 				margin-right: 15rpx;
 			}
 			.btn-delete{

components/cm-module/productDetails/secondPrice.vue

@@ -1,7 +1,7 @@
-<template name="cm-price">
+<template name="second-price">
 	<!-- 商品详情价格判断 -->
 	<view class="wrap-main">
-		<template v-if="!hasLogin">
+		<template v-if="hasLogin">
 			<view class="p-login grade tui-skeleton-fillet">
 				<view class="floor-item-btn" v-if="product.detailTalkFlag !=2">
 					<view class="btn" @click.stop="loginClick">登录查看价格</view>
@@ -29,27 +29,15 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	export default{
-		name:'cm-price',
+		name:'second-price',
 		props:{
 			product:{
 				type:Object,
 			},
-			userIdentity: {
-				type: Number,
-				default: 2
-			},
-			ladderPriceList:{
-				type: Array,
-			},
-			promotions:{
-				type:Object,
-			}
 		},
 		data() {
 			return{
-				popupShow:false,
-				promotionsType:0,
-				isIphoneX:this.$store.state.isIphoneX,
+				
 			}
 		},
 		filters: {
@@ -58,39 +46,13 @@
 			},
 		},
 		created() {
-			
+			console.log(this.product)
 		},
 		computed: {
 			...mapState(['hasLogin','isWxAuthorize'])
 		},
 		methods:{
-			clickPopupShow(type){
-				this.popupShow = true
-				this.promotionsType = type
-			},
-			hidePopup(){
-				this.popupShow = false
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			goUpgradeApply(){
-				this.$api.navigateTo('/pages/login/apply')
-			},
-			loginClick(){
-				this.$api.navigateTo('/pages/login/login')
-			},
-			goGoodActiveFn(id){
-				this.$parent.popupShow = false
-				this.$api.navigateTo('/pages/goods/goods-active?id='+id)
-			}
+			
 		},
 		
 	}

components/cm-module/productDetails/secondRecommend.vue

@@ -1,7 +1,10 @@
 <template name="recommend">
 	<!-- 供应商信息 -->
 	<view class="recommend clearfix">
-		<view class="recommend-empty" v-if="isEmpty">暂无相关推荐商品</view>
+		<view class="recommend-empty" v-if="isEmpty">
+			<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/recmmmd.png"></image>
+			<text>暂无相关推荐商品</text>
+		</view>
 		<view class="recommend-list" v-else>
 			<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
 				<swiper-item v-for="(item,index) in recommendList" :key="index">
@@ -88,12 +91,19 @@
 	width: 100%;
 	.recommend-empty{
 		width: 702rpx;
-		height: 100rpx;
+		// height: 100rpx;
 		line-height: 100rpx;
-		padding: 0 24rpx;
+		padding: 80rpx 24rpx;
 		font-size: $font-size-28;
 		color: #999999;
 		text-align: center;
+		image{
+			width: 360rpx;
+			height: 360rpx;
+		}
+		text{
+			display: block;
+		}
 	}
 	.recommend-list{
 		width: 100%;

pages.json

@@ -162,7 +162,7 @@
 				"navigationBarTitleText": "隐私权政策"
 			}
 		},{
-			"path": "pages/service/sellConten",
+			"path": "pages/service/sellconten",
 			"style": {
 				"navigationBarTitleText": "条款内容"
 			}

pages/login/password.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container login">
 		<view class="login-main">
-			<view class="line"></view>
+			<!-- <view class="line"></view> -->
 			<view class="nav-item"
 				  :class="{ current: tabCurrentIndex === 1 }" 
 				  @click="tabClick(1)">
@@ -17,12 +17,12 @@
 		<view class="content" v-if="tabCurrentIndex === 1">
 			<view class="login-form clearfix">
 				<view class="login-input">
-					<input type="number" v-model="mobile"  maxlength="11" class="input"  placeholder="请输入手机号"/>
+					<input type="number" v-model="mobile"  maxlength="11" class="input" placeholder="请输入手机号" placeholder-class="placeholder"/>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input code">
-					<input type="text" v-model="imageCode"  maxlength="4" class="input" placeholder="请输入右侧图形验证码" />
+					<input type="text" v-model="imageCode"  maxlength="4" class="input" placeholder="请输入右侧图形验证码"  placeholder-class="placeholder"/>
 				</view>
 				<view class="login-input img-btn">
 					<view class="vscodeimg">
@@ -36,7 +36,7 @@
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input code">
-					<input type="number" v-model="mobileCode"  maxlength="6" class="input" placeholder="请输入短信验证码"/>
+					<input type="number" v-model="mobileCode"  maxlength="6" class="input" placeholder="请输入短信验证码"  placeholder-class="placeholder"/>
 				</view>
 				<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
 					<button type="button"
@@ -49,19 +49,19 @@
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"/>
-					<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordEye"></view>
+					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"/>
-					<view class="iconfont" :class="isShowEyes ? iconEyen : iconEyes"  @click="passwordEyes"></view>
+					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
 				</view>
 			</view>
-			<view class="login-form clearfix">
+			<view class="login-form clearfix" style="border: 0;">
 				<view class="login-btn"  @click="confirmMobilePassword">修改密码</view>
 			</view>
 		</view>
@@ -69,12 +69,12 @@
 		<view class="content" v-else>
 			<view class="login-form clearfix">
 				<view class="login-input">
-					<input class="input" type="text" v-model="email"  maxlength="30" placeholder="请输入邮箱地址"/>
+					<input class="input" type="text" v-model="email"  maxlength="30" placeholder="请输入邮箱地址"  placeholder-class="placeholder"/>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input code">
-					<input class="input" type="number" v-model="emailCode" maxlength="4"  placeholder="请输入邮箱验证码" />
+					<input class="input" type="number" v-model="emailCode" maxlength="4"  placeholder="请输入邮箱验证码"  placeholder-class="placeholder"/>
 				</view>
 				<view class="login-input btn" :class="[isEmialDisabled ? 'disabled' : '']">
 					<button class="input"  
@@ -87,19 +87,19 @@
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"/>
-					<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordEye"></view>
+					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"/>
-					<view class="iconfont" :class="isShowEyes ? iconEyen : iconEyes"  @click="passwordEyes"></view>
+					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
 				</view>
 			</view>
-			<view class="login-form clearfix">
+			<view class="login-form clearfix" style="border: 0;">
 				<view class="login-btn"  @click="confirmEmailPassword">修改密码</view>
 			</view>
 		</view>
@@ -290,24 +290,13 @@
 			border-top: 1px solid #F7F7F7;
 			margin-bottom: 112rpx;
 			position: relative;
-			.line{
-				position: absolute;
-				top: 0;
-				left: 50%;
-				margin-left: -80rpx;
-				width: 0;
-				height: 0;
-				border-left: 80rpx solid transparent;
-				border-right: 80rpx solid transparent;
-				border-bottom: 160rpx solid #FFFFFF;
-			}
 			.nav-item{
 				display: flex;
 				flex: 1;
 				flex-direction: column;
 				align-items: center;
 				line-height: 80rpx;
-				color: $text-color;
+				color: #666666;
 				font-size: $font-size-28;
 				background: #F7F7F7;
 				&.current{
@@ -320,13 +309,12 @@
 		.login-form{
 			width: 702rpx;
 			height: auto;
-			padding: 0 24rpx;
+			margin: auto;
+			border-bottom: 2rpx solid #e1e1e1;
 			.login-input{
 				width: 654rpx;
 				height: 40rpx;
 				padding: 24rpx;
-				margin-bottom: 20rpx;
-				background: #F7F7F7;
 				border-radius: 14rpx;
 				display: flex;
 				flex-direction: column;
@@ -339,7 +327,6 @@
 						top: 0;
 						font-size: 44rpx;
 						color: #999999;
-						font-weight: bold;
 						z-index: 99;
 						width: 96rpx;
 						height: 96rpx;
@@ -348,21 +335,22 @@
 					}
 				}
 				&.code{
-					width: 370rpx;
+					width: 310rpx;
 					float: left;
 					margin-right: 20rpx;
 				}
 				&.btn{
-					width: 263rpx;
-					height: 88rpx;
-					float: left;
+					width: 220rpx;
+					height: 64rpx;
+					float: right;
 					background: $btn-confirm;
 					padding: 0;
 					border-radius: 44rpx;
+					margin-top: 10rpx;
 					.input{
-						width: 263rpx;
-						height: 88rpx;
-						line-height: 88rpx;
+						width: 220rpx;
+						height: 64rpx;
+						line-height: 64rpx;
 						padding: 0;
 						color: #FFFFFF;
 						background: $btn-confirm;
@@ -381,20 +369,21 @@
 					}
 				}
 				&.img-btn{
-					width: 250rpx;
-					height: 88rpx;
+					width: 290rpx;
+					height: 64rpx;
 					padding: 0;
-					float: left;
+					float: right;
 					background: #FFFFFF;
 					display: block;
 					.vscodeimg{
-						width: 180rpx;
-						height: 88rpx;
+						width: 160rpx;
+						height: 64rpx;
 						float: left;
 						display: flex;
 						flex-direction: column;
 						align-items: center;
 						border-radius: 14rpx;
+						margin-top: 10rpx;
 						image{
 							width: 180rpx;
 							height: 88rpx;
@@ -402,25 +391,24 @@
 						}
 					}
 					.vscod-refresh{
-						width: 70rpx;
+						width: 100rpx;
 						float: right;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
+						margin-top: 25rpx;
 						.icon-shuaxin{
-							font-size: 48rpx;
-							color: #333333;
+							font-size: 36rpx;
+							color: #999999;
+							float: left
 						}
 						.ref-text{
 							font-size: 24rpx;
 							color: #333333;
+							float: right;
 						}
 					}
 				}
 				.input{
 					width: 100%;
 					height: 100%;
-					background: #F7F7F7;
 					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
@@ -475,4 +463,7 @@
 			}
 		}
 	}
+	.placeholder{
+		color: #b2b2b2;
+	}
 </style>

pages/user/setting/phone.vue

@@ -3,13 +3,13 @@
 		<view class="register-main first clearfix">
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">原手机号:</view>
+					<view class="label">原手机号</view>
 					<view class="row-input">{{bindMobile}}</view>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from code">
-					<input class="row-input" type="number" v-model="mobileCode" placeholder="请输入原手机号的验证码" maxlength="6"/>
+					<input class="row-input" type="number" v-model="mobileCode" placeholder="请输入原手机号的验证码" placeholder-class="place-holder" maxlength="6"/>
 				</view>
 				<view class="register-from btn" :class="[isMobileDisabled  ? 'disabled' : '']">
 					<button class="row-input"  type="button" @click.stop="getMobileCodeFn" :disabled="isMobileDisabled">{{ mobileCodeText }}</button>
@@ -17,20 +17,23 @@
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<input class="row-input" type="number" v-model="contractMobile" placeholder="请输入新手机号" maxlength="11"/>
+					<input class="row-input" type="number" v-model="contractMobile" placeholder="请输入新手机号" placeholder-class="place-holder" maxlength="11"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from code">
-					<input class="row-input" type="number" v-model="newMobileCode" placeholder="请输入新手机号的验证码" maxlength="6"/>
+					<input class="row-input" type="number" v-model="newMobileCode" placeholder="请输入新手机号的验证码" placeholder-class="place-holder" maxlength="6"/>
 				</view>
 				<view class="register-from btn" :class="[isNewMobileDisabled  ? 'disabled' : '']" >
 					<button class="row-input"  type="button" @click.stop="getNewMobileCodeFn" :disabled="isNewMobileDisabled">{{ newMobileCodeText }}</button>
 				</view>
 			</view>
-			<view class="register-row clearfix">
+			<view class="register-row clearfix" style="border: 0;">
 				<view class="register-btn"  @click="bindMobileCheck">确定</view>
 			</view>
+			<view class="register-text clearfix">
+				<view >注意：本操作更换的是供应商联系人的手机号，不是运营人员的手机号！</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -191,8 +194,9 @@
 			.register-row{
 				width: 702rpx;
 				height: auto;
-				padding: 0 24rpx;
-				margin-bottom: 20rpx;
+				margin: auto;
+				// margin-bottom: 20rpx;
+				border-bottom: 2rpx solid #e1e1e1;
 				.register-title{
 					line-height: 60rpx;
 					font-size: $font-size-32;
@@ -214,11 +218,9 @@
 					color: $color-system;
 				}
 				.register-from{
-					width: 654rpx;
+					width: 702rpx;
 					height: 40rpx;
-					padding: 24rpx;
-					background: $sub-bg-color;
-					border-radius: 14rpx;
+					padding: 24rpx 0;
 					position: relative;
 					.label{
 						text-align: left;
@@ -248,20 +250,20 @@
 						}
 					}
 					&.btn{
-						width: 224rpx;
-						height: 88rpx;
-						float: left;
-						background: $btn-confirm;
+						width: 180rpx;
+						height:64rpx;
+						float: right;
 						padding: 0;
+						border: 2rpx solid #e15616;
+						border-radius: 45rpx;
 						.row-input{
-							width: 224rpx;
-							height: 88rpx;
-							line-height: 88rpx;
+							width: 180rpx;
+							height: 64rpx;
+							line-height: 64rpx;
 							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
+							color:#E15616;
 							text-align: center;
-							border-radius: 14rpx;
+							border-radius: 45rpx;
 							&.none{
 								background: #F7F7F7;
 							}
@@ -275,14 +277,15 @@
 						}
 					}
 					&.btn{
-						margin-top: 0;
+						margin-top: 10rpx;
 					}
 				}
+				
 			}
 			.register-btn{
-				width: 702rpx;
-				height: 88rpx;
-				border-radius: 14rpx;
+				width: 600rpx;
+				height: 90rpx;
+				border-radius: 45rpx;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;
@@ -296,4 +299,16 @@
 			}
 		}
 	}
+	.register-text{
+		width: 506rpx;
+		color: #fea785;
+		font-size: 22rpx;
+		line-height: 32rpx;
+		margin: 30rpx auto;
+		text-align: center
+	}
+	.place-holder{
+		color: #b2b2b2;
+	}
 </style>
+

second/pages/form/form.vue

@@ -276,7 +276,7 @@
 				            secondProductType:null,//
 				            townId:'',//县区地址
 				            address:'',//详细地址
-				            image1:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/secondbg.jpg',//图片
+				            image1:'',//图片
 				            productDetails:'',//商品详细信息
 				            source:1,
 				         },
@@ -398,9 +398,6 @@
 						return
 					}
 			 }
-			 // if(this.secondParams.secondHandType ==2){
-				 
-			 // }
 			 if(this.secondParams.productQuality == ''){
 				  this.$util.msg('请输入商品成色',2000);
 					return
@@ -426,10 +423,10 @@
 				  this.$util.msg('请填写详细地址',2000);
 					return
 			 }
-				// if(this.GoodsImagesList ==''){
-				// 	this.$util.msg('请上传图片',2000);
-				// 	return;
-				// }
+				if(this.GoodsImagesList ==''){
+					this.$util.msg('请上传图片',2000);
+					return;
+				}
 			 if(this.checkbox==false){
 				   this.$util.msg('请勾选已阅读',2000);
 					return

second/pages/product/product-details.vue

@@ -1,68 +1,85 @@
 
 <template>
 	<view class="product" :style="{paddingBottom: userIdentity==1 ? '0rpx' :'188rpx'}">
-		<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="navbar" :class="navbarFiexd">
+			<!--  -->
+			<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
+				<text>详情</text>
+				<text class="line"></text>
+			</view>
+			<view class="nav-item tui-skeleton-fillet" 
+				  :class="{ current: tabCurrentIndex === 1 }" 
+				  @click="tabClick(1)" 
+				  v-if="product.brandInfo!='' && product.brandInfo!=null">
+					<text>品牌</text>
+					<text class="line"></text>
+			</view>	
+			<view class="nav-item tui-skeleton-fillet" :class="{ current: tabCurrentIndex === 2 }" @click="tabClick(2)">
+				<text>推荐</text>
+				<text class="line"></text>
+			</view>	
+		</view>
+		
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-product tui-skeleton">
-			<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" >
-							<swiper-item v-for="(item, index) in product.imageList" :key="index" class="banner-item"> 
-								<image :src="item" @click="previewImg(index)" class="product-img" />
-							</swiper-item>
-						</swiper>
-						<view class="swiper__dots-box">
-							<tui-tag padding="12rpx 24rpx" type="translucent" shape="circleLeft" size="32rpx" :scaleMultiple="0.82" originRight>{{ current + 1 }}/{{ product.imageList.length }}</tui-tag>
-						</view>
-					</uni-swiper-dot>
-				</view>
-				<view class="product-wrap clearfix">
-					<view class="wrap-top" :class="goodsData.isNoneDisabled ? 'none' : ''">
-						<view class="wrap-top-price" v-if="!goodsData.isNoneDisabled">
-							<cm-price v-if="isRequest"
-									  :product="product"
-									  :userIdentity="userIdentity"
-									  :promotions="product.promotions"
-									  :ladderPriceList="ladderPriceList"/>
-						</view>
-						<view class="p-title tui-skeleton-fillet">
-							<view class="p-title-name">
-								{{product.name == undefined ? '' : product.name}}
+			<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" >
+								<swiper-item v-for="(item, index) in product.imageList" :key="index" class="banner-item"> 
+									<image :src="item" @click="previewImg(index)" class="product-img" />
+								</swiper-item>
+							</swiper>
+							<view class="swiper__dots-box">
+								<tui-tag padding="12rpx 24rpx" type="translucent" shape="circleLeft" size="32rpx" :scaleMultiple="0.82" originRight>{{ current + 1 }}/{{ product.imageList.length }}</tui-tag>
 							</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="productRemarks"  v-if="product.productRemarks!=''&&product.productRemarks!=null">
-							<text class="text">{{product.productRemarks}}</text>
-						</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>
+						</uni-swiper-dot>
 					</view>
-				</view>			
-			</view>
-			<view class="product-seve">
-				<text class="title">服务：</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="product-parameter" @click="showPopup">
-				<text class="title">参数：</text>
-				<text class="name">品牌  起订量  分类...</text>
-				<text class="iconfont icon-xiayibu"></text>
+					<view class="product-wrap clearfix">
+						<view class="wrap-top" >
+							<view class="wrap-top-price">
+								<second-price v-if="isRequest" :product="product"></second-price>
+							</view>
+							<view class="p-title tui-skeleton-fillet">
+								<view class="p-title-name">
+									{{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="productRemarks"  v-if="product.productRemarks!=''&&product.productRemarks!=null">
+								<text class="text">{{product.productRemarks}}</text>
+							</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>
+					</view>			
+				</view>
+				<view class="product-seve">
+					<text class="title">服务：</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="product-parameter" @click="showPopup">
+					<text class="title">参数：</text>
+					<text class="name">品牌  起订量  分类...</text>
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
 			</view>
-			<view class="product-details">
+			<view class="product-details productDetails0">
 				<!-- 商品详情 -->
 				<view class="title">
 					<view class="title-tab">商品详情</view>
@@ -82,16 +99,16 @@
 					</view>
 				</view>
 			</view>	
-			<view class="product-details secondBrand">
+			<view class="product-details secondBrand productDetails1" v-if="product.brandInfo!=''&&product.brandInfo!=null">
 				<!-- 品牌信息 -->
 				<view class="title">
 					<view class="title-tab">品牌信息</view>
 				</view>
 				<text class="brandinfo">
-					品牌描述品牌描述品牌描述品牌描述品牌描述品牌描述品牌描述品牌描述
+					{{product.brandInfo}}
 				</text>
 			</view>
-			<view class="product-details recommend">
+			<view class="product-details recommend productDetails2">
 				<!-- 相关推荐 -->
 				<view class="title">
 					<view class="title-tab">相关推荐</view>
@@ -115,7 +132,7 @@
 			</tui-bottom-popup>	
 			<!-- 侧边 -->
 			<scroll-top v-if="isScrollTop"></scroll-top>
-		</view>
+			</view>
 	</view>
 </template>
 
@@ -177,7 +194,8 @@
 					title: ''		// 导航栏 中间的标题
 				},
 				linkPath:'',
-				popupShow:false//参数弹窗
+				popupShow:false,//参数弹窗
+				CustomBar:this.CustomBar,// 顶部导航栏高度
 			}
 		},
 		onLoad(option) {
@@ -199,12 +217,10 @@
 				})	
 			}
 			this.SecondService.ProductCount({productId:this.productID}).then(res =>{
-			            if(res.code==0){
-			                console.log(res)
-			            }else {
-			              console.log(res)
-			            }
-			        });
+			         console.log(res)
+			        }).catch(error =>{
+						this.$util.msg(error.msg,2000);
+					});
 		},
 		computed: {
 			...mapState(['hasLogin','isWxAuthorize'])
@@ -240,17 +256,18 @@
 			tabClick(index) {//商品详情&&供应商信息tab切换
 				console.log(index)
 				this.tabCurrentIndex = index;
-				switch(index){
-					case 1:
-						this.isRarameter = true
-						break;
-					case 2:
-						this.isService = true
-						break;
-					case 3:
-						this.isRecommend = true
-						break;
-				}
+				let classIndex = '.productDetails'+index;
+				uni.createSelectorQuery().select('.container-product-main').boundingClientRect((data)=>{//最外层盒子节点
+				　　uni.createSelectorQuery().select(classIndex).boundingClientRect((res)=>{//最外层盒子节点
+				　　　　uni.pageScrollTo({
+				　　　　　　duration:300,//过渡时间必须为0，uniapp bug，否则运行到手机会报错
+				　　　　　　scrollTop:res.top - data.top - 150,//滚动到实际距离是元素距离顶部的距离减去最外层盒子的滚动距离
+				　　　　})
+						setTimeout(()=>{
+							this.tabSelectFlag = false;
+						},500)
+				　　}).exec()
+				}).exec()
 			},
 			handleContact(e){//跳转小程序客服
 
@@ -356,6 +373,49 @@
 	page{
 		background-color: #FFFFFF;
 	}
+	.navbar {
+		width: 100%;
+		height: 80rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		background: #ffe6dc;
+		z-index: 10;
+		display: flex;
+		position: fixed;
+		opacity: 0;
+		left: 0;
+		&.fixed{
+			opacity: 1;
+		}
+		.nav-item {
+			display: flex;
+			flex: 1;
+			justify-content: center;
+			align-items: center;
+			height: 80rpx;
+			font-size: $font-size-28;
+			color: $text-color;
+			position: relative;
+			float: left;
+			position: relative;
+			.line{
+				width: 60rpx;
+				height: 2px;
+				border-radius: 1px;
+				background: #FFFFFF;
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				margin-left: -30rpx;
+			}
+			&.current{
+				color:$color-system;
+				.line{
+					background: $color-system;
+				}
+			}
+		}
+	}
 	.productRemarks{
 		height: 36rpx;
 		margin: 8rpx 0;
@@ -849,47 +909,7 @@
 				}
 			}
 		}
-		.navbar {
-			width: 702rpx;
-			height: 96rpx;
-			padding: 0 24rpx;
-			background: #fff;
-			z-index: 10;
-			display: flex;
-			border-bottom: 1px solid #F8F8F8;
-			&.fixed{
-				position: fixed;
-				left: 0;
-			}
-			.nav-item {
-				display: flex;
-				flex: 1;
-				justify-content: center;
-				align-items: center;
-				height: 96rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				position: relative;
-				float: left;
-				position: relative;
-				.line{
-					width: 60%;
-					height: 2px;
-					border-radius: 1px;
-					background: #FFFFFF;
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					margin-left: -30%;
-				}
-				&.current{
-					color:$color-system;
-					.line{
-						background: $color-system;
-					}
-				}
-			}
-		}
+	
 		.content{
 			width: 100%;
 			min-height: 750rpx;

second/pages/product/product-list.vue

@@ -150,7 +150,6 @@
 			 this.setScrollHeight();		
 			 this.gettabList();
 			 this.isFocus = true;
-			 console.log(this.hasLogin)
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -200,6 +199,8 @@
 				this.isModallayer = false;
 			},
 			gettabList:function (loadMore) {
+				console.log(this.hasLogin)
+				console.log(this.userInfo)
 							this.showLoading = true;
 							this.loadingNow = true;
 							this.loadingText = '加载中';

seller/pages/cart/cart.vue

@@ -173,7 +173,8 @@
 				submitIds:[],
 				depositIds : [6060,6061,6062,6063,6064],//定金商品ID
 				rechargeIds : [6065,6066,6067,6068,6069],//充值余额商品ID
-				isIphoneX:this.$store.state.isIphoneX
+				isIphoneX:this.$store.state.isIphoneX,
+				againBuyProductIds:''
 			}
 		},
 		onLoad(){
@@ -223,7 +224,7 @@
 				}, 500)
 			},
 			initGetCartGoodsList(){//初始化购物车 index:1
-				let params = {clubId:this.clubId,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize}
+				let params = {clubId:this.clubId,serviceProviderId:this.serviceProviderId,pageNum:1,pageSize:this.pageSize,againBuyProductIds:this.againBuyProductIds}
 				 this.SellerService.GetSellerShoppingInfo(params).then(response =>{
 					this.skeletonShow = false
 					this.$store.commit('updateAllNum',response.data.cartQuantity)
@@ -727,7 +728,9 @@
 		},
 		onShow(){
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				console.log(resolve)
 				this.clubId = resolve.clubID
+				this.againBuyProductIds = resolve.againBuyProductIds
 				this.initData()
 			})
 		}

seller/pages/order/create-order.vue

@@ -54,7 +54,7 @@
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
 		<!-- 返佣订单 -->
-		<view class="Rebate" @click="RebateChang">
+		<view class="Rebate" @click="RebateChang" v-if="productsList.length==1">
 			<text class="rebate-title">返佣订单</text>
 			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
 		</view>
@@ -138,6 +138,7 @@
 				seconDepositFlg:true,
 				rebateFlag:0,
 				rebatecheck:false,
+				productsList:[]
 			}
 		},
 		onLoad(option){//商品数据
@@ -166,7 +167,7 @@
 		methods: {
 			RebateChang(){
 				this.rebatecheck = !this.rebatecheck;
-				if(this.rebateshow){
+				if(this.rebatecheck){
 					this.rebateFlag=1;
 				}else{
 					this.rebateFlag=0;
@@ -204,6 +205,7 @@
 						this.allPrice = this.payAllPrice = data.totalAmount
 						this.regulationsData = data.clauseList
 						this.goodsData.forEach(item =>{
+							this.productsList = item.productsList
 							item.productsList.forEach(pros =>{
 								if(this.depositIds.indexOf(pros.productID)>=0){
 									this.isDepositFlg = false
@@ -345,7 +347,6 @@
 							productNum:item.productCount,
 							productType:item.giftType ? Number(item.giftType) : 0,
 							presentNum:0,
-							rebateFlag:this.rebateFlag
 						})
 					})				
 					return {shopId:el.shopID,note:el.note?el.note:'',productInfo:productInfo}
@@ -356,7 +357,8 @@
 						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
 						freight:parseInt(this.freightData.freight).toFixed(2),//邮费
 						freePostFlag:parseInt(this.freightData.freePostFlag),//运费形式
-						clauseId:this.clauseId//售后条款
+						clauseId:this.clauseId,//售后条款
+						rebateFlag:this.rebateFlag,//返佣
 					}
 					console.log(this.payInfo)
 				let params = {
@@ -370,22 +372,44 @@
 						orderInvoice:this.invoiceData //发票信息
 					}
 				this.modalLayer = true;	
-				this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
-					const data = response.data;
-					if(data.code === '1'){
-						this.$util.msg('支付成功',2000,true,'success')
-						setTimeout(() =>{
-							this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-						},2000)
-					}else{
-						this.$util.msg('订单提交成功',2000,true,'success')
-						setTimeout(()=>{
-							this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-						},2000)
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
+				if(this.rebateFlag==1){
+					this.$util.modal('','确定该订单为返佣订单吗？点击确定按钮继续提交订单','确定','取消',true,() =>{
+						this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
+							const data = response.data;
+							if(data.code === '1'){
+								this.$util.msg('支付成功',2000,true,'success')
+								setTimeout(() =>{
+									this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
+								},2000)
+							}else{
+								this.$util.msg('订单提交成功',2000,true,'success')
+								setTimeout(()=>{
+									this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
+								},2000)
+							}
+						}).catch(error =>{
+							this.$util.msg(error.msg,2000);
+						})
+					})
+					return
+				}else{
+					this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
+						const data = response.data;
+						if(data.code === '1'){
+							this.$util.msg('支付成功',2000,true,'success')
+							setTimeout(() =>{
+								this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
+							},2000)
+						}else{
+							this.$util.msg('订单提交成功',2000,true,'success')
+							setTimeout(()=>{
+								this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
+							},2000)
+						}
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000);
+					})
+				}
 			},
 			handFreightAlertShow(){//显示邮费弹窗
 				this.isfreightTip = true;
@@ -539,7 +563,7 @@
 		.footer-count{
 			float: left;
 			padding-left: 24rpx;
-			width:180rpx;
+			width:190rpx;
 			box-sizing: border-box;
 			font-size: $font-size-26;
 		}

seller/pages/order/order-details.vue

@@ -3,6 +3,13 @@
 		<!-- 自定义返回 -->
 		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isShare='isOrderShare'></header-back>
 		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
+			<view class="status-text">
+				<view class="view-type">{{ information.status | TextFormat }}</view>
+					<view class="Rebate " v-if="information.rebateFlag==1">返佣</view>
+					<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4">协销</text>
+					<text class="bage-auto btn" v-if="information.orderSubmitType == 0 || information.orderSubmitType == 1 ||information.orderSubmitType == 2">自主</text>
+					
+			</view>
 			<!-- 地址选择 -->
 			<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
 			<!-- 商品 -->
@@ -132,6 +139,39 @@
 			this.getHeaderTopHeight()
 			this.initOrderDetaileData()
 		},
+		filters:{
+			NumFormat(value) {//处理金额
+				return Number(value).toFixed(2);
+			},
+			TextFormat(status) {//处理金额
+				let HtmlText,
+					typeTextObject={
+						0:'待确认',
+						4:'交易完成',
+						5:'订单完成',
+						6:'已关闭',
+						7:'交易全退',
+						77:'交易全退',
+						11:'待付款待发货',
+						12:'待付款部分发货',
+						13:'待付款已发货',
+						21:'部分付款待发货',
+						22:'部分付款部分发货',
+						23:'部分付款已发货',
+						31:'已付款待发货',
+						32:'已付款部分发货',
+						33:'已付款已发货',
+						111:'待付款待发货',
+					};
+				
+				Object.keys(typeTextObject).forEach(key => {
+					if(key == status){
+						HtmlText = typeTextObject[key]
+					}
+				})
+				return HtmlText
+			},
+		},
 		methods: {
 			openclauseConten(id){
 				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
@@ -178,8 +218,29 @@
 					case 'balance':
 						this.getOrderPaymentValidation(data)
 						break;
+					case 'again':
+						this.handOrderAgain(data.orderId);
+						break		
 				}
 			},
+			handOrderAgain(id){
+				this.aganOrderID = id;
+				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
+					if(res.code==0){
+						this.$api.navigateTo('/seller/pages/cart/cart');
+					}
+				}).catch(error =>{
+					if(error.code== -3){
+						this.showAgan = true;
+						this.promptitle = error.msg;
+						this.failList = error.data;
+					}else if(error.code== -2){
+						this.$util.modal('',error.msg,'确定','',false,() =>{})
+					}else{
+						this.$util.msg(error.msg,2000)
+					}
+					})
+			},
 			handOrderConfirm(data){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
 					affirmOrder({orderID:this.orderID}).then(response =>{
@@ -391,4 +452,54 @@
 			}
 		}
 	}
+	.status-text{
+		overflow: hidden;
+		padding: 24rpx;
+		background: #fff;
+		font-size: $font-size-26;
+		.view-type{
+			float: left;
+			color: #ff2a2a;
+		}
+		.bage-buss{
+			display: inline-block;
+			width: 72rpx;
+			height: 32rpx;
+			background:radial-gradient(circle,rgba(255,39,180,1) 0%,rgba(193,77,245,1) 100%);
+			border-radius: 6rpx;
+			line-height: 32rpx;
+			text-align: center;
+			color: #FFFFFF;
+			margin-top: 10rpx;
+			float: right;
+			font-size: $font-size-24;
+		}
+		.bage-auto{
+			display: inline-block;
+			width: 72rpx;
+			height: 32rpx;
+			background:radial-gradient(circle,rgba(255,180,39,1) 0%,rgba(245,142,77,1) 100%);
+			border-radius: 6rpx;
+			line-height: 32rpx;
+			text-align: center;
+			color: #FFFFFF;
+			margin-top: 10rpx;
+			float: right;
+			font-size: $font-size-24;
+		}
+		.Rebate{
+			display: inline-block;
+			width: 72rpx;
+			height: 32rpx;
+			background:#ff7a51;
+			border-radius: 6rpx;
+			line-height: 32rpx;
+			text-align: center;
+			color: #FFFFFF;
+			margin-top: 10rpx;
+			float: right;
+			font-size: $font-size-24;
+			margin-left: 20rpx;
+		}
+	}
 </style>

seller/pages/order/order-list.vue

@@ -33,6 +33,7 @@
 								<view class="order-title">
 									<view class="order-title-name">{{order.clubName}}</view>
 									<view class="order-title-t">
+										<view class="Rebate " v-if="order.rebateFlag==1">返佣</view>
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}({{order.orderID}})</text>
@@ -234,6 +235,7 @@
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:1}).then(res =>{
 					if(res.code==0){
 						this.$api.navigateTo('/seller/pages/cart/cart');
+						this.showAgan = false;
 					}
 				})
 			},
@@ -394,6 +396,7 @@
 				this.aganOrderID = id;
 				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:0}).then(res =>{
 					if(res.code==0){
+						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds})
 						this.$api.navigateTo('/seller/pages/cart/cart');
 					}
 				}).catch(error =>{
@@ -697,6 +700,19 @@
 				text-align: center;
 				color: #FFFFFF;
 			}
+			.Rebate{
+				display: inline-block;
+				width: 72rpx;
+				height: 32rpx;
+				background:#ff7a51;
+				border-radius: 6rpx;
+				line-height: 32rpx;
+				text-align: center;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+				font-size: $font-size-22;
+				margin-right: 20rpx;
+			}
 			.bage-text{
 				display: inline-block;
 				font-size: $font-size-28;

services/sellse.service.js

@@ -124,6 +124,6 @@ export default class SellerService {
 	}
 	// 协销订单列表/再来一单
 	SellerCreateOrderAgain (data = {}) {
-		return this.AjaxService.post({ url:'/seller/again', data, isLoading: true })
+		return this.AjaxService.post({ url:'/seller/order/again', data, isLoading: true })
 	}
 }

supplier/pages/user/setting/password.vue

@@ -51,14 +51,14 @@
 				<view class="login-input pwd">
 					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordEye"></view>
+					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
 					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEyes ? iconEyen : iconEyes"  @click="passwordEyes"></view>
+					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix" style="border: 0;">
@@ -89,14 +89,14 @@
 				<view class="login-input pwd">
 					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordEye"></view>
+					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
 					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEyes ? iconEyen : iconEyes"  @click="passwordEyes"></view>
+					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix" style="border: 0;">
@@ -290,17 +290,6 @@
 			border-top: 1px solid #F7F7F7;
 			margin-bottom: 112rpx;
 			position: relative;
-			// .line{
-			// 	position: absolute;
-			// 	top: 0;
-			// 	left: 50%;
-			// 	margin-left: -80rpx;
-			// 	width: 0;
-			// 	height: 0;
-			// 	border-left: 80rpx solid transparent;
-			// 	border-right: 80rpx solid transparent;
-			// 	border-bottom: 160rpx solid #FFFFFF;
-			// }
 			.nav-item{
 				display: flex;
 				flex: 1;
@@ -320,15 +309,12 @@
 		.login-form{
 			width: 702rpx;
 			height: auto;
-			// padding: 0 24rpx;
 			margin: auto;
 			border-bottom: 2rpx solid #e1e1e1;
 			.login-input{
 				width: 654rpx;
 				height: 40rpx;
 				padding: 24rpx;
-				// margin-bottom: 20rpx;
-				// background: #F7F7F7;
 				border-radius: 14rpx;
 				display: flex;
 				flex-direction: column;
@@ -341,7 +327,6 @@
 						top: 0;
 						font-size: 44rpx;
 						color: #999999;
-						font-weight: bold;
 						z-index: 99;
 						width: 96rpx;
 						height: 96rpx;
@@ -408,9 +393,6 @@
 					.vscod-refresh{
 						width: 100rpx;
 						float: right;
-						// display: flex;
-						// flex-direction: column;
-						// align-items: center;
 						margin-top: 25rpx;
 						.icon-shuaxin{
 							font-size: 36rpx;
@@ -427,7 +409,6 @@
 				.input{
 					width: 100%;
 					height: 100%;
-					// background: #F7F7F7;
 					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
@@ -483,6 +464,6 @@
 		}
 	}
 	.placeholder{
-		color: #9aa5b5;
+		color: #b2b2b2;
 	}
 </style>

supplier/pages/user/setting/phone.vue

@@ -233,7 +233,7 @@
 						width: 440rpx;
 						padding-left:10rpx;
 						font-size: $font-size-28;
-						color: $color-system;
+						color: $text-color;
 						line-height: 40rpx;
 						float: left;
 						height: 40rpx;
@@ -308,7 +308,7 @@
 		text-align: center
 	}
 	.place-holder{
-		color: #9aa5b5;
+		color: #b2b2b2;
 	}
 </style>