test

common/config/config.js

@@ -4,7 +4,7 @@ if(process.env.NODE_ENV === 'development'){
 	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
 	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'

pages/login/information.vue

@@ -7,42 +7,43 @@
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">联系人:</view>
+					<view class="label">联系人</view>
 					<input class="row-input" type="text" v-model="clubContact" placeholder="请输入联系姓名" maxlength="6"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">手机号:</view>
-					<view class="row-input">{{ mobile }}</view>
+				<view class="register-from bordernone">
+					<view class="label">手机号</view>
+					<view class="row-input" placeholder="请输入手机号">{{ mobile }}</view>
 				</view>
 			</view>
 		</view>
-		<view class="register-main clearfix" v-if="userIdentity === 2">
+		<view class="register-main clearfix" >
+			<!-- v-if="userIdentity === 2"  -->
 			<view class="register-row">
 				<view class="register-title">升级信息</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">邮箱:</view>
+					<view class="label">邮箱</view>
 					<input class="row-input" type="text" name="input" v-model="email" placeholder="请输入邮箱地址" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">机构名称:</view>
+					<view class="label">机构名称</view>
 					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">机构简称:</view>
+					<view class="label">机构简称</view>
 					<input class="row-input" type="text" v-model="abbreviation" placeholder="请输入您的机构简称" maxlength="10"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">机构地址:</view>
+					<view class="label">机构地址</view>
 					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
 						{{addressData.address}}
 					</text>		
@@ -50,9 +51,9 @@
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
+				<view class="adddress show" v-if="isShowInput" placeholder-class="placeholder" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
 				<textarea 	v-else
-							class="textarea" 
+							class="adddress" 
 							type="text" 
 							v-model="addressData.addressDetail" 
 							placeholder="详细地址：如道路、门牌号、小区等" 
@@ -66,15 +67,17 @@
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">营业执照编号:</view>
+					<view class="label">营业执照编号</view>
 					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-picture">
-					<view class="label">营业执照:</view>
+					<view class="label">营业执照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadBusinessImage == ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="uploadBusinessImage == ''"  @click="chooseBusinessImage">
+							<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/club-zizhi.png"></image>
+						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
@@ -83,10 +86,14 @@
 						</view>
 					</view>
 				</view>
+			</view>
+			<view class="register-row clearfix">
 				<view class="register-picture">
-					<view class="label">门头照:</view>
+					<view class="label">门头照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage == ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="uploadMentuzImage == ''" @click="chooseMentuzImage">
+							<image src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/club-door.png"></image>
+						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
 							<view class="upload-del" @click="delMentuzImage">
@@ -98,7 +105,7 @@
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from picker">
-					<view class="label">机构类型:</view>
+					<view class="label">机构类型</view>
 					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
@@ -111,17 +118,17 @@
 							<view class="row-text">{{item.name}}</view>
 						</label>
 					</radio-group>
-				</view>
+				</view> 
 			</view>
 			<view class="register-row clearfix" v-show="isDepartment">
 				<view class="register-from">
-					<view class="label">科室:</view>
+					<view class="label">科室</view>
 					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-picture zz">
-					<view class="label zz">医疗执业许可证:</view>
+					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadMedicalImage == ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
 						<view class="upload-image" v-else>
@@ -135,7 +142,7 @@
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from group">
-					<view class="label">主营内容:</view>
+					<view class="label">主营内容</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLike" >
 							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
@@ -166,7 +173,7 @@
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from group">
-					<view class="label">主营内容:</view>
+					<view class="label">主营内容</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
 							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
@@ -208,26 +215,27 @@
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">固定电话:</view>
+					<view class="label">固定电话</view>
 					<input class="row-input" type="text" v-model="clubTelePhone" placeholder="请填写机构的固定电话" maxlength="15"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">传真:</view>
+					<view class="label">传真</view>
 					<input class="row-input" type="text" v-model="clubFax" placeholder="请填写机构的传真" maxlength="15"/>
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
-				<textarea 	class="textarea" 
-							type="text" 
-							v-model="companyPprofile" 
-							placeholder="请填写公司简介，最多500字" 
-							placeholder-class="placeholder"
-							maxlength="500"
-							@input="onTextareaInputInfo"
-							:class="isShowInput ? '':''"
-				/>
+				<view class="label">公司介绍</view>
+					<textarea 	class="textarea" 
+								type="text" 
+								v-model="companyPprofile" 
+								placeholder="请填写公司简介，最多500字" 
+								placeholder-class="placeholder"
+								maxlength="500"
+								@input="onTextareaInputInfo"
+								:class="isShowInput ? '':''"
+					/>
 			</view>
 			<view class="register-fiexd clearfix" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx'}">
 				<view class="register-row">
@@ -642,7 +650,7 @@
 				padding-bottom: 300rpx;
 			}
 			&.first{
-				padding-top: 40rpx;
+				// padding-top: 40rpx;
 			}
 			.register-tips{
 				display: flex;
@@ -657,16 +665,18 @@
 				}
 			}
 			.register-row{
-				width: 702rpx;
+				// width: 702rpx;
 				height: auto;
-				padding: 0 24rpx;
+				// padding: 0 24rpx;
 				margin-bottom: 20rpx;
 				.register-title{
-					line-height: 60rpx;
-					font-size: $font-size-32;
+					line-height: 80rpx;
+					font-size: $font-size-30;
 					color: $text-color;
 					text-align: left;
 					padding-left: 20rpx;
+					background: #f7f7f7;
+					font-weight: bold;
 					.txt{
 						font-size: $font-size-26;
 						font-weight: normal;
@@ -682,12 +692,16 @@
 					color: $color-system;
 				}
 				.register-from{
-					width: 654rpx;
+					width: 702rpx;
 					height: 88rpx;
-					padding:0 24rpx;
-					background: $sub-bg-color;
-					border-radius: 14rpx;
+					margin:0 24rpx;
+					// background: $sub-bg-color;
+					// border-radius: 14rpx;
 					position: relative;
+					border-bottom: 2rpx solid #e1e1e1;
+					&.bordernone{
+						border: none;
+					}
 					.label{
 						text-align: left;
 						font-size: $font-size-28;
@@ -696,12 +710,12 @@
 						float: left;
 					}
 					.row-input{
-						width: 440rpx;
+						width: 520rpx;
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 88rpx;
-						float: left;
+						float: right;
 						height: 88rpx;
 						&.none{
 							color: #999999;
@@ -882,18 +896,33 @@
 					top: 0;
 					line-height: 88rpx;
 					text-align: center;
+					color: #b2b2b2;
 				}
 				&.text-textarea{
 					background: #FFFFFF;
+					margin: 0 24rpx;
+					.label{
+						color: #666666;
+						font-size: $font-size-28;
+						line-height: 88rpx;
+					}
 					.textarea{
 						width: 654rpx;
-						height: 180rpx;
-						background: #F7F7F7;
+						height: 200rpx;
+						// background: #F7F7F7;
 						padding: 24rpx;
 						font-size: $font-size-28;
 						color: $text-color;
 						z-index: 1;
-						border-radius: 14rpx;
+						border-radius: 6rpx;
+						border: 2rpx solid #b2b2b2;
+					}
+					.adddress{
+						height: 147rpx;
+						border-bottom: 2rpx solid #e1e1e1;
+						font-size: $font-size-28;
+						color: $text-color;
+						padding: 24rpx;
 					}
 					.textarea.hide{
 						opacity: 0;
@@ -904,38 +933,44 @@
 				}
 			}
 			.register-picture{
-				height: 102rpx;
+				// height: 102rpx;
 				margin: 30rpx 0;
-				width: 42%;
-				float: left;
+				// width: 42%;
+				// float: left;
 				&.zz{
 					width: 100%;
 				}
 				.label{
-					float: left;
+					// float: left;
 					font-size: $font-size-28;
-					color: $text-color;
+					color: #666666;
 					line-height: 102rpx;
-					width: 150rpx;
-					text-align: right;
+					// width: 150rpx;
+					padding: 0 24rpx;
+					// text-align: left;
 					&.zz{
 						width: 230rpx;
 					}
 				}
 				.upload-picture{
-					float: left;
-					height: 100rpx;
+					// float: left;
+					height: 180rpx;
+					width: 200rpx;
 					.upload-none{
-						width: 100rpx;
-						height: 100rpx;
+						width: 200rpx;
+						height: 180rpx;
 						text-align: center;
 						line-height: 100rpx;
 						color: #999999;
-						border: 1px solid #999999;
+						// border: 1px solid #999999;
 						border-radius: 10rpx;
 						margin: 0 20rpx;
-						.iconfont{
-							font-size: $font-size-28;
+						// .iconfont{
+						// 	font-size: $font-size-28;
+						// }
+						image{
+							width: 100%;
+							height: 100%;
 						}
 					}
 					.upload-image{

pages/user/address/addressManage.vue

@@ -2,13 +2,16 @@
 	<view class="container clearfix">
 		<view class="add-content">
 			<view class="input-row b-b">
-				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="收货人姓名" placeholder-class="placeholder" />
+				<view class="label">收货人</view>
+				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="请输入收货人姓名" placeholder-class="placeholder" />
 			</view>
 			<view class="input-row b-b">
-				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="手机号码" placeholder-class="placeholder" />
+				<view class="label">手机号</view>
+				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="请输入手机号码" placeholder-class="placeholder" />
 			</view>
 			<view class="input-row b-b" @click="showMulLinkageThreePicker">
-				<text class="input">
+				<view class="label address">所在地区</view>
+				<text class="input" :style="addressData.allAddress=='请选择收货地区'?'color:#b2b2b2':''">
 					{{addressData.allAddress}}
 				</text>		
 				<text class="iconfont icon-xiayibu"></text>
@@ -58,7 +61,7 @@
 				switchDefault:false,
 				addressData:{
 					addressID:'',
-					allAddress:'所在地区',
+					allAddress:'请选择收货地区',
 					userID: '',			//用户id ,只在新增收货地址时传
 					shouHuoRen: '',		//收货人
 					mobile:'',			//收货人手机
@@ -196,43 +199,63 @@
 	page{
 		height: auto;
 		background: $bg-color;
-		border-top: 1px solid #EBEBEB;
+		// border-top: 1px solid #EBEBEB;
 	}
+	.placeholder{color: #b2b2b2;}
 	.add-content{
 		width: 702rpx;
 		padding:0 24rpx;
 		.input-row{
-			display: flex;
+			// display: flex;
 			align-items: center;
 			position: relative;
 			width: 654rpx;
 			height: 88rpx;
 			padding:0 24rpx;
 			margin: 0 auto;
-			background: #F7F7F7;
-			border-radius: 14rpx;
+			// background: #F7F7F7;
+			// border-radius: 14rpx;
+			border-bottom: 2rpx solid #e1e1e1;
+
+			.label{
+				// display: inline-block;
+				width:100rpx ;
+				line-height: 88rpx;
+				color: #666666;
+				font-size: $font-size-28;
+				float: left;
+				&.address{
+					width: 120rpx;
+				}
+			}
 			.input{
-				width: 100%;
+				width: 500rpx;
 				height: 100%;
-				background: #F7F7F7;
+				// background: #F7F7F7;
 				font-size: $font-size-28;
 				line-height: 88rpx;
+				display: inline-block;
 				color: #333333;
+				float: right;
 			}
 			&.b-b{
-				margin: 32rpx 0;
+				margin: 20rpx 0;
 			}
 		}
 	}
 	.icon-xiayibu{
 		font-size: 36rpx;
-		color: $text-color;
+		color: #b2b2b2;
+		position: absolute;
+		right: 0;
+		top: 10rpx;
 	}
 	.text-textarea{
 		width: 654rpx;
-		height: 216rpx;
+		height: 147rpx;
 		padding: 24rpx;
-		background: #F7F7F7;
+		// background: #F7F7F7;
+		border-bottom: 2rpx solid #e1e1e1;
 		.textarea{
 			width: 100%;
 			height: 100%;
@@ -262,14 +285,14 @@
 	}
 	.add-btn{
 		width: 702rpx;
-		height: 88rpx;
-		font-size: $font-size-28;
-		line-height: 88rpx;
+		height:90rpx;
+		font-size: $font-size-30;
+		line-height: 90rpx;
 		color: #FFFFFF;
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 14rpx;
+		border-radius: 45rpx;
 		margin-top: 80rpx;
 	}
 	.add-btn.disabled{

seller/pages/order/order-details.vue

@@ -227,6 +227,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,userID:res.data.userId})
 						this.$api.navigateTo('/seller/pages/cart/cart');
 					}
 				}).catch(error =>{

services/ajax.env.js

@@ -4,7 +4,7 @@ if(process.env.NODE_ENV === 'development'){
 	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
     // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'