V6.2.4

common/config/config.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
     URL_CONFIG = 'https://spi.caimei365.com'

components/cm-custom.vue

@@ -23,7 +23,17 @@
 		name:'headerNavbar',
 		props:{
 		    navbarData: { // 由父页面传递的数据
-				type: Object
+				type: Object,
+				default: () =>({
+					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '', // 导航栏 中间的标题
+					haveBack:false,
+					home:false,
+					textLeft:false,
+					bgColor:'',
+					textColor:'#000000'
+				})
 		    }
 		},
 		data() {

components/cm-module/creatOrder/choiceAddress.vue

@@ -93,8 +93,8 @@
 		
 		.address-empty{
 			width: 100%;
-			height: 84rpx;
-			line-height: 84rpx;
+			height: 100rpx;
+			line-height: 100rpx;
 			color: $color-system;
 			text-align: center;
 			font-size: $font-size-26;

components/cm-module/listTemplate/commodityList.vue

@@ -20,6 +20,7 @@
 								</view>
 								<view class="price-larger" v-if="item.price1TextFlag == '2'">
 									<text class="txt">价格仅会员可见</text>
+									<text class="btn" @click.stop="this.$api.navigateTo(`/pages/login/apply?clubStatus=${clubStatus}`)">去升级</text>
 								</view>
 								<text v-if="item.price1TextFlag == '0'">￥<text class="price-larger">{{item.retailPrice?item.retailPrice.toFixed(2):'0.00'}}</text></text>
 							</view>
@@ -84,6 +85,7 @@
 		},
 		data(){
 			return{
+				clubStatus:'',
 				isModallayer:false,
 				windowHeight: '',
 				showSkeleton: true,
@@ -107,6 +109,9 @@
 		},
 		created() {		
 			this.setScrollHeight();		
+			this.$api.getStorage().then((resolve) =>{
+				this.clubStatus = resolve.clubStatus
+			})
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -312,13 +317,28 @@
 		}
 		.list-price {
 			color: #FF2A2A;
+			width: 100%;
 			.price-larger {
+				width: 100%;
 				font-size: 32rpx;
 				.txt{
 					font-size: $font-size-24;
 					display: inline-block;
-					line-height: 30rpx;
+					line-height: 44rpx;
 					text-align: left;
+					float: left;
+				}
+				.btn{
+					width: 112rpx;
+					height: 44rpx;
+					display: inline-block;
+					float: right;
+					background: $btn-confirm;
+					line-height: 44rpx;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: $font-size-24;
+					border-radius: 10rpx;
 				}
 			}
 		}

components/cm-module/listTemplate/productList.vue

@@ -177,10 +177,7 @@
 				this.isModallayer = false;
 			},
 			toCartPage() {
-				uni.setStorageSync('cartPathType',"buyagain");
-				uni.switchTab({
-					url: '/pages/tabBar/cart/cart'
-				})
+				this.$api.navigateTo('/pages/goods/cart/cart')
 			},
 			toIndexPage() {
 				uni.switchTab({

components/cm-module/orderDetails/orderInformation.vue

@@ -3,8 +3,15 @@
 		 <!-- 订单信息 -->
 		 <view class="information-content">
 			<view class="information-view num">
-				<view class="view-num ord">订单编号：{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</view>
-				<view class="view-type bold">{{typeText}}</view>
+				<view class="view-num">
+					<text class="bage-buss">协销</text>
+					<text class="bage-auto">自主</text>
+					<text class="bage-text">订单编号：{{orderData.orderNo =='undefined' ? '' : orderData.orderNo}}</text>
+				</view>
+			</view>
+			<view class="information-view">
+				<view class="view-num time">下单时间：{{orderData.orderTime =='undefined' ? '' : orderData.orderTime}}</view>
+				<view class="view-type">{{typeText}}</view>
 			</view>
 			<view class="information-view">
 				<view class="view-num bold">
@@ -30,10 +37,6 @@
 				<view class="view-num">已支付：￥{{receiptAmount == null ? '0.00' : receiptAmount}}</view>
 				<view class="view-man bold">待付金额：<text class="red">￥{{pendingPayments =='undefined' ? '0.00' : pendingPayments}}</text></view>
 			</view>
-			
-			<view class="information-view">
-				<view class="view-num time">下单时间：{{orderData.orderTime =='undefined' ? '' : orderData.orderTime}}</view>
-			</view>
 		 </view>
 	</view>
 </template>
@@ -158,6 +161,41 @@
 					color: $text-color;
 					text-align: left;
 				}
+				.view-num{
+					.bage-buss{
+						display: block;
+						float: left;
+						width: 64rpx;
+						height: 30rpx;
+						background:linear-gradient(132deg,rgba(255,177,0,1) 0%,rgba(255,127,0,1) 100%);
+						border-radius: 6rpx;
+						line-height: 30rpx;
+						font-size: $font-size-24;
+						text-align: center;
+						color: #FFFFFF;
+						margin-top: 10rpx;
+					}
+					.bage-auto{
+						display: block;
+						float: left;
+						width: 64rpx;
+						height: 30rpx;
+						background:linear-gradient(135deg,rgba(0,216,255,1) 0%,rgba(22,139,225,1) 100%);
+						border-radius: 6rpx;
+						line-height: 30rpx;
+						font-size: $font-size-24;
+						text-align: center;
+						color: #FFFFFF;
+						margin-top: 10rpx;
+					}
+					.bage-text{
+						font-size: $font-size-28;
+						line-height: 40rpx;
+						text-align: left;
+						color: $color-system;
+						margin-left: 15rpx;
+					}
+				}
 				.view-num.ord{
 					color: $color-system;
 					text-align: left;
@@ -166,6 +204,7 @@
 				}
 				.view-num.time{
 					color: #999999;
+					flex: 6;
 				}
 				.bold{
 					font-weight: bold;
@@ -177,7 +216,7 @@
 					float: right;
 					text-align: right;
 					color: #FF2A2A;
-					flex: 2;
+					flex:4;
 				}
 				.clipboard{
 					width: 84rpx;

components/cm-module/productDetails/cm-price.vue

@@ -39,10 +39,8 @@
 				<text>未公开价格</text>
 			</view>
 			<view class="wrap-main-pricenone" v-if="product.price1TextFlag == '2'">
-				<text>价格仅会员可见</text>
-			</view>
-			<view class="wrap-main-none" v-if="product.price1TextFlag == '2'" @click.stop="goUpgradeApply">
-				<text>上传营业执照升级为会员机构即可查看价格 >></text>
+				<text class="wrap-main-text">价格仅会员可见</text>
+				<text class="wrap-main-none" @click.stop="goUpgradeApply">去升级会员查看价格</text>
 			</view>
 			<view class="wrap-main-price" v-if="product.price1TextFlag == '0'">
 				<view class="p-main" v-if="product.ladderPriceFlag == '0' || product.actStatus == 1">

pages.json

@@ -30,8 +30,7 @@
 			"path": "pages/tabBar/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh":true,
-				"navigationStyle":"custom"
+				"enablePullDownRefresh":true
 			}
 		},{
 			"path": "pages/tabBar/user/user",
@@ -72,6 +71,12 @@
 				"navigationBarTitleText": "商品详情",
 				"navigationStyle":"custom"
 			}
+		},{
+			"path": "pages/goods/cart",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"navigationStyle":"custom"
+			}
 		},{
 			"path": "pages/service/aftersale",
 			"style": {

pages/goods/product.vue

@@ -357,9 +357,7 @@
 				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
 					if(wxResponse == 1){
 						if(this.hasLogin){
-							uni.setStorageSync('cartPathType',"product");
-							uni.setStorageSync('cartPathId',this.productID);
-							this.$api.switchTabTo('/pages/tabBar/cart/cart')
+							this.$api.navigateTo('/pages/goods/cart')
 						}else{					
 							this.$api.navigateTo('/pages/login/login?type=1')
 						}
@@ -630,10 +628,23 @@
 				font-size: $font-size-28;
 				font-weight: 600;
 			}
+			.wrap-main-text{
+				display: block;
+				float: left;
+				font-weight: normal;
+			}
 			.wrap-main-none{
+				display: block;
+				width: 256rpx;
+				height: 44rpx;
+				border-radius: 10rpx;
+				background: $btn-confirm;
+				float: right;
 				line-height: 44rpx;
-				color: #3A82FF;
-				font-size: $font-size-28;
+				color: #FFFFFF;
+				text-align: center;
+				font-size: $font-size-24;
+				
 			}
 			.p-active{
 				width: 130rpx;
@@ -769,7 +780,7 @@
 				color: #FFFFFF;
 				text-align: center;
 				border-radius: 20rpx;
-				background:#FFBB77;
+				background:#A69DFE;
 				margin: 0 22rpx 22rpx 0;
 				display: inline-block;
 			}

pages/login/apply.vue

@@ -671,8 +671,8 @@ import { mapMutations } from 'vuex';
 				}
 				.register-from{
 					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
+					height: 88rpx;
+					padding:0 24rpx;
 					background: $sub-bg-color;
 					border-radius: 14rpx;
 					position: relative;
@@ -680,7 +680,7 @@ import { mapMutations } from 'vuex';
 						text-align: left;
 						font-size: $font-size-28;
 						color: #666666;
-						line-height: 40rpx;
+						line-height: 88rpx;
 						float: left;
 					}
 					.row-input{
@@ -688,9 +688,9 @@ import { mapMutations } from 'vuex';
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
-						line-height: 40rpx;
+						line-height: 88rpx;
 						float: left;
-						height: 40rpx;
+						height: 88rpx;
 						&.none{
 							color: #999999;
 						}

pages/login/information.vue

@@ -672,8 +672,8 @@
 				}
 				.register-from{
 					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
+					height: 88rpx;
+					padding:0 24rpx;
 					background: $sub-bg-color;
 					border-radius: 14rpx;
 					position: relative;
@@ -681,7 +681,7 @@
 						text-align: left;
 						font-size: $font-size-28;
 						color: #666666;
-						line-height: 40rpx;
+						line-height: 88rpx;
 						float: left;
 					}
 					.row-input{
@@ -689,9 +689,9 @@
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
-						line-height: 40rpx;
+						line-height: 88rpx;
 						float: left;
-						height: 40rpx;
+						height: 88rpx;
 						&.none{
 							color: #999999;
 						}

pages/login/logincode.vue

@@ -13,35 +13,24 @@
 				   placeholder="请输入邀请码"
 			/>
 		</view>
+		<view class="login-row"><text>免费注册</text></view>
 		<view class="login-btn"  @click="goLogin">登录</view>
+		<view class="login-btn-last" @click.stop="this.$api.navigateTo('/pages/login/login')">账号登录</view>
 	</view>
 </template>
 
 <script>
+	import authorize from '@/common/config/authorize.js'
 	import {mapState,mapMutations } from 'vuex';
-	import authorize from '@/common/config/authorize.js' 
 	import { invitationCodeLogin  } from '@/api/use.js'
 	export default{
 		data() {
 			return{
 				invitationCode:'',  //获取用户登录的邀请码
-				loginType:'',		//跳转类型
-				alertText:'',
-				listType: '',
-				listVal: '',
-				detilType:'',
-				id:''//商品ID
 			}
 		},
 		onLoad(option) {
-			let data = JSON.parse(option.data);
-			this.getOption = data
-			this.loginType = option.type;
-			this.id = option.id
-			if(option.listType) {
-				this.listType = option.listType;
-				this.listVal = option.listVal;
-			}
+
 		},
 		methods:{
 			...mapMutations(['login']),
@@ -68,27 +57,6 @@
 						})
 					}
 				})
