Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

# Conflicts:
#	api/other.js
#	common/config/config.js
#	services/ajax.env.js

api/other.js

@@ -36,3 +36,4 @@ export function protocolAgree(params) {
 		})
 	})
 }
+

components/cm-module/creatOrder/sellerInvoice.vue

@@ -308,6 +308,7 @@
 			.text{
 				font-size: $font-size-28;
 				color: $text-color;
+				font-weight: bold;
 			}
 			.iconfont{
 				width: 50rpx;

components/cm-module/creatOrder/sellerRegulations.vue

@@ -17,13 +17,9 @@
 					<text class="iconfont icon-iconfontguanbi" @click="freightConfim"></text>
 					<view class="freight-radio">
 						<radio-group class="row-group" @change="radioChange">
-							<label class="row-input">
-								<view class="row-text noTk">无条款</view>
-								<radio class="row-radio" value="无条款" color="#E15616"/>
-							</label>
 							<label class="row-input" v-for="(item, index) in regulaDatas" :key="index">
-								<view class="row-text" @click.stop="gotoConten(item.id)">{{item.name.length>15?item.name.substr(0,15)+'...':item.name}}</view>
-								<radio class="row-radio" :value="item.name" :checked="index === current" color="#E15616"/>
+								<view class="row-text" @click.stop="gotoConten(item.id)">{{item.name.length>10?item.name.substr(0,10)+'...':item.name}}</view>
+								<radio class="row-radio" :value="item.id" :checked="index === current" color="#E15616"/>
 							</label>
 						</radio-group>
 					</view>
@@ -46,30 +42,27 @@
 		data(){
 			return{
 				regulaText:'无条款',
-				
 				freightMoney:0,
 				specClass: '',//规格弹窗css类，控制开关动画
-			}
-		},
-		watch: {
-			regulaDatas: {
-				handler: function (el) {//监听对象的变换使用 function，箭头函数容易出现this指向不正确
-					this.regulaDatas = el
-				},
-				deep: true
+				clauseId:0
 			}
 		},
 		created() {
 		},
 		methods:{
 			gotoConten(id){
-				console.log(id)
-				this.$api.navigateTo(`/pages/service/sellconten?id=${id}`)
+				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
 			},
 			radioChange(e){
-				this.regulaText = e.target.value;
+				this.clauseId = e.target.value;
+				this.regulaDatas.forEach((item,index)=>{
+					if(item.id==this.clauseId){
+						this.regulaText = item.name;
+					}
+				})
 			},
 			freightConfim(){//提交完成选择
+			this.$emit('handleData',this.clauseId)
 			this.hideSpec()
 			},
 			hideSpec() {//关闭弹窗
@@ -172,7 +165,10 @@
 			line-height: 66rpx;
 			width: 100%;
 			display: block;
-
+			&:nth-of-type(1){
+				color: #666666;
+				pointer-events: none;
+			}
 		}
 		.row-radio{
 			float: right;
@@ -183,9 +179,6 @@
 			font-size: $font-size-28;
 			color: #1890f9;
 			float: left;
-			&.noTk{
-				color: #666666;
-			}
 		}
 	}
 	.freight-group{

components/cm-module/orderDetails/goodsList.vue

@@ -19,7 +19,7 @@
 						</view>
 						<view class="pros-product">
 							<view class="producttitle">{{pros.name}}</view>
-							<view class="productspec" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
+							<view class="productspec product-view" v-if="pros.productCategory != 2">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
 							<view class="product-view">
 								<view class="view-num">单价：￥{{pros.price | NumFormat}}</view>
 							</view>
@@ -31,6 +31,8 @@
 							</view>
 							<view class="product-view">
 								<view class="view-num">税率：{{pros.taxRate}}%</view>
+							</view>
+							<view class="product-view">
 								<view class="view-num">折扣：{{pros.discount == null ? '0' : pros.discount}}%</view>
 							</view>
 							<view class="product-view">
@@ -45,8 +47,8 @@
 								</view>
 								<view v-else-if="pros.productPromotion.type !=3" class="floor-tags" @click.stop="clickPopupShow(pros.productPromotion)">{{pros.productPromotion.name}}</view>	
 							</view>
-							<view class="product-view">
-								<view class="view-num">合计：￥{{pros.totalFee | NumFormat}}</view>
+							<view class="product-view allPrice">
+								<view class="view-num">合计：<label style="color:#f94b4b ;">￥{{pros.totalFee | NumFormat}}</label></view>
 							</view>
 						</view>	
 					</view>
@@ -58,7 +60,7 @@
 					</view>	
 				</view>
 				<view class="goods-pros-b">
-					<view class="count">共{{item.itemCount}}件商品</view>
+					<view class="count">共<label style="color: #e15616;">{{item.itemCount}}</label>件商品</view>
 					<view class="sum">
 						<view class="sum-none" v-if="item.promotionFullReduction>0">
 							<text class="money-sign">￥</text>
@@ -235,14 +237,18 @@
 				font-size: $font-size-26;	
 				position: relative;
 				.product-view{
-					width: 100%;
+					width: 50%;
 					height: auto;
-					display: flex;
+					// display: flex;
+					display: inline-block;
+					&.allPrice{
+						width: 100%;
+					}
 					.view-num{
 						flex: 1;
 						text-align: left;
 						font-size: $font-size-26;
-						color: #666666;
+						color: #999999;
 						line-height: 44rpx;
 						.red{
 							color: #FF2000;
@@ -263,7 +269,7 @@
 				}
 				.productspec{
 					height: 44rpx;
-					color: #666666;
+					color: #999999;
 					line-height: 44rpx;
 				}
 				.productprice{
@@ -347,6 +353,8 @@
 				height: 80rpx;
 				margin-top: 12rpx;
 				float: left;
+				border-top: 2rpx solid #e1e1e1;
+
 				.count{
 					float: left;
 					font-size: $font-size-28;
@@ -356,7 +364,7 @@
 					justify-content: flex-end;
 				}
 				.sum{
-					width: 530rpx;
+					width: 520rpx;
 					float: right;
 					.sum-none{
 						width: 100%;

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">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnConfirm('agan',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

@@ -4,7 +4,7 @@
 		<view class="button-content"> 
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
 			<view class="btn btn-cancel" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderID)">删除订单</view>
-			<view class="btn btn-cancel"  @click.stop="btnConfirm('add',orderID)">再来一单</view>
+			<view class="btn btn-cancel"  @click.stop="btnConfirm('again',orderID)">再来一单</view>
 			<view class="btn btn-cancel"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderID)">确认订单</view>
 		</view>

pages.json

@@ -155,6 +155,11 @@
 			"style": {
 				"navigationBarTitleText": "隐私权政策"
 			}
+		},{
+			"path": "pages/service/sellconten",
+			"style": {
+				"navigationBarTitleText": "条款内容"
+			}
 		},{
             "path" : "pages/user/invoice/invoice",
             "style" : {

pages/login/bindOperator.vue

@@ -1,5 +1,11 @@
 <template>
-	<view class="container login" v-if="isUserInfo">
+	<view class="container login" >
+		<!-- v-if="isUserInfo" -->
+		<view class="login-form title">
+			<view class="text">
+				<label class="iconfont icon-tishi"></label>请填写如下信息成为机构运营人员后才能操作订单
+			</view>
+		</view>
 		<view class="login-form clearfix">
 			<view class="login-input">
 				<input type="text" 
@@ -7,6 +13,7 @@
 					   maxlength="30" 
 					   class="input" 
 					   placeholder="请输入姓名"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 		</view>
@@ -17,6 +24,7 @@
 					   maxlength="11" 
 					   class="input" 
 					   placeholder="请输入手机号"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 		</view>
@@ -27,6 +35,7 @@
 					   maxlength="4" 
 					   class="input" 
 					   placeholder="请输入右侧图形验证码"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 			<view class="login-input img-btn">
@@ -46,6 +55,7 @@
 					   maxlength="6" 
 					   class="input" 
 					   placeholder="请输入短信验证码"
+					   placeholder-class="placeholder"
 				/>
 			</view>
 			<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
@@ -58,7 +68,7 @@
 			</view>
 		</view>
 		<view class="login-form clearfix">
-			<view class="login-btn"  @click="bindWechatInfo">绑定并登录</view>
+			<view class="login-btn"  @click="bindWechatInfo">绑定</view>
 		</view>
 		<view class="login-foot">
 			<text class="foot-text">本操作会绑定您的微信，绑定后您可使用微信直接登录【采美采购商城】小程序。</text>
@@ -119,9 +129,9 @@
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 							this.$store.commit('updateStatus',response.data)
 							if(response.data.userIdentity ==1){
-								this.$api.navigateTo('/seller/pages/index/index')
+								// this.$api.navigateTo('/seller/pages/index/index')
 							}else{
-								this.$api.switchTabTo('/pages/tabBar/home/index')
+								// this.$api.switchTabTo('/pages/tabBar/home/index')
 							}
 						}).catch(error =>{
 							this.logout()
@@ -247,75 +257,91 @@
 		width: 100%;
 		height: auto;
 		border-top: 1px solid #F7F7F7;
-		padding-top: 100rpx;
+		padding-top: 30rpx;
 		.login-foot{
-			width: 702rpx;
+			width: 528rpx;
 			height: 88rpx;
 			padding: 0 24rpx;
-			margin-top: 30rpx;
+			margin: 30rpx auto;
+			text-align: center;
 			.foot-text{
 				font-size: 24rpx;
 				line-height: 44rpx;
-				color:$text-color;
+				color:#999999;
 			}
 		}
 		.login-form{
 			width: 702rpx;
 			height: auto;
 			padding: 0 24rpx;
+			&.title{
+				color: #e15616;
+				font-size: 24rpx;
+				text-align: center;
+				margin-bottom: 20rpx;
+				.text{
+					padding: 20rpx 24rpx;
+					background: #fff0e9;
+					border-radius: 16rpx;
+					.iconfont{
+						margin-right: 20rpx;
+						position: relative;
+						top: 5rpx;
+					}
+				}
+			}
 			.login-input{
 				width: 654rpx;
 				height: 40rpx;
 				padding: 24rpx;
 				margin-bottom: 20rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
 				display: flex;
 				flex-direction: column;
 				align-items: center;
+				border-bottom: 1rpx solid #e1e1e1;
 				&.code{
 					width: 370rpx;
 					float: left;
-					margin-right: 20rpx;
+					margin-right: 10rpx;
 				}
 				&.btn{
 					width: 258rpx;
 					height: 88rpx;
 					padding: 0;
 					float: left;
-					background: $btn-confirm;
+					border: 0;
 					.input{
-						width: 258rpx;
+						width: 280rpx;
 						height: 88rpx;
 						line-height: 88rpx;
 						padding: 0;
-						border-radius: 14rpx;
+						border-radius: 45rpx;
 						color: #FFFFFF;
 						background: $btn-confirm;
 					}
 					&.disabled{
 						background: #F7F7F7;
 						.input{
-							background: #F7F7F7;
 							color: #999999;
 						}
 					}
 				}
 				&.img-btn{
-					width: 250rpx;
+					width: 270rpx;
 					height: 88rpx;
 					padding: 0;
 					float: left;
 					background: #FFFFFF;
 					display: block;
+					border: 0;
 					.vscodeimg{
-						width: 180rpx;
-						height: 88rpx;
+						width: 160rpx;
+						height: 64rpx;
 						float: left;
 						display: flex;
 						flex-direction: column;
 						align-items: center;
-						border-radius: 14rpx;
+						border-radius: 6rpx;
 						image{
 							width: 180rpx;
 							height: 88rpx;
@@ -323,25 +349,29 @@
 						}
 					}
 					.vscod-refresh{
-						width: 70rpx;
+						width: 95rpx;
 						float: right;
-						display: flex;
+						// display: flex;
 						flex-direction: column;
 						align-items: center;
+						margin-top: 10rpx;
 						.icon-shuaxin{
-							font-size: 48rpx;
-							color: #333333;
+							font-size: 36rpx;
+							color: #999999;
+							display: inline-block;
 						}
 						.ref-text{
 							font-size: 24rpx;
-							color: #333333;
+							color: #999999;
+							display: inline-block;
+							margin-left: 10rpx;
 						}
 					}
 				}
 				.input{
 					width: 100%;
 					height: 100%;
-					background: #F7F7F7;
+					// background: #F7F7F7;
 					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
@@ -396,4 +426,7 @@
 			}
 		}
 	}
+	.placeholder{
+		color:#b2b2b2 ;
+	}
 </style>

pages/service/sellConten.vue

@@ -1,4 +1,4 @@
-<template name="sellConten">
+<template>
 	<view class="container clearfix rich-text-temp">
 		<rich-text-template ref="childTemplate"></rich-text-template>
 	</view>
@@ -6,8 +6,6 @@
 
 <script>
 	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	import { querySaveClause } from "@/api/other.js"
-	
 	export default{
 		components: {
 		   richTextTemplate
@@ -26,9 +24,9 @@
 		methods:{
 			initData(){
 				let self = this;
-				querySaveClause({clauseId:this.id}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
+				this.OtherService.QuerySaveClause({clauseId:this.id}).then(response =>{
+						let data =response.data.content
+						self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -37,5 +35,16 @@
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.container{
+		background: #fff;
+	}
+	.rich-text-temp rich-text.h4, .rich-text-temp rich-text.p {
+		color: #666666;
+	}
+	.rich-text-temp rich-text.h4, .rich-text-temp rich-text.p:nth-child(1) {
+		color: #333333;
+		text-align: center;
+		font-weight: bold;
+	}
 </style>

pages/user/order/order-payment.vue

@@ -152,7 +152,8 @@
 				optionType:'',
 				onlinePayFlag:'',
 				payBringTitle:'本次交易暂不支持线上支付，请使用线下转账方式付款',
-				payStatusText:'使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
+				payStatusText:'使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
+				pageType:''
 			}
 		},
 		onLoad(option) {

second/pages/form/form.vue

@@ -56,37 +56,37 @@
 					 <view class="row" v-if="secondParams.brandID==161">
 						 <view class="label">其它品牌</view>
 						 <view class="spacing">
-							 <input type="text" maxlength="40" v-model="secondParams.brandName" placeholder="请输入商品品牌">
+							 <input type="text" maxlength="40" v-model="secondParams.brandName" placeholder="请输入商品品牌" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <view class="label">商品名称</view>
 						 <view class="spacing">
-							 <input type="text" maxlength="40"  v-model="secondParams.name" placeholder="请输入商品名称，不超过40个汉字">
+							 <input type="text" maxlength="40"  v-model="secondParams.name" placeholder="请输入商品名称，不超过40个汉字" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <view class="label">出厂日期</view>
 						 <view class="spacing">
-							<input type="text" v-model="secondParams.fixedYears"  maxlength="10" placeholder="请输入出厂日期 如：2020年06月">
+							<input type="text" v-model="secondParams.fixedYears"  maxlength="10" placeholder="请输入出厂日期 如：2020年06月" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view class="row"  v-show="secondParams.secondHandType==2">
 						 <view class="label second">产品到期日</view>
 						 <view class="spacing second">
-							<input type="text"  v-model="secondParams.maturityYears" maxlength="10" placeholder="请输入产品到期日，如：2020年12月">
+							<input type="text"  v-model="secondParams.maturityYears" maxlength="10" placeholder="请输入产品到期日，如：2020年12月" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <view class="label">公司名称</view>
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.companyName"  maxlength="30" placeholder="请输入公司名称，不超过30个汉字">
+							 <input type="text"  v-model="secondParams.companyName"  maxlength="30" placeholder="请输入公司名称，不超过30个汉字" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <view class="label">交易价</view>
 						 <view class="spacing">
-							 <input type="text" maxlength="20" v-model="secondParams.price1"  placeholder="请输入交易价">
+							 <input type="text" maxlength="20" v-model="secondParams.price1"  placeholder="请输入交易价" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view style="margin-top: 15rpx;">
@@ -99,45 +99,42 @@
 					 <view class="row" v-show="secondParams.secondHandType==2">
 						 <view class="label">市场价</view>
 						 <view class="spacing">
-							  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价">
+							  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view class="row"  v-show="secondParams.secondHandType==2">
 						 <view class="label second">采购价/原价</view>
 						 <view class="spacing second">
-							  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价"/>
+							  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价" placeholder-class="placeholder"/>
 						 </view>
 					 </view>
 					 <view class="row" v-show="secondParams.secondHandType==2">
 						 <view class="label">数量</view>
-						 <view class="spacing">
-							  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量">
+						 <view class="spacing"> 
+							  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view class="row">
 						 <view class="label">商品成色</view>
 						 <view class="spacing">
-						     <input type="text" maxlength="10"  v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”">
+						     <input type="text" maxlength="10"  v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <view class="label">联系人</view>
 						 <view class="spacing">
-							  <input type="text" maxlength="6" v-model="secondParams.contactName"   placeholder="请输入联系人姓名">
+							  <input type="text" maxlength="6" v-model="secondParams.contactName"   placeholder="请输入联系人姓名" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <view class="label">联系方式</view>
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.contactMobile"    maxlength="11" placeholder="请输入联系人手机号 / 固话">
+							 <input type="text"  v-model="secondParams.contactMobile"    maxlength="11" placeholder="请输入联系人手机号 / 固话" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <view class="label">商品类型</view>
 						 <view class="secondradio">
-							<!-- <view class="buy " v-for="(item ,index) in beauty" :key='index' value="item.value" @click="getProductType(item.value)" :class="secondType==item.value?' active':''">
-								 <label class="iconfont" :class="secondType==item.value?'icon-yixuanze':'icon-weixuanze'"></label>{{item.name}}
-							 </view> -->
 							 <radio-group class="row-group" @change="getProductType" >
 							 	<label class="row-input" v-for="(item, index) in beauty" :key="index">
 							 		<radio class="row-radio" :value="item.value" color="#E15616"/>
@@ -149,14 +146,14 @@
 					<view class="row" >
 						 <view class="label">联系地址</view>
 						 <view class="spacing"  @click="showMulLinkageThreePicker">
-							 <text class="row-input" :class="addressData.address === '请选择所在地区' ? 'none' : ''">
+							 <text class="row-input" :class="addressData.address === '请选择所在地区' ? 'none,placeholder' : ''"  >
 							 	{{addressData.address}}
 							 </text>		
 							 <text class="iconfont icon-xiayibu"></text>
 					    </view> 
 					 </view>
 					 <textarea type="text"  class="border-grey address-details" v-model="secondParams.address" maxlength="50"
-						placeholder="请填写详细地址，如街道/小区/门牌等" /></textarea>
+						placeholder="请填写详细地址，如街道/小区/门牌等"  placeholder-class="placeholder"/></textarea>
 					<view class="release-main-container">
 						<view class="release-from">
 							<view class="label">商品图片</view>
@@ -180,13 +177,13 @@
 						<view class="productinfo">
 							 <view class="label unlogin-label" style="width: 100%;">商品详细信息</view>
 							 <div class="textarea-wrapper">
-								 <textarea maxlength="200" v-model="secondParams.productDetails"  cols="70" class="description" rows="6"  placeholder="请填写商品详细信息，对商品进行更详细的描述"></textarea>
+								 <textarea maxlength="200" v-model="secondParams.productDetails"  cols="70" class="description" rows="6"  placeholder="请填写商品详细信息，对商品进行更详细的描述"  placeholder-class="placeholder"></textarea>
 								 <span class="word-limit">{{secondParams.productDetails.length}}/200</span>
 							 </div>
 						</view>
 						<view class="productinfo">
 							 <view class="label unlogin-label" style="width: 100%;">免责声明</view>
-							 <textarea class="smText">
+							 <textarea type="text"  class="smText" >
 								 鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，
 								 由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！
 							 </textarea>
@@ -227,6 +224,7 @@
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'
 	import { uploadFileImage } from "@/api/utils.js"
+	import authorize from '@/common/config/authorize.js'
 	import { mapState,mapMutations } from 'vuex';
 	export default{
 		name:'secondHandrelease',
@@ -277,7 +275,7 @@
 				            secondProductType:null,//
 				            townId:'',//县区地址
 				            address:'',//详细地址
-				            image1:'',//图片
+				            image1:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/secondbg.jpg',//图片
 				            productDetails:'',//商品详细信息
 				            source:1,
 				         },
@@ -294,6 +292,7 @@
 				        vShow_secondBj:false,
 				        resultBj:false,
 				        vShow_detailTalkFlag:false,
+						playid:'',
 			}
 		},
 		methods:{
@@ -423,10 +422,10 @@
 				  this.$util.msg('请填写详细地址',2000);
 					return
 			 }
-				if(this.GoodsImagesList =='https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/secondbg.jpg'){
-					this.$util.msg('请上传图片',2000);
-					return;
-				}
+				// if(this.GoodsImagesList ==''){
+				// 	this.$util.msg('请上传图片',2000);
+				// 	return;
+				// }
 			 if(this.checkbox==false){
 				   this.$util.msg('请勾选已阅读',2000);
 					return
@@ -446,10 +445,43 @@
 			quxiao:function(){
 			 this.vShow_secondBj = false;
 			},
-			gopay:function(){
-				this.$api.navigateTo(`/pages/user/order/order-payment?type=confirm&productID=${this.playid}`)
+			gopay(){
+				this.MiniWxPayFor()
 				this.vShow_secondBj = false;
 			},
+			MiniWxPayFor(){
+				authorize.getCode('weixin').then(wechatcode =>{
+					let params ={
+							code:wechatcode,
+							productId:this.playid
+						}
+					this.PayService.SecondHandPay(params).then(response =>{
+						let PayInfo = JSON.parse(response.data.data.payInfo);
+						this.WxRequestPayment(PayInfo)
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			WxRequestPayment(data){
+				let self = this
+				wx.requestPayment({
+					'timeStamp': data.timeStamp,
+					'nonceStr': data.nonceStr,
+					'package': data.package,
+					'signType': data.signType,
+					'paySign': data.paySign,
+					'success':function(res){
+						wx.reLaunch({url: 'second/pages/product/product-list'});
+					},
+					'fail':function(res){
+						self.$util.msg('用户取消支付~')
+					},
+					'complete':function(res){
+			
+					}
+				})
+			},
 			changeBox:function () {
 				this.checkbox = !this.checkbox;
 			},
@@ -480,9 +512,7 @@
 		.secondradio{display: inline-block;margin-left: 40rpx;}	
 		.Secondary{margin-left: 161rpx;}
 		.secondradio view.active {color: #e15616;}
-		input[type="text"]::placeholder{color: #b2b2b2;}
-		textarea::placeholder{color: #b2b2b2;}
-		input[type="text"]{line-height: 90rpx;overflow: unset;}
+		.placeholder{color: #b2b2b2;}
 		.linqi_text { width: 100%; height: 68rpx;background-color: #1890f9;box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);text-align: center;
 		    line-height: 68rpx;color: #ffffff;margin: auto;font-size:24rpx;position: relative;}
 		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -30%;
@@ -492,7 +522,7 @@
 		.row .spacing.second{width: 70%;}
 		.row{border-bottom: 2rpx solid #e1e1e1;line-height: 90rpx;height: 90rpx;}
 		.row.fenlei{height: auto;margin: 10rpx 0;border: 0}
-		.select {position: relative;color: #9aa5b5;text-align: left;user-select: none;}
+		.select {position: relative;color: #b2b2b2;text-align: left;user-select: none;}
 		.row .spacing{display: inline-block;margin-left: 50rpx;width: 75%;vertical-align:middle;position: relative}
 		.select .placeholder {position: relative;cursor: pointer;width: 100%;display: inline-block;}
 		.icon-xiayibu{right: 0rpx;;color: #b2b2b2;position: absolute}

seller/pages/cart/cart.vue

@@ -13,7 +13,7 @@
 							<view class="shoptitle">
 								<!--选择商店的全部商品 :disabled="isNnder"-->
 								<view class="checkbox-box" @click.stop="checkShop(item)">
-									<view class="checkbox iconfont" :class="[item.checked ?'icon-gouxuanl':'icon-weigouxuan']"></view>
+									<view class="checkbox iconfont" :class="[item.checked ?'icon-yixuanze':'icon-weixuanze']"></view>
 								</view>
 								<view v-if="item.promotions" class="floor-item-act">
 									<view class="floor-tags" @click.stop="clickPopupShow(item,2)">{{item.promotions.name}}</view>	
@@ -25,7 +25,7 @@
 									<view class="goods-pros-t">
 										<!--选择商品-->
 										<view class="checkbox-box" @click.stop="ischeck(item,pros,idx)">
-											<view class="checkbox iconfont" :class="[pros.productsChecked ?'icon-gouxuanl':'icon-weigouxuan']"></view>
+											<view class="checkbox iconfont" :class="[pros.productsChecked ?'icon-yixuanze':'icon-weixuanze']"></view>
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productID)">
 											<image :src="pros.mainImage ? pros.mainImage :''" alt="" />
@@ -88,7 +88,7 @@
 				<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 					<view class="footer-le">
 						<view class="foot-check checkbox-box" @tap.stop="checkAll()">
-							<button class="checkbox iconfont" :class="[isCheckAll?'icon-gouxuan':'icon-weigouxuan']"></button> 
+							<button class="checkbox iconfont" :class="[isCheckAll?'icon-yixuanze':'icon-weixuanze']"></button> 
 							<view class="text">全选</view>
 						</view>
 						<view class="sum">
@@ -780,11 +780,11 @@
 			font-size: $font-size-26;
 			height: 50rpx;
 			line-height: 50rpx;
-			color: $text-color;
+			color: #666666;
 			float: left;
 			padding-left: 10rpx;
 			text{
-				color: $color-system;
+				// color: $color-system;
 				margin: 0 6rpx;
 			}
 		}
@@ -797,8 +797,8 @@
 			line-height: 50rpx;
 			border-radius: 30rpx;
 			background:#FFFFFF;
-			border: 1px solid #C9C9C9;
-			color: #E15616;
+			border: 1px solid #E15616;
+			color: $color-system;
 			float: right;
 			text-align: center;
 			&.none{
@@ -825,6 +825,9 @@
 			background-color:#FFFFFF;
 			font-size: 36rpx;
 			color:$color-system;
+			&.icon-yixuanze{
+				color: #b2b2b2;
+			}
 		}
 		&.disabled{
 			.checkbox{

seller/pages/order/create-order.vue

@@ -47,9 +47,10 @@
 			</view>
 		</view>
 		<!-- 售后条例 -->
-		<seller-regulations ref="regulations"
+		<seller-regulations  ref="regulations"
+							 v-if="isRequest && isDepositFlg&&seconDepositFlg" 
 							:regulaDatas="regulationsData" 
-							@showregulaAlert="handregulaAlertShow">
+							@handleData="claData">
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
 		<!-- 底部 -->
@@ -128,6 +129,8 @@
 				depositIds : [6060,6061,6062,6063,6064,6065,6066,6067,6068,6069],//定金&充值余额商品ID
 				isIphoneX:this.$store.state.isIphoneX,
 				regulationsData:[],
+				clauseId:0,
+				seconDepositFlg:true,
 			}
 		},
 		onLoad(option){//商品数据
@@ -156,6 +159,7 @@
 		methods: {
 			getInitProdcutCrearOrder(option){//二手下单初始化查询
 				this.$api.getStorage().then((resolve) =>{
+					this.seconDepositFlg = false;
 					this.serviceProviderId = resolve.serviceProviderID
 					let params ={clubId:this.clubId,serviceProviderId:this.serviceProviderId,productCount:this.productCount,productId:this.productIds}
 					this.SellerService.GetSettlementBySencondProduct(params).then(response =>{
@@ -248,6 +252,9 @@
 					this.attributePallPrice()
 				}
 			},
+			claData(id){
+				this.clauseId = id;
+			},
 			checkedBalabce(){//勾选使用余额
 				if(this.userMoney > 0){
 					this.ischecked = !this.ischecked
@@ -328,12 +335,13 @@
 				})
 				//订单信息
 				this.payInfo = {
-						clauseId:0,//条款（暂时保留）
 						orderShouldPayFee:this.payAllPrice.toFixed(2),//提交的总价
 						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
 						freight:parseInt(this.freightData.freight).toFixed(2),//邮费
-						freePostFlag:parseInt(this.freightData.freePostFlag)//运费形式
+						freePostFlag:parseInt(this.freightData.freePostFlag),//运费形式
+						clauseId:this.clauseId//售后条款
 					}
+					console.log(this.payInfo)
 				let params = {
 						orderSource:6,				  //提交来源
 						clubUserId:this.clubUserId,   //机构UserID

seller/pages/order/order-details.vue

@@ -17,6 +17,9 @@
 			<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 			<!-- 退款记录 -->
 			<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
+			<view class="clause" @tap.stop="openclauseConten(clauseData.id)">
+				售后条款：<label class="text" :class="clauseData.name=='无条款'?'color-bg':''">{{clauseData.name}}</label>
+			</view>
 			<!-- 底部button -->
 			<order-button ref="orderButton" 
 						  v-if= "isRequest" 
@@ -110,7 +113,8 @@
 				nvabarData: {							 //顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
 					title: '订单详情', // 导航栏 中间的标题
-				}
+				},
+				clauseData:{},
 			}
 		},
 		onLoad(option){
@@ -129,6 +133,9 @@
 			this.initOrderDetaileData()
 		},
 		methods: {
+			openclauseConten(id){
+				this.$api.navigateTo(`/pages/service/sellconten?clauseId=${id}`)
+			},
 			initOrderDetaileData(){//初始化页面数据@参数：订单ID
 				queryOrderDetails({ orderID : this.orderID }).then(response =>{
 					let resData = response.data;
@@ -147,6 +154,7 @@
 					this.receiptAmount = resData.order.receiptAmount
 					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
 					this.ableUserMoney = resData.ableUserMoney
+					this.clauseData = resData.clause
 				}).catch(error =>{
 					this.$util.modal('提示','订单查询失败，请稍后重试~','确定','',false,() =>{
 						this.$api.switchTabTo('/seller/pages/index/index')
@@ -367,5 +375,18 @@
 			}	
 		}
 	}
-	
+	.clause{
+		float: right;
+		font-size: 24rpx;
+		color: #999999;
+		margin-top: 60rpx;
+		margin-right: 24rpx;
+		.text{
+			color: #1890f9;
+			&.color-bg{
+				color: #333333;
+				pointer-events: none;
+			}
+		}
+	}
 </style>

seller/pages/order/order-list.vue

@@ -111,6 +111,21 @@
 		</share-alert>
 		<!-- 透明模态层 -->
 		<modal-layer v-if='isModalLayer'></modal-layer>
+		<view class="aganBj" v-show="showAgan">
+			<view class="alertAgan">
+				<text class="title">{{promptitle}}</text>
+				<view class="goods">
+					<view class="list" v-for="(item,index) in failList"  :key="index">
+						<image class="image-left" :src="item.mainImage"></image>
+						<view class="name-right">{{item.name}}</view>
+					</view>
+				</view>
+				<view class="BtnAll">
+					<view class="closebtn btn" @click="closeBtn">取消</view>
+					<view class="cancel btn" @click="cancelBtn">确定</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -186,6 +201,11 @@
 				pullFlag: true,
 				navbarHeight:'',
 				nomoreText: '上拉显示更多',
+				showAgan:false,
+				failList:[],//失效商品
+				promptitle:'',
+				aganOrderID:0,//再来一单商品id
+				
 			}
 		},
 		onLoad(option) {
@@ -207,6 +227,16 @@
 			},
 		},
 		methods: {
+			closeBtn(){//
+				this.showAgan = false;
+			},
+			cancelBtn(){
+				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,confirmFlag:1}).then(res =>{
+					if(res.code==0){
+						this.$api.navigateTo('/seller/pages/cart/cart');
+					}
+				})
+			},
 			// 滚动切换标签样式
 			onChange (e) {
 				let index = e.target.current || e.detail.current;
@@ -355,8 +385,29 @@
 					case 'confirm':
 						this.handOrderConfirm(data.orderId);
 						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 (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
 					affirmOrder({orderID:id}).then(response =>{
@@ -848,4 +899,80 @@
 			}
 		}
 	}
+	.aganBj {
+	    position: fixed;
+	    left: 0;
+	    top: 0;
+	    bottom: 0;
+	    width: 100%;
+	    height: 100%;
+	    background-color: rgba(0, 0, 0, .5);
+	    z-index: 999999;
+		.alertAgan {
+		    position: absolute;
+		    top: 50%;
+		    left: 50%;
+		    transform: translate(-50%, -50%);
+		    width:580rpx;
+		    background-color: #fff;
+		    border-radius: 16rpx;
+			.title{
+				font-size: 30rpx;
+				color: #333333;
+				line-height: 42rpx;
+				padding: 30rpx;
+				display: block;
+			}
+			.goods{
+				padding: 0 30rpx;
+				.list{
+					padding: 10px 0;
+					border-bottom: 1rpx solid #e1e1e1;
+					margin: 10rpx 0;
+					.image-left{
+						width: 86rpx;
+						height: 86rpx;
+						border: 2rpx solid #e1e1e1;
+						border-radius: 6rpx;
+						display: inline-block;
+						vertical-align: middle;
+					}
+					.name-right{
+						display: inline-block;
+						width: 416rpx;
+						margin-left: 15rpx;
+						font-size: 26rpx;
+						color: #666666;
+						vertical-align: middle;
+						word-break: break-all;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-inline-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+					}
+				}
+			}
+			.BtnAll{
+				margin-top: 30rpx;
+				.btn{
+				 	display: inline-block;
+					width: 290rpx;
+					height: 90rpx;
+					line-height: 90rpx;
+					text-align: center;
+					&.closebtn{
+						border-radius: 0px 0px 0px 10px;
+						color:#999999 ;
+						background: #efefef;
+					}
+					&.cancel{
+						border-radius: 0px 0px 8px 0px;
+						background: $btn-confirm;
+						color: #fff;
+					}
+				}
+			}
+		}
+	}
 </style>

services/index.js

@@ -13,6 +13,7 @@ import ActivityService from './activity.service'
 import OrderService from './order.service'
 import SecondService from './second.service'
 import PublicService from './public.service.js'
+import OtherService from './other.service.js'
 
 let commonService = new CommonService(ajaxService)
 let locateService = new LocateService(ajaxService)
@@ -26,6 +27,7 @@ let activityService = new ActivityService(ajaxService)
 let orderService = new OrderService(ajaxService)
 let secondService = new SecondService(ajaxService)
 let publicService = new PublicService(ajaxService)
+let otherService = new OtherService(ajaxService)
 
 Vue.prototype.AjaxService = ajaxService
 Vue.prototype.CommonService = commonService
@@ -39,4 +41,5 @@ Vue.prototype.SellerService = sellerService
 Vue.prototype.ActivityService = activityService
 Vue.prototype.OrderService = orderService
 Vue.prototype.SecondService = secondService
-Vue.prototype.PublicService = publicService
+Vue.prototype.PublicService = publicService
+Vue.prototype.OtherService = otherService

services/other.service.js

@@ -0,0 +1,15 @@
+/**
+ * 条款服务业务逻辑的服务
+ */
+export default class OtherService {
+	constructor(AjaxService) {
+		Object.assign(this, { AjaxService })
+		this.name = 'OtherService'
+	}
+	/**
+	 * 售后条款
+	 */
+	QuerySaveClause (data) {
+		return this.AjaxService.get({ url:'/seller/clause', data, isLoading: true })
+	}
+}

services/pay.service.js

@@ -33,4 +33,11 @@ export default class PayService {
 	PayOrderPayLink (data = {}) {
 		return this.AjaxService.post({ url:'/PayOrder/payLink', data, isLoading: true })
 	}
+	/**
+	 *@param 二手发布支付
+	 *@param  orderId  主订单ID
+	 */
+	SecondHandPay (data = {}) {
+		return this.AjaxService.post({ url:'/PayOrder/appletsSecondHandPay', data, isLoading: true })
+	} 
 }

services/sellse.service.js

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

supplier/pages/user/information.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="info-from">
 				<view class="label">公司简称</view>
-				<input class="row-input" type="text" v-model="params.sname"placeholder="请输入公司简称" maxlength="10"/>
+				<input class="row-input" type="text" v-model="params.sname" placeholder="请输入公司简称" maxlength="10"/>
 			</view>
 			<view class="info-from">
 				<view class="label">公司地址</view>
@@ -21,7 +21,7 @@
 					 <text class="iconfont icon-xiayibu"></text>
 				</view> 
 			</view>
-			<textarea value="" v-model="addressData.addressDetail"  placeholder="请填写详细地址，如街道/小区/门牌等" maxlength="50" class="address-details"/>
+			<textarea value="" v-model="params.address"  placeholder="请填写详细地址，如街道/小区/门牌等" maxlength="50" class="address-details"/>
 			<view class="info-from">
 				<view class="label">联系人</view>
 				<input class="row-input"  v-model="params.linkMan" type="text" placeholder="请输入联系人姓名" maxlength="6"/>
@@ -291,8 +291,8 @@
 					{value:'13',name:'纤体减肥'}
 				],
 				params:{
-					userID:'',
-					shopID:'',
+					userID:10450,
+					shopID:10087,
 					townID:'',
 					provinceID: '',//省id
 					cityID: '',
@@ -337,10 +337,10 @@
 			}
 		},
 		onLoad() {
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.params.userID = resolve.userID;
-				this.params.shopID = resolve.shopID;
-			})
+			// this.$api.getComStorage('userInfo').then((resolve) =>{
+			// 	this.params.userID = resolve.userID;
+			// 	this.params.shopID = resolve.shopID;
+			// })
 			this.shopInfo();
 		},
 		methods:{
@@ -354,16 +354,16 @@
 			},
 			checkLikes(e,list){
 				let	values = e.detail.value;
-				console.log(values)
 				let arr = []
 				list.forEach(item => {
-					if(values.includes(item.value)){
+					if(values.indexOf(item.value) >= 0){
 						this.$set(item,'checked',true)
 						arr.push(item.name)
 					}else{
 						this.$set(item,'checked',false)
 					}
 				})
+				console.log(arr)
 				return arr.join('/')
 			},
 			setNewMainpro(arr){//回显处理主营内容
@@ -387,10 +387,11 @@
 						this.params.sname = shop.sname;
 						this.params.linkMan = shop.linkMan;
 						this.params.email = user.email;
-						this.addressData.addressDetail = shop.provincialAddress;
-						this.addressData.provinceID = shop.provinceID;
-						this.addressData.cityID = shop.cityID;
-						this.addressData.townID = shop.townID;
+						this.addressData.address =  shop.provincialAddress;
+						this.params.address = shop.address;
+						this.params.provinceID = shop.provinceID;
+						this.params.cityID = shop.cityID;
+						this.params.townID = shop.townID;
 						this.params.contractPhone = shop.contractPhone;
 						this.params.fax = shop.fax;
 						this.params.legalPerson = shop.legalPerson;
@@ -411,15 +412,23 @@
 						this.params.certificateHonor = shop.hygienicLicense;
 						this.HonorImagesList = response.data.certificateHonor;
 						this.productImagesList = response.data.productCertification;
+						if( response.data.certificateHonor!=''|| response.data.certificateHonor!=null){
+							this.params.certificateHonor =this.HonorImagesList.toString()+',';
+						}
+						if( response.data.productCertification!=''|| response.data.productCertification!=null){
+							this.params.productCertification =this.productImagesList.toString()+',';
+						}
 						if(shop.mainpro == "" || shop.mainpro == null){
 							this.mentuzCampList = this.mentuzCampNullList
 						}else{
 							this.mentuzCampList = this.setNewMainpro(shop.mainpro)
+							this.params.mainpro = shop.mainpro
 						}
 						if(shop.businessScope == "" || shop.businessScope == null){
 								this.medicaCampList = this.medicaCampNullList
 						}else{
 							this.medicaCampList = this.setNewMainpro(shop.businessScope)
+							this.params.businessScope = shop.businessScope
 						}
 					}
 				 })
@@ -459,6 +468,12 @@
 						this.$util.msg('请选择公司类型',2000);
 						return
 					}
+				}else if(this.params.mainpro==''){
+					this.$util.msg('请选择主营内容',2000);
+					return
+				}else if(this.params.businessScope==''){
+					this.$util.msg('请选择经营内容',2000);
+					return
 				}else if(this.params.info==''){
 					this.$util.msg('请填写公司介绍',2000);
 					return
@@ -491,7 +506,6 @@
 					return
 				}else{
 					this.ShopService.modifiedData(this.params).then(res=>{
-						 console.log(res)
 						  if(res.code === 0){
 							  this.$util.msg('修改成功',2000,true,'success')
 							  setTimeout(()=>{

supplier/pages/user/setting/password.vue

@@ -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,15 +49,15 @@
 			</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"/>
+					<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>
 			</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"/>
+					<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>
 			</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,15 +87,15 @@
 			</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"/>
+					<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>
 			</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"/>
+					<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>
 			</view>
@@ -482,4 +482,7 @@
 			}
 		}
 	}
+	.placeholder{
+		color: #9aa5b5;
+	}
 </style>

supplier/pages/user/setting/phone.vue

@@ -9,7 +9,7 @@
 			</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,12 +17,12 @@
 			</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>
@@ -307,4 +307,8 @@
 		margin: 30rpx auto;
 		text-align: center
 	}
+	.place-holder{
+		color: #9aa5b5;
+	}
 </style>
+