-			},
-			goUserLogininit(){
-				let url;
-				if(this.loginType) {
-					if(this.loginType=='detilType'){
-						this.$api.redirectTo(`/pages/goods/product?id=${this.id}&page=2`);
-					}else if(this.loginType=='search'){
-						this.$api.redirectTo('/pages/search/search');
-					}else if(this.loginType == 1){
-						url ='/pages/tabBar/cart/cart'
-					}else if(this.loginType == 4){
-						url ='/pages/tabBar/user/user'
-					}else {
-						url ='/pages/tabBar/home/home'
-					}
-					uni.switchTab({
-						url
-					})
-				} else if(this.listType) {
-					this.$api.navToListPage({type:this.listType,value:this.listVal,lType:'4'});
-				}
 			}
 		}
 	}
@@ -129,7 +97,7 @@
 			height: 40rpx;
 			padding: 24rpx;
 			margin: 0 auto;
-			margin-bottom: 60rpx;
+			margin-bottom: 24rpx;
 			background: #F7F7F7;
 			border-radius: 14rpx;
 			.input{
@@ -142,6 +110,13 @@
 				border-radius: 14rpx;
 			}
 		}
+		.login-row{
+			padding: 0 24rpx;
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #E15616;
+			margin-bottom: 48rpx;
+		}
 		.login-btn{
 			width: 702rpx;
 			height: 88rpx;
@@ -153,6 +128,18 @@
 			text-align: center;
 			background: $btn-confirm;
 		}
+		.login-btn-last{
+			width: 702rpx;
+			height: 86rpx;
+			border-radius: 14rpx;
+			font-size: $font-size-28;
+			line-height: 88rpx;
+			color: $color-system;
+			margin: 0 auto;
+			text-align: center;
+			border: 1px solid $color-system;
+			margin-top: 20rpx;
+		}
 		.model-authorization{
 			width: 100%;
 			height: 100%;

pages/login/register.vue

@@ -45,6 +45,13 @@
 				</view>
 			</view>
 			<view class="register-main clearfix">
+				<view class="register-row login">
+					<view class="row-login" @click.stop="this.$api.navigateTo('/pages/login/login')">账号登录</view>
+					<view class="row-logincode" @click.stop="this.$api.navigateTo('/pages/login/logincode')">邀请码登录</view>
+				</view>
+				<view class="register-row ">
+					<view class="register-btn sub" @click.stop="registerStepsfirst">注册</view>
+				</view>
 				<view class="register-agree">
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
@@ -54,9 +61,6 @@
 						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
 					</view>
 				</view>
-				<view class="register-row ">
-					<view class="register-btn sub" @click.stop="registerStepsfirst">注册</view>
-				</view>
 				<view class="register-consult"  @click.stop="goFastConsult">
 					<text class="iconfont icon-kefunv"></text>
 					<text class="text">入驻咨询</text>
@@ -260,10 +264,10 @@
 
 <script>
 	import { mapState,mapMutations } from 'vuex';
+	import authorize from '@/common/config/authorize.js'
+	import wxLogin from "@/common/config/wxLogin.js"
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import authorize from '@/common/config/authorize.js' 
-	import wxLogin from "@/common/config/wxLogin.js"
 	import { organizationVerifyRegisterFirst,organizationRegister ,organizationLogin } from "@/api/use.js"
 	import { getImageCode, getRegisterMobileCode, uploadFileImage } from "@/api/utils.js"
 	export default{
@@ -660,7 +664,7 @@
 				border-radius: 34rpx 0 0 34rpx;
 				position: absolute;
 				right: 0;
-				top: -100rpx;
+				bottom: 120rpx;
 				text-align: left;
 				line-height: 68rpx;
 				padding-left: 20rpx;
@@ -683,22 +687,22 @@
 				display: flex;
 				flex-direction: column;
 				align-items: center;
-				margin: 150rpx 0 20rpx 0;
+				margin: 200rpx 0 20rpx 0;
 				.agree-text{
 					.checkbox{
 						float: left;
 						margin: 4rpx 6rpx 0 0;
 						color: #999999;
-						font-size: $font-size-32;
+						font-size: $font-size-34;
 						&.icon-gouxuan{
 							color: $color-system;
 						}
 					}
-					font-size: 20rpx;
+					font-size: $font-size-24;
 					line-height: 44rpx;
 					color: #999999;
 					text{
-						color:#0091FF;
+						color:#E36125;
 					}
 				}
 			}
@@ -733,6 +737,9 @@
 				&.none{
 					margin-bottom: 0;
 				}
+				&.login{
+					display: flex;
+				}
 				.register-text{
 					line-height: 44rpx;
 					margin-top: 100rpx;
@@ -760,8 +767,8 @@
 				}
 				.register-from{
 					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
+					height: 88rpx;
+					padding:0 24rpx;
 					background: $sub-bg-color;
 					border-radius: 14rpx;
 					position: relative;
@@ -769,7 +776,7 @@
 						text-align: left;
 						font-size: $font-size-28;
 						color: $text-color;
-						line-height: 40rpx;
+						line-height: 88rpx;
 						float: left;
 					}
 					.row-input{
@@ -777,9 +784,9 @@
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
-						line-height: 40rpx;
+						line-height: 88rpx;
 						float: left;
-						height: 40rpx;
+						height: 88rpx;
 						&.none{
 							color: #999999;
 						}
@@ -998,6 +1005,18 @@
 						}
 					}
 				}
+				.row-login{
+					flex: 1;
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: left;
+				}
+				.row-logincode{
+					flex: 1;
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: right;
+				}
 				.icon-xiayibu{
 					width: 88rpx;
 					height: 88rpx;

pages/tabBar/cart/cart.vue

@@ -1,6 +1,5 @@
 <template>
-	<view class="container cart clearfix" v-if="hasLogin" :style="{paddingTop:CustomBar+'px'}"> 	
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
+	<view class="container cart clearfix" v-if="hasLogin"> 	
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
 		<view class="container-cart-main tui-skeleton">
 			<view v-if="!isEmpty" class="container-cart">
@@ -62,7 +61,7 @@
 					<!--加载loadding-->
 				</scroll-view>
 				<!-- 脚部菜单 -->
-				<view class="footer">
+				<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> 
@@ -120,6 +119,7 @@
 					textLeft:this.$store.state.isIphone,
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
+				isIphoneX:this.$store.state.isIphoneX,
 				pathType:'',
 				pathProductID:'',
 				userID:'',
@@ -575,17 +575,6 @@
 			navToListPage(id){
 				this.isModallayer = true;
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			},
-			hanldNavigateBack(){
-				console.log(this.pathType)
-				switch(this.pathType){
-					case 'product':
-						this.$api.navigateTo(`/pages/goods/product?id=${this.pathProductID}`)
-						break;
-					case 'buyagain':
-						this.$api.navigateTo('/pages/user/regularPurchase/regularPurchase')
-						break;
-				}
 			}
 		},
 		watch:{//深度监听所有数据，每次改变重新计算总价和总数
@@ -621,6 +610,7 @@
 <style lang="scss">
 	page{
 		background: #f7f7f7;
+		height: auto;
 	}
 	.cart-content{
 		position: relative;
@@ -961,7 +951,7 @@
 		}
 		.footer-del{
 			width: 400rpx;
-			height: 100%;
+			height: 110rpx;
 			position: absolute;
 			padding-left: 200rpx;
 			background: #FFFFFF;

pages/tabBar/home/home.vue

@@ -58,14 +58,10 @@
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 				<view class="hotgoods-swiper">
-					<scroll-view class="floor-list" scroll-x>
-						<view class="scoll-wrapper">
-							<view 
-								v-for="(item, index) in organizeProducts" :key="index"
-								class="floor-item"
-								@click.stop="navToDetailPage(item.productID)"
-							>
-								<image class="tui-skeleton-fillet" :src="item.mainImage" mode="aspectFill"></image>
+					<view class="scoll-wrapper clearfix">
+						<view class="floor-item" v-for="(item, index) in organizeProducts" :key="index" @click.stop="navToDetailPage(item.productID)">
+							<image class="tui-skeleton-fillet" :src="item.mainImage" mode="aspectFill"></image>
+							<view class="floor-item-content">
 								<view class="title tui-skeleton-rect">
 									<text class="mclap">{{item.name}}</text>
 								</view>
@@ -76,6 +72,7 @@
 										</view>
 										<view class="title-none" v-show="item.price1TextFlag == '2'">
 											<text class="p big">价格仅会员可见</text>
+											<text class="p btn" @click.stop="this.$api.navigateTo(`/pages/login/apply?clubStatus=${clubStatus}`)">去升级</text>
 										</view>
 										<view class="price tui-skeleton-rect" v-show="item.price1TextFlag == '0'">
 											<text class="p sm">￥</text>
@@ -100,16 +97,16 @@
 								</view>	
 							</view>
 						</view>
-					</scroll-view>
+					</view>
 				</view>	
 			</view>
 			<!-- 底部 -->
 			<view class="footer-section ">
-				<view class="s-header tui-skeleton-fillet">
+				<view class="s-header member  tui-skeleton-fillet">
 					<text class="tip">医美机构正品联盟</text>
 				</view>
 				<view class="f-content tui-skeleton-fillet" @click="navto('/pages/service/member')">
-					<image class="tui-banner" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AEwQlAAjGFdpI2LM357.png" mode=""></image>
+					<image class="tui-banner" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AEwQlAAjGFdpI2LM357.png" mode="scaleToFill"></image>
 				</view>
 				<view class="f-tab-section">
 					<!-- 优选分类 -->
@@ -178,6 +175,7 @@
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				userID:'',
+				clubStatus:'',
 				current:0,
 				mode:'round',
 				modallayer:false,
@@ -226,6 +224,7 @@
 							this.isLogin = true;
 							this.userID = response.data.userID;						
 							this.userIdentity = response.data.userIdentity;						
+							this.clubStatus = response.data.clubStatus;						
 							this.$store.commit('updateStatus',response.data)
 							this.login(response.data);
 							uni.setStorageSync('token',response.data.token)
@@ -262,7 +261,7 @@
 				})
 			},
 			getOrganizeProducts(){//获取模块三商品
-				queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:5}).then(res =>{
+				queryPreferred({userId:this.userID,preferredFlag:100,pageNum:1,pageSize:6}).then(res =>{
 					this.organizeProducts = res.data.results
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -372,7 +371,7 @@
 		height: auto;
 	}	
 	.container-home{
-		
+		background: #FFFFFF;
 	}
 	.swiper-banner-box{
 		width: 100%;
@@ -389,6 +388,7 @@
 		border-radius: 24rpx;
 		overflow: hidden;
 		transform: translateY(0);
+		box-shadow:0px 3px 6px rgba(225,86,22,0.08);
 		.banner-item{
 			border-radius: 24rpx;
 		}
@@ -508,18 +508,19 @@
 		}
 	}
 	.hotgoods-section{
-		padding: 4rpx 0 24rpx 24rpx;
-		background: #fff;
+		background: #FFFFFF;
 		.s-header{
 			display:flex;
 			align-items:center;
 			height: 50rpx;
 			line-height: 50rpx;
+			border-radius: 20rpx 20rpx 0 0;
 			.tip{
 				flex: 4;
 				font-size: 30rpx;
 				color: $text-color;
 				font-weight: bolder;
+				padding-left: 24rpx;
 			}
 			.tit{
 				flex: 4.4;
@@ -539,75 +540,102 @@
 		width: 100%;
 		height: auto;				
 		overflow: hidden;
-		scroll-view{
-			padding: 26rpx 0;
-			width: 100%;
-		}
+		padding-top: 24rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		box-shadow:0px 3px 6px rgba(225,86,22,0.07);
 		.scoll-wrapper{
-			display:flex;
-			align-items: flex-start;
-		}
-		.floor-item{
-			width: 210rpx;
-			padding-right: 24rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-			line-height: 36rpx;
-			border-radius: 10rpx;			
-			image{
-				width: 210rpx;
-				height: 217rpx;
+			width: 702rpx;
+			height: auto;
+			padding:24rpx 24rpx 0 24rpx;
+			background: #F2F2F2;
+			border-radius: 20rpx;
+			.floor-item{
+				width: 341rpx;
+				margin-right: 20rpx;
+				font-size: $font-size-24;
+				color: $text-color;
+				line-height: 36rpx;
 				border-radius: 10rpx;
-			}
-			.title-none{
-				font-size: $font-size-26;
-				color: #FF2A2A;
-				line-height: 60rpx;
-			}
-			.title{
-				width: 210rpx;
-				height: 72rpx;
-				display: flex;
-				flex-direction: column;
-				.mclap{
-					width: 100%;
-					line-height: 36rpx;
-					text-overflow:ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
-					font-size: 26rpx;
+				margin-bottom: 24rpx;
+				background: #FFFFFF;
+				border-radius:10rpx;
+				float: left;
+				&:nth-child(2n){
+					margin-right: 0;
 				}
-			}
-			.no-price{
-				height: 36rpx;
-				line-height: 36rpx;
-				display: flex;
-				margin-top: 8rpx;
-				.p-no{
-					font-size: $font-size-24;
-					color: $color-system;
-					margin-right: 5rpx;
+				image{
+					width: 341rpx;
+					height: 341rpx;
+					border-radius: 20rpx 20rpx 0 0;
 				}
-				.p-stars{
-					margin-top: 3rpx;
+				.floor-item-content{
+					width: 311rpx;
+					padding: 0 15rpx;
 				}
-				image{
-					width:30rpx;
-					height: 36rpx;
+				.title-none{
+					font-size: $font-size-26;
+					color: #FF2A2A;
+					line-height: 80rpx;
+					.btn{
+						display: inline-block;
+						float: right;
+						width: 112rpx;
+						height: 44rpx;
+						background: $btn-confirm;
+						line-height: 44rpx;
+						font-size: $font-size-24;
+						color: #FFFFFF;
+						text-align: center;
+						border-radius: 10rpx;
+						margin-top: 17rpx;
+					}
 				}
-			}
-			.price{
-				color:#FF2A2A;
-				line-height: 20rpx;
-				margin-top: 18rpx;
-				.sm{
-					font-size: $font-size-24;
+				.title{
+					width: 210rpx;
+					height: 72rpx;
+					display: flex;
+					flex-direction: column;
+					.mclap{
+						width: 100%;
+						line-height: 36rpx;
+						text-overflow:ellipsis;
+						display: -webkit-box;
+						word-break: break-all;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+						font-size: 26rpx;
+					}
 				}
-				.big{
-					font-size: $font-size-28;
+				.no-price{
+					height: 36rpx;
+					line-height: 36rpx;
+					display: flex;
+					margin-top: 8rpx;
+					.p-no{
+						font-size: $font-size-24;
+						color: $color-system;
+						margin-right: 5rpx;
+					}
+					.p-stars{
+						margin-top: 3rpx;
+					}
+					image{
+						width:30rpx;
+						height: 36rpx;
+					}
+				}
+				.price{
+					color:#FF2A2A;
+					line-height: 80rpx;
+					.sm{
+						font-size: $font-size-24;
+					}
+					.big{
+						font-size: $font-size-28;
+					}
 				}
 			}
 		}
@@ -615,12 +643,13 @@
 	.footer-section{
 		width: 702rpx;
 		padding: 0  24rpx 30rpx 24rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
 		.s-header{
 			display:flex;
 			align-items:center;
-			height: 40rpx;
-			line-height: 40rpx;
-			margin-bottom: 38rpx;
+			height: 80rpx;
+			line-height: 80rpx;
 			.tip{
 				flex: 1;
 				font-size: 30rpx;

pages/tabBar/user/user.vue

@@ -2,8 +2,8 @@
 	<view class="container user clearfix">
 		<cm-custom :navbar-data='nvabarData'></cm-custom>
 		<view class="user-section">
-			<view class="header" :style="{background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
-				<view class="header-main" :style="{paddingTop:(CustomBar+20)+'px'}" v-if="hasLogin">
+			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
+				<view class="header-main" v-if="hasLogin">
 					<view class="header-text">
 						<view class="user-item"><text class="u-h1">{{name}}</text>
 						<text class="u-viptips" v-if="userIdentity == 2">{{userType}}</text>
@@ -13,10 +13,10 @@
 					</view>
 					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-club@3x.png' : headpic" mode=""></image></view>
 				</view>
-				<view class="header-main-none" :style="{paddingTop:(CustomBar+20)+'px'}" v-else>
+				<view class="header-main-none" v-else>
 					<view class="header-text">
 						<view class="user-item">
-							<text class="u-h1" @click="navigator('/pages/login/login')">账号登录</text><text class="u-h1 line">/</text>
+							<text class="u-h1" @click="navigator('/pages/login/login')">账号登录</text><text class="u-h1 line">|</text>
 							<text class="u-h1" @click="navigatorNex('/pages/login/register')">立即注册</text>
 						</view>
 						<view class="user-item">
@@ -153,6 +153,7 @@
 					bgColor:''
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
+				StatusBar: this.StatusBar,
 				bgImgUrl:'https://img.caimei365.com/group1/M00/03/94/Cmis216Sk_SAPDwvAAcTspdl8h0610.png',
 				name:'',
 				userType:"",
@@ -324,14 +325,13 @@
 	}	
 	.header{
 		width: 100%;
-		height: 440rpx;
 		position: relative;
 		background-size: cover;
 	}	
 	.header-main{
 		width: 702rpx;
-		height: 128rpx;
-		padding: 0 24rpx;
+		height: 130rpx;
+		padding: 24rpx 24rpx;
 		display: flex;
 		.header-text{
 			flex: 8;

pages/user/address/addressManage.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="container clearfix">
 		<view class="add-content">
-			<view class="text-input b-b">
+			<view class="input-row b-b">
 				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="收货人姓名" placeholder-class="placeholder" />
 			</view>
-			<view class="text-input b-b">
+			<view class="input-row b-b">
 				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="手机号码" placeholder-class="placeholder" />
 			</view>
-			<view class="text-input b-b" @click="showMulLinkageThreePicker">
+			<view class="input-row b-b" @click="showMulLinkageThreePicker">
 				<text class="input">
 					{{addressData.allAddress}}
 				</text>		
@@ -201,6 +201,28 @@
 	.add-content{
 		width: 702rpx;
 		padding:0 24rpx;
+		.input-row{
+			display: flex;
+			align-items: center;
+			position: relative;
+			width: 654rpx;
+			height: 88rpx;
+			padding:0 24rpx;
+			margin: 0 auto;
+			background: #F7F7F7;
+			border-radius: 14rpx;
+			.input{
+				width: 100%;
+				height: 100%;
+				background: #F7F7F7;
+				font-size: $font-size-28;
+				line-height: 88rpx;
+				color: #333333;
+			}
+			&.b-b{
+				margin: 32rpx 0;
+			}
+		}
 	}
 	.icon-xiayibu{
 		font-size: 36rpx;

pages/user/order/order-list.vue

@@ -22,10 +22,14 @@
 							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
 								<view class="order-title">
 									<view class="order-title-t">
-										<view class="order-title-num tui-skeleton-fillet">订单号：{{order.orderNo}}</view>
+										<text class="bage-buss tui-skeleton-fillet">协销</text>
+										<text class="bage-auto tui-skeleton-fillet">自主</text>
+										<text class="bage-text tui-skeleton-fillet">订单号：{{order.orderNo}}</text>
+									</view>
+									<view class="order-title-b">
+										<view class="order-title-btxt tui-skeleton-fillet">下单时间：{{order.orderTime}}</view>
 										<view class="order-title-tip tui-skeleton-fillet">{{orderStateExp(order.status)}}</view>
 									</view>
-									<view class="order-title-b">下单时间：{{order.orderTime}}</view>
 								</view>
 								<block v-for="(shop,index) in order.shopOrderList" :key="index">
 									<view class="goods-title">
@@ -538,18 +542,38 @@
 			width: 100%;
 			height: 40rpx;
 			float: left;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			font-weight: bold;
-			.order-title-num{
+			.bage-buss{
+				display: block;
 				float: left;
+				width: 64rpx;
+				height: 30rpx;
+				background:linear-gradient(132deg,rgba(255,177,0,1) 0%,rgba(255,127,0,1) 100%);
+				border-radius: 6rpx;
+				line-height: 30rpx;
+				font-size: $font-size-24;
+				text-align: center;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+			.bage-auto{
+				display: block;
+				float: left;
+				width: 64rpx;
+				height: 30rpx;
+				background:linear-gradient(135deg,rgba(0,216,255,1) 0%,rgba(22,139,225,1) 100%);
+				border-radius: 6rpx;
+				line-height: 30rpx;
+				font-size: $font-size-24;
+				text-align: center;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+			.bage-text{
+				font-size: $font-size-28;
+				line-height: 40rpx;
 				text-align: left;
 				color: $color-system;
-			}
-			.order-title-tip{
-				float: right;
-				text-align: right;
-				color: #FF2A2A;
+				margin-left: 15rpx;
 			}
 		}
 		.order-title-b{
@@ -557,10 +581,20 @@
 			height: 40rpx;
 			float: left;
 			margin-top: 8rpx;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #999999;
-			text-align: left;
+			.order-title-btxt{
+				float: left;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				color: #999999;
+				text-align: lef
+			}
+			.order-title-tip{
+				float: right;
+				font-size: $font-size-28;
+				line-height: 40rpx;
+				text-align: right;
+				color: #FF2A2A;
+			}
 		}
 	}
 	.goods-title{

seller/pages/address/addressManage.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="container clearfix">
 		<view class="add-content">
-			<view class="text-input b-b">
+			<view class="input-row b-b">
 				<input class="input" type="text" v-model="addressData.shouHuoRen" @input="onShouHuoRen" placeholder="收货人姓名" placeholder-class="placeholder" />
 			</view>
-			<view class="text-input b-b">
+			<view class="input-row b-b">
 				<input class="input" type="number" maxlength="11" v-model="addressData.mobile"  @input="onMobile" placeholder="手机号码" placeholder-class="placeholder" />
 			</view>
-			<view class="text-input b-b" @click="showMulLinkageThreePicker">
+			<view class="input-row b-b" @click="showMulLinkageThreePicker">
 				<text class="input">
 					{{addressData.allAddress}}
 				</text>		
@@ -203,6 +203,28 @@
 	.add-content{
 		width: 702rpx;
 		padding:0 24rpx;
+		.input-row{
+			display: flex;
+			align-items: center;
+			position: relative;
+			width: 654rpx;
+			height: 88rpx;
+			padding:0 24rpx;
+			margin: 0 auto;
+			background: #F7F7F7;
+			border-radius: 14rpx;
+			.input{
+				width: 100%;
+				height: 100%;
+				background: #F7F7F7;
+				font-size: $font-size-28;
+				line-height: 88rpx;
+				color: #333333;
+			}
+			&.b-b{
+				margin: 32rpx 0;
+			}
+		}
 	}
 	.icon-xiayibu{
 		font-size: 36rpx;

uni.scss

@@ -29,6 +29,7 @@ $font-size-26:26rpx;
 $font-size-28:28rpx;
 $font-size-30:30rpx;
 $font-size-32:32rpx;
+$font-size-34:34rpx;
 $font-size-36:36rpx;
 $font-size-38:38rpx;
 $font-size-40:40rpx;