用户体系优化V1.0.0

App.vue

@@ -28,7 +28,7 @@
 							if(response.code == '1'){
 								let user_key = {code:response.code,openid:response.data.openid,userID:response.data.userID}
 								this.$store.commit('updateStatus',user_key)
-								uni.setStorageSync('cookieKey','JSESSIONID='+response.data.sessionId)
+								// uni.setStorageSync('cookieKey','JSESSIONID='+response.data.sessionId)
 							}else{
 								let user_key = {code:response.code,tel:response.data,userID:'',openid:''}
 								this.$store.commit('updateStatus',user_key)
@@ -47,6 +47,7 @@
 		},
 		onShow: function() {
 			console.log('App Show')
+			uni.setStorageSync('token','token')
 		},
 		onHide: function() {
 			console.log('App Hide')

api/cart.js

@@ -0,0 +1,21 @@
+/**
+ *@des 购物车模块接口
+ *@author zhengjinyi
+ *@date 2020/03/19 14:56:57
+ *@param registerByPass
+ */
+// 获取省市区列表
+const provinceList = "/personalCenter/address";
+// 获取邮箱验证码
+const getEmailCode = "/tiny-shop/v1/common/collect/create";
+// 获取手机验证码
+const getMobileCode = "/tiny-shop/v1/common/collect/delete";
+// 获取图形验证码
+const verificationCode = "/tiny-shop/v1/common/transmit/create";
+
+export {
+    provinceList,
+    getEmailCode,
+    getMobileCode,
+    verificationCode
+};

api/goods.js

@@ -0,0 +1,21 @@
+/**
+ *@des 商品模块接口
+ *@author zhengjinyi
+ *@date 2020/03/19 14:56:57
+ *@param registerByPass
+ */
+// 获取商品分类
+const getCategory = "/personalCenter/address";
+// 商品列表
+const getProducts = "/tiny-shop/v1/common/collect/create";
+// 商品详情
+const getProductDetile = "/tiny-shop/v1/common/collect/delete";
+// 再次购买商品列表
+const againBuy = "/tiny-shop/v1/common/transmit/create";
+
+export {
+    getCategory,
+    getProducts,
+    getProductDetile,
+    againBuy
+};

api/order.js

@@ -0,0 +1,21 @@
+/**
+ *@des 订单模块接口
+ *@author zhengjinyi
+ *@date 2020/03/19 14:56:57
+ *@param registerByPass
+ */
+// 获取省市区列表
+const provinceList = "/personalCenter/address";
+// 获取邮箱验证码
+const getEmailCode = "/tiny-shop/v1/common/collect/create";
+// 获取手机验证码
+const getMobileCode = "/tiny-shop/v1/common/collect/delete";
+// 获取图形验证码
+const verificationCode = "/tiny-shop/v1/common/transmit/create";
+
+export {
+    provinceList,
+    getEmailCode,
+    getMobileCode,
+    verificationCode
+};

api/use.js

@@ -0,0 +1,33 @@
+/**
+ *@des 用户模块接口
+ *@author zhengjinyi
+ *@date 2020/03/19 14:56:57
+ *@param registerByPass
+ */
+// 机构注册
+const provinceList = "/tiny-shop/v1/common/provinces/index";
+// 收藏商品
+const collectCreate = "/tiny-shop/v1/common/collect/create";
+// 删除收藏商品
+const collectDel = "/tiny-shop/v1/common/collect/delete";
+// 分享/转发
+const transmitCreate = "/tiny-shop/v1/common/transmit/create";
+// 广告
+const advList = "/tiny-shop/v1/common/adv/index";
+// 配置
+const configList = "/tiny-shop/v1/common/config/index";
+// 充值
+const payCreate = "/tiny-shop/v1/common/pay/create";
+// 充值
+const wechatConfig = "/tiny-shop/v1/third-party/wechat-js-sdk";
+
+export {
+    provinceList,
+    collectCreate,
+    collectDel,
+    transmitCreate,
+    advList,
+    payCreate,
+    configList,
+    wechatConfig
+};

api/utils.js

@@ -0,0 +1,29 @@
+/**
+ *@des 公共接口
+ *@author zhengjinyi
+ *@date 2020/03/19 14:56:57
+ *@param registerByPass
+ */
+// 获取省市区列表 @param 空
+const provinceList = "/club/address";
+// 获取邮箱验证码 @param email status
+const getEmailCode = "/user/mailbox";
+// 获取手机验证码 @param 空
+const getMobileCode = "/user/activateCodeByReg";
+// 获取图形验证码 @param 空
+const verificationCode = "/user/getImgVerifyCode";
+// 上传图片 @param 空
+const uploadImage = "/tiny-shop/v1/common/transmit/create";
+// 协议接口 @param 空
+const protocol = "/club/protocol";
+
+
+
+export {
+    provinceList,
+    getEmailCode,
+    getMobileCode,
+    verificationCode,
+	uploadImage,
+	protocol
+};

common/config/addressdata.js

@@ -2,15 +2,15 @@
  *请求获取省市区
  *已提供给地区选择picker组件使用
  */ 
-import api from './caimeiApi.js';
-
+import { provinceList } from '@/api/utils.js';
+import api from '@/common/config/caimeiApi.js';
 const provinceData=[];
 const cityData=[];
 const areaData=[];
 
-api.get('/personal/address',{},response =>{
-	let data = response;
-	data.forEach(item => {
+api.get(provinceList,{},response =>{
+	let list = response.data;
+	list.forEach(item => {
 		let xxx = handleCitys(item);
 		provinceData.push(item);
 		cityData.push(xxx.e);
@@ -21,8 +21,8 @@ api.get('/personal/address',{},response =>{
 function handleCitys(data) {
     const x = [];
     const s = [];
-    if (data.citys.length) {
-        data.citys.forEach(item => {
+    if (data.cityList.length) {
+        data.cityList.forEach(item => {
 			let xxx = handleTowns(item);
 			s.push(xxx);
 			x.push(item)
@@ -39,7 +39,7 @@ function handleCitys(data) {
 //获取区后继续处理
 function handleTowns(data) {
     const x = [];
-    data.towns.forEach(item => {
+    data.townList.forEach(item => {
         x.push(item)
     })
     return x;

common/config/caimeiApi.js

@@ -17,6 +17,7 @@ const caimeiApi = {
 			header: {
 				'Accept': 'application/json',
 				'Content-Type': 'application/x-www-form-urlencoded', 
+				'X-Token': uni.getStorageSync('token'),
 				'Cookie': uni.getStorageSync('cookieKey')
 			},
 			method: 'GET',
@@ -47,6 +48,7 @@ const caimeiApi = {
 			header: {
 				'Accept': 'application/json',
 				'Content-Type': 'application/x-www-form-urlencoded', 
+				'X-Token':uni.getStorageSync('token'),
 				'Cookie': uni.getStorageSync('cookieKey')
 			},
 			method: 'GET',
@@ -81,6 +83,7 @@ const caimeiApi = {
 			header: {
 				'Accept': 'application/json',
 				'Content-Type': 'application/json',
+				'X-Token':uni.getStorageSync('token'),
 				'Cookie': uni.getStorageSync('cookieKey')
 			},
 			method: 'POST',

common/config/common.js

@@ -8,9 +8,13 @@ const utils = {
 		//去空格
 		return value.replace(/(^\s*)|(\s*$)/g, "");
 	},
+	isEmail: function(value){
+		//是否为邮箱
+		 return RegExp(/^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/).test(value);
+	},
 	isMobile: function(value) {
 		//是否为手机号
-		return /^(?:13\d|14\d|15\d|16\d|17\d|18\d|19\d)\d{5}(\d{3}|\*{3})$/.test(value);
+		return RegExp(/^(?:13\d|14\d|15\d|16\d|17\d|18\d|19\d)\d{5}(\d{3}|\*{3})$/).test(value);
 	},
 	isFloat: function(value) {
 		//金额，只允许保留两位小数
@@ -87,6 +91,7 @@ module.exports = {
 	isNullOrEmpty: utils.isNullOrEmpty,
 	trim: utils.trim,
 	isMobile: utils.isMobile,
+	isEmail: utils.isEmail,
 	isFloat: utils.isFloat,
 	isNum: utils.isNum,
 	checkPwd: utils.checkPwd,

common/config/config.js

@@ -1,9 +1,9 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.1.22:8107'//本地联调地址
+	URL_CONFIG = 'http://192.168.1.22:8008'//本地联调地址
 	// URL_CONFIG = 'http://192.168.1.24:8107'//俊俊联调地址
-    URL_CONFIG = 'https://mall-b.caimei365.com'//测试地址
+    // URL_CONFIG = 'https://mall-b.caimei365.com'//测试地址
 }else{
     // 生产环境
     URL_CONFIG = 'https://mall.caimei365.com'

common/css/common.scss

@@ -23,7 +23,7 @@ button {
 	padding-left: 0;
 	padding-right: 0;
 	box-sizing: border-box;
-	font-size: $font-size-base;
+	font-size: $font-size-28;
 	text-align: center;
 	text-decoration: none;
 	line-height: 36rpx;
@@ -52,7 +52,7 @@ button::after{
 		width: 100%;
 		height: 100%;
 		background: #F7F7F7;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 40rpx;
 		color: #333333;
 	}
@@ -81,19 +81,19 @@ button::after{
 		margin-top: -120rpx;
 	}
 	.error-text{
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		line-height: 88rpx;
 	}
 	.txt{
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		line-height: 44rpx;
 	}
 	.login-btn{
 		width: 702rpx;
 		height: 88rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		margin: 0 auto;
@@ -140,7 +140,7 @@ button::after{
 			height: 152rpx;
 			padding: 40rpx 26rpx;					
 			.t-h1,.t-p{
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 40rpx;
 				color: #333333;
 				text-align:justify;
@@ -164,7 +164,7 @@ button::after{
 				flex-direction: column;
 				align-items: center;
 				text-align: center;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: #333333;
 			}
 		}
@@ -175,7 +175,7 @@ button::after{
 			.btn{
 				flex: 1;
 				line-height: 88rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				text-align: center;
 				color: #FFFFFF;
 				border-radius: 0;
@@ -194,7 +194,7 @@ button::after{
  *上滑加载更多
  */ 
 .load-more {
-    font-size: $font-size-sm;
+    font-size: $font-size-24;
     color: #666;
     text-align: center;
     width: 100%;
@@ -261,7 +261,7 @@ button::after{
 	justify-content: center;
 	width: 702rpx;
 	height: 88rpx;
-	font-size: $font-size-base;
+	font-size: $font-size-28;
 	line-height: 88rpx;
 	color: #FFFFFF;
 	text-align: center;

components/empty.vue

@@ -72,7 +72,7 @@
 			height: 310rpx;
 		}
 		.error-text{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			line-height: 88rpx;
 		}

components/module/bottomMenu/bottomMenu.vue

@@ -91,7 +91,7 @@
 		line-height: 90rpx;
 		text-align: center;
 		color: #FFFFFF;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		position: fixed;
 		bottom: 110rpx;
 		left: 0;
@@ -117,7 +117,7 @@
 				float: left;
 				flex-direction: column;
 				align-items: center;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: $text-color;
 				line-height: 34rpx;
 				position: relative;
@@ -146,7 +146,7 @@
 					flex-direction: column;
 					align-items: center;
 					box-sizing: border-box;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					text-align: center;
 					text-decoration: none;
 					line-height: 34rpx;
@@ -168,7 +168,7 @@
 				width: 200rpx;
 				line-height: 110rpx;
 				text-align: center;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: #FFFFFF;
 			}
 			.btn-cart{

components/module/creatOrder/choiceAddress.vue

@@ -100,7 +100,7 @@
 			line-height: 84rpx;
 			color: $color-system;
 			text-align: center;
-			font-size: $font-size-sb;
+			font-size: $font-size-26;
 			font-weight: bold;
 			background: #fff;
 			float: left;
@@ -135,7 +135,7 @@
 				height: 42rpx;
 				line-height: 42rpx;
 				text-align: left;
-				font-size: $font-size-se;
+				font-size: $font-size-30;
 				color: $text-color;
 				padding-bottom: 8rpx;
 				display: flex;
@@ -164,7 +164,7 @@
 					padding-left: 10rpx;
 					float: left;
 					line-height: 40rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: left;
 					-o-text-overflow: ellipsis;
@@ -178,13 +178,13 @@
 			}
 			.nexpage{
 				text-align: right;
-				font-size: $font-size-se;
+				font-size: $font-size-30;
 				color: $color-system;
 				position: absolute;
 				right: 0;
 				top: 45rpx;
 				.icon-genghuan{
-					font-size: $font-size-se;
+					font-size: $font-size-30;
 				}
 			}
 		}

components/module/creatOrder/freight.vue

@@ -63,7 +63,7 @@
 			padding: 0 24rpx;
 			height: 86rpx;
 			line-height: 86rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			background: #FFFFFF;
 			float: left;

components/module/creatOrder/goodsList.vue

@@ -117,7 +117,7 @@
 				.title-text{
 					float: left;
 					margin-left: 16rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: left;
 					line-height: 56rpx;
@@ -151,7 +151,7 @@
 				width: 468rpx;
 				height: 100%;
 				line-height: 36rpx;
-				font-size: $font-size-sb;	
+				font-size: $font-size-26;	
 				position: relative;
 				.producttitle{
 					width: 100%;
@@ -176,7 +176,7 @@
 					bottom: 0;
 					.price{
 						line-height: 48rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						width: 48%;
 						color: #FF2A2A;
 						float: left;
@@ -194,7 +194,7 @@
 			.goods-pros-m{
 				height: 76rpx;
 				line-height: 76rpx;
-				font-size: $font-size-sb;
+				font-size: $font-size-26;
 				color: $text-color;
 				margin-top: 12rpx;
 				.m-text{
@@ -220,7 +220,7 @@
 						width: 100%;
 						height: 100%;
 						background: #F7F7F7;
-						font-size: $font-size-sb;
+						font-size: $font-size-26;
 						line-height: 36rpx;
 						color: #333333;
 						min-height: 36rpx;
@@ -231,14 +231,14 @@
 				width:100%;
 				height: auto;
 				.sum{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 60rpx;
 					color: $text-color;
 					display: flex;
 					justify-content: flex-end;
 					.money{
 						color: #FF2A2A;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 					}
 				}
 			}

components/module/creatOrder/invoiceTent.vue

@@ -96,7 +96,7 @@
 			padding: 20rpx 24rpx;
 		}
 		.invoice-title{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
 			line-height: 40rpx;
@@ -104,12 +104,12 @@
 			margin-bottom: 30rpx;
 		}
 		.invoice-empty{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
 			line-height: 40rpx;
 			.txt{
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #999999;
 			}
 		}
@@ -126,7 +126,7 @@
 				width: 100%;
 				height: 40rpx;
 				line-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				.name{
@@ -144,7 +144,7 @@
 					transform: rotate(0deg);
 					transform-origin: center center;
 					float: right;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #000000;
 					/* transition: transform 0.3s ease;*/
 					transition-property: transform;
@@ -162,7 +162,7 @@
 					padding-left: 130rpx;
 					height: auto;
 					line-height: 64rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: left;
 					position: relative;

components/module/home/navInfor.vue

@@ -77,7 +77,7 @@
 		float: left;
 		flex-direction: column;
 		align-items: center;
-		font-size: $font-size-sb;
+		font-size: $font-size-26;
 		color: $text-color;
 		line-height: 36rpx;
 		&:last-child{

components/module/home/navServer.vue

@@ -77,7 +77,7 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		font-size: $font-size-sm;
+		font-size: $font-size-24;
 		color: $text-color;
 		&:last-child{
 			margin-right: 0;

components/module/home/navigationTab.vue

@@ -53,7 +53,7 @@
 		float: left;
 		flex-direction: column;
 		align-items: center;
-		font-size: $font-size-sb;
+		font-size: $font-size-26;
 		color: $text-color;
 		line-height: 36rpx;
 		&:last-child{

components/module/modelAlert/cancelAlert.vue

@@ -82,7 +82,7 @@
 				height: 152rpx;
 				padding: 40rpx 26rpx;					
 				.t-h1,.t-p{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					text-align:justify;
@@ -106,7 +106,7 @@
 					flex-direction: column;
 					align-items: center;
 					text-align: center;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: #333333;
 				}
 			}
@@ -117,7 +117,7 @@
 				.btn{
 					flex: 1;
 					line-height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					text-align: center;
 					color: #FFFFFF;
 					border-radius: 0;

components/module/modelAlert/freightAlert.vue

@@ -82,7 +82,7 @@
 				float: left;
 				.title{
 					line-height: 40rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: center;
 					font-weight: bold;
@@ -90,14 +90,14 @@
 				}
 				.text{
 					line-height: 36rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: justify;
 					margin-top: 22rpx;
 				}
 				.tel{
 					line-height: 36rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: justify;
 					margin-top: 22rpx;
@@ -113,7 +113,7 @@
 				float: left;
 				background: $btn-confirm;
 				line-height: 88rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				text-align: center;
 				color: #FFFFFF;
 				border-radius: 0;

components/module/modelAlert/modelAlert.vue

@@ -82,7 +82,7 @@
 				height: 152rpx;
 				padding: 40rpx 26rpx;					
 				.t-h1,.t-p{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					text-align:justify;
@@ -106,7 +106,7 @@
 					flex-direction: column;
 					align-items: center;
 					text-align: center;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: #333333;
 				}
 			}
@@ -117,7 +117,7 @@
 				.btn{
 					flex: 1;
 					line-height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					text-align: center;
 					color: #FFFFFF;
 					border-radius: 0;

components/module/modelAlert/shareAlert.vue

@@ -104,7 +104,7 @@
 				float: left;
 				.title{
 					line-height: 40rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: center;
 					font-weight: bold;
@@ -112,7 +112,7 @@
 				}
 				.share{
 					line-height: 36rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: justify;
 					margin-top: 22rpx;
@@ -124,7 +124,7 @@
 				}
 				.text{
 					line-height: 36rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: justify;
 					margin-top: 22rpx;
@@ -137,7 +137,7 @@
 				.btn{
 					flex: 1;
 					line-height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					text-align: center;
 					color: #FFFFFF;
 					border-radius: 0;

components/module/orderDetails/goodsList.vue

@@ -103,7 +103,7 @@
 				.title-text{
 					float: left;
 					margin-left: 16rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: left;
 					line-height: 56rpx;
@@ -137,7 +137,7 @@
 				width: 468rpx;
 				height: 100%;
 				line-height: 36rpx;
-				font-size: $font-size-sb;	
+				font-size: $font-size-26;	
 				position: relative;
 				.producttitle{
 					width: 100%;
@@ -162,7 +162,7 @@
 					bottom: 0;
 					.price{
 						line-height: 48rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						width: 48%;
 						color: #FF2A2A;
 						float: left;
@@ -181,7 +181,7 @@
 				width: 100%;
 				height: auto;
 				line-height: 76rpx;
-				font-size: $font-size-sb;
+				font-size: $font-size-26;
 				color: $text-color;
 				float: left;
 				.m-text{
@@ -205,7 +205,7 @@
 					.text{
 						width: 100%;
 						height: 100%;
-						font-size: $font-size-sb;
+						font-size: $font-size-26;
 						line-height: 36rpx;
 						color: #333333;
 					}
@@ -218,21 +218,21 @@
 				float: left;
 				.count{
 					float: left;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: $text-color;
 					display: flex;
 					justify-content: flex-end;
 				}
 				.sum{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: $text-color;
 					display: flex;
 					justify-content: flex-end;
 					.money{
 						color: #FF2A2A;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 					}
 				}
 			}

components/module/orderDetails/invoiceTent.vue

@@ -98,7 +98,7 @@
 			padding: 20rpx 24rpx;
 		}
 		.invoice-title{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
 			line-height: 40rpx;
@@ -106,12 +106,12 @@
 			margin-bottom: 30rpx;
 		}
 		.invoice-empty{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
 			line-height: 40rpx;
 			.txt{
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #999999;
 			}
 		}
@@ -128,7 +128,7 @@
 				width: 100%;
 				height: 40rpx;
 				line-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				.name{
@@ -146,7 +146,7 @@
 					transform: rotate(0deg);
 					transform-origin: center center;
 					float: right;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #000000;
 					/* transition: transform 0.3s ease;*/
 					transition-property: transform;
@@ -165,7 +165,7 @@
 					padding-left: 130rpx;
 					height: auto;
 					line-height: 64rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: left;
 					position: relative;

components/module/orderDetails/logisticsRecord.vue

@@ -92,7 +92,7 @@
 				width: 100%;
 				height: 40rpx;
 				line-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				padding-bottom: 24rpx;
@@ -105,7 +105,7 @@
 					transform: rotate(0deg);
 					transform-origin: center center;
 					float: right;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #000000;
 					/* transition: transform 0.3s ease;*/
 					transition-property: transform;
@@ -122,7 +122,7 @@
 				.table{
 					height: 76rpx;
 					line-height: 76rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: left;
 				}
@@ -134,7 +134,7 @@
 				padding-top: 24rpx;
 				margin-bottom: 14rpx;
 				.main-top,.main-bot{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 40rpx;
 					margin: 4rpx 0;
@@ -143,7 +143,7 @@
 			.logistics-main-bot{
 				width: 100%;
 				height: auto;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: $text-color;
 				line-height: 56rpx;
 				text-align: justify;
@@ -171,7 +171,7 @@
 				height: 36rpx;
 				background: linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
 				text-align: center;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FFFFFF;
 				border-radius: 6rpx;
 				line-height: 36rpx;

components/module/orderDetails/orderAddress.vue

@@ -76,7 +76,7 @@
 			line-height: 84rpx;
 			color: $color-system;
 			text-align: center;
-			font-size: $font-size-sb;
+			font-size: $font-size-26;
 			font-weight: bold;
 			background: #fff;
 			float: left;
@@ -111,7 +111,7 @@
 				height: 42rpx;
 				line-height: 42rpx;
 				text-align: left;
-				font-size: $font-size-se;
+				font-size: $font-size-30;
 				color: $text-color;
 				padding-bottom: 8rpx;
 				display: flex;
@@ -140,7 +140,7 @@
 					padding-left: 10rpx;
 					float: left;
 					line-height: 40rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: left;
 					-o-text-overflow: ellipsis;

components/module/orderDetails/orderButton.vue

@@ -119,7 +119,7 @@
 				color: #2A45FF;
 				text-align: left;
 				position: absolute;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				font-weight: bold;
 				left: 24rpx;
 				top: 24rpx;
@@ -129,7 +129,7 @@
 				height:  64rpx;
 				margin:22rpx;
 				line-height: 64rpx;
-				font-size:$font-size-sb;
+				font-size:$font-size-26;
 				color: #FFFFFF;
 				text-align: center;
 				float: right;
@@ -160,7 +160,7 @@
 					position: absolute;
 					color: #FFFFFF;
 					line-height: 34rpx;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					text-align: left;
 					right: 0;
 					top: -65rpx;

components/module/orderDetails/orderInformation.vue

@@ -121,7 +121,7 @@
 			.information-view{
 				height: 44rpx;
 				line-height: 44rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				margin: 4rpx 0;
 				.view-num{
@@ -155,7 +155,7 @@
 					height: 36rpx;
 					background: linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
 					text-align: center;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: #FFFFFF;
 					border-radius: 6rpx;
 					line-height: 36rpx;

components/module/orderDetails/orderListButton.vue

@@ -117,7 +117,7 @@
 				color: #2A45FF;
 				text-align: left;
 				position: absolute;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				font-weight: bold;
 				left: 24rpx;
 				top: 24rpx;
@@ -127,7 +127,7 @@
 				height:  64rpx;
 				margin:22rpx;
 				line-height: 64rpx;
-				font-size:$font-size-sb;
+				font-size:$font-size-26;
 				color: #FFFFFF;
 				text-align: center;
 				float: right;
@@ -158,7 +158,7 @@
 					position: absolute;
 					color: #FFFFFF;
 					line-height: 34rpx;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					text-align: left;
 					right: 0;
 					top: -65rpx;

components/module/orderDetails/paymentRecord.vue

@@ -73,7 +73,7 @@
 			height: auto;
 			.record-title{
 				width: 100%;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				line-height: 40rpx;
@@ -92,7 +92,7 @@
 				}
 			}
 			.record-empty{
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				line-height: 40rpx;
@@ -106,7 +106,7 @@
 					height: 40rpx;
 					width: 100%;
 					padding: 12rpx 0;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					float: left;
 					.item-time{

components/module/orderDetails/refundRecord.vue

@@ -68,7 +68,7 @@
 			height: auto;
 			.record-title{
 				width: 100%;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				line-height: 40rpx;
@@ -87,7 +87,7 @@
 				}
 			}
 			.record-empty{
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				line-height: 40rpx;
@@ -101,7 +101,7 @@
 					height: 40rpx;
 					width: 100%;
 					padding: 12rpx 0;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					float: left;
 					.item-time{

components/module/orderDetails/transfeRecord.vue

@@ -69,7 +69,7 @@
 				width: 100%;
 				height: 40rpx;
 				line-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				.name{
@@ -80,7 +80,7 @@
 					transform: rotate(0deg);
 					transform-origin: center center;
 					float: right;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #000000;
 					/* transition: transform 0.3s ease;*/
 					transition-property: transform;
@@ -98,7 +98,7 @@
 				.table{
 					height: 76rpx;
 					line-height: 76rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: left;
 				}

components/module/popupGoods/popupGoods.vue

@@ -182,7 +182,7 @@
 				align-items: center;
 				justify-content: center;
 				background-color: #000000;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 			}
 		}
 	}
@@ -260,7 +260,7 @@
 		}
 		.text{
 			line-height: 44rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			.p{
 				color: #FF2A2A;
 			}
@@ -268,7 +268,7 @@
 				margin-left: 30rpx;
 			}
 			.p.sm{
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 			}
 		}
 	}

components/module/productDetails/productDetails.vue

@@ -198,7 +198,7 @@
 		float: left;
 		.p-title{
 			line-height: 40rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			-o-text-overflow: ellipsis;
 			text-overflow: ellipsis;
@@ -217,10 +217,10 @@
 				margin:0 2rpx;
 			}
 			.txt.sm{
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 			}
 			.txt.big{
-				font-size: $font-size-lg;
+				font-size: $font-size-32;
 			}
 		}
 	}
@@ -231,7 +231,7 @@
 		.label-a{
 			padding: 0 18rpx;
 			line-height: 40rpx;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: #FFFFFF;
 			text-align: center;
 			border-radius: 20rpx;
@@ -251,7 +251,7 @@
 			flex: 5;
 		}
 		.info-f{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			line-height: 40rpx;
 			margin-bottom: 24rpx;
@@ -270,14 +270,14 @@
 		width: 100%;
 		height: 96rpx;
 		line-height: 96rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		.iconfont{
 			color: $color-system;
 			margin-left: 16rpx;
 		}
 		.text{
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: $text-color;
 			margin-left: 16rpx;
 		}

components/module/productDetails/supplierDetails.vue

@@ -100,7 +100,7 @@
 		.sup-h1{
 			height: 42rpx;
 			line-height: 42rpx;
-			font-size: $font-size-se;
+			font-size: $font-size-30;
 			color: $text-color;
 			text-align: center;
 			font-weight: bold;
@@ -158,7 +158,7 @@
 				-webkit-line-clamp: 2;
 				overflow: hidden;
 				text-align: left;
-				font-size: $font-size-se;
+				font-size: $font-size-30;
 				color: $text-color;
 				font-weight: bold;
 			}
@@ -177,7 +177,7 @@
 			text-align: left;
 			display: inline-block;						
 			line-height: 40rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			.tit-l{
 				width: 142rpx;
@@ -196,7 +196,7 @@
 					text-align: left;
 					display: inline-block;						
 					line-height: 40rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 				}
 			}
@@ -209,14 +209,14 @@
 					height: 40rpx;
 					line-height: 40rpx;
 					text-align: center;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: $text-color;
 					border-radius: 20rpx;
 					margin-right: 24rpx;
 					margin-bottom: 24rpx;
 				}
 				.tit{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 40rpx;
 				}
@@ -226,7 +226,7 @@
 			padding: 24rpx 0;
 			line-height: 40rpx;
 			text-align: left;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: $text-color;
 			text-indent: 20rpx;
 			&.center{

home.vue

@@ -190,7 +190,8 @@
 								this.userID = response.data.userID;						
 								let user_key = {code:response.code,openid:response.data.openid,userID:response.data.userID}
 								this.$store.commit('updateStatus',user_key)
-								uni.setStorageSync('cookieKey','JSESSIONID='+response.data.sessionId)
+								// uni.setStorageSync('cookieKey','JSESSIONID='+response.data.sessionId)
+								// uni.setStorageSync('X-Token','JSESSIONID='+response.data.sessionId)
 								this.getHomeInformation()
 							}else{
 								this.isLogin = false;
@@ -381,7 +382,7 @@
 			float: left;
 			flex-direction: column;
 			align-items: center;
-			font-size: $font-size-sb;
+			font-size: $font-size-26;
 			color: $text-color;
 			line-height: 36rpx;
 			&:last-child{
@@ -403,7 +404,7 @@
 			float: left;
 			flex-direction: column;
 			align-items: center;
-			font-size: $font-size-sb;
+			font-size: $font-size-26;
 			color: $text-color;
 			line-height: 36rpx;
 			&:last-child{
@@ -479,7 +480,7 @@
 			}
 			.tit{
 				flex: 4.4;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: right;
 			}
@@ -487,7 +488,7 @@
 				flex: 0.6;
 				color: $text-color;
 				text-align: left;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 			}
 		}
 	}	
@@ -506,7 +507,7 @@
 		.floor-item{
 			width: 210rpx;
 			padding-right: 24rpx;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: $text-color;
 			line-height: 36rpx;
 			border-radius: 10rpx;
@@ -538,7 +539,7 @@
 				display: flex;
 				margin-top: 8rpx;
 				.p-no{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: #F8C499;
 					margin-left: 10rpx;
 				}
@@ -552,10 +553,10 @@
 				line-height: 20rpx;
 				margin-top: 18rpx;
 				.sm{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 				.big{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 				}
 			}
 		}
@@ -597,7 +598,7 @@
 				display: flex;
 				flex-direction: column;
 				align-items: center;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: $text-color;
 				&:last-child{
 					margin-right: 0;
@@ -635,7 +636,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: $text-color;
 			line-height: 40rpx;
 		}

json.js

@@ -60,7 +60,1310 @@ const cateList = [
 		{id: 51,pid: 46,name: '上装',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
 		{id: 52,pid: 46,name: '下装',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
 ]
+
+const categoryList =[
+    {
+      "bigTypeID": 1000,
+      "name": "功效性产品",
+      "bigTypeCode": "GXXC",
+      "validFlag": "1",
+      "sortIndex": 100,
+      "seo": null,
+      "displayOnHomePageFlag": null,
+      "smalltypeList": [
+        {
+          "smallTypeID": 1000,
+          "bigTypeID": 1000,
+          "name": "院用产品",
+          "smallTypeCode": "YYCP",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1000,
+              "smallTypeID": 1000,
+              "name": "高端护理",
+              "tinyTypeCode": "GDHL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 2
+            },
+            {
+              "tinyTypeID": 1001,
+              "smallTypeID": 1000,
+              "name": "导入液",
+              "tinyTypeCode": "DRY",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 3
+            },
+            {
+              "tinyTypeID": 1002,
+              "smallTypeID": 1000,
+              "name": "术后护理类",
+              "tinyTypeCode": "SHHL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1001,
+          "bigTypeID": 1000,
+          "name": "客装产品",
+          "smallTypeCode": "KZCP",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1003,
+              "smallTypeID": 1001,
+              "name": "清洁系列",
+              "tinyTypeCode": "QJXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1004,
+              "smallTypeID": 1001,
+              "name": "精油系列",
+              "tinyTypeCode": "JYXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1005,
+              "smallTypeID": 1001,
+              "name": "面膜系列",
+              "tinyTypeCode": "MMXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1006,
+              "smallTypeID": 1001,
+              "name": "补水系列",
+              "tinyTypeCode": "BSXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1007,
+              "smallTypeID": 1001,
+              "name": "美白系列",
+              "tinyTypeCode": "MBXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1008,
+              "smallTypeID": 1001,
+              "name": "控油祛痘",
+              "tinyTypeCode": "KYXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1009,
+              "smallTypeID": 1001,
+              "name": "抗衰系列",
+              "tinyTypeCode": "KSXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1010,
+              "smallTypeID": 1001,
+              "name": "彩妆系列",
+              "tinyTypeCode": "CZXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1011,
+              "smallTypeID": 1001,
+              "name": "套组",
+              "tinyTypeCode": "TZ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1012,
+              "smallTypeID": 1001,
+              "name": "修复系列",
+              "tinyTypeCode": "XFXL",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1002,
+          "bigTypeID": 1000,
+          "name": "院护套盒",
+          "smallTypeCode": "YHTH",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1013,
+              "smallTypeID": 1002,
+              "name": "面部套盒",
+              "tinyTypeCode": "MBTH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1014,
+              "smallTypeID": 1002,
+              "name": "眼部套盒",
+              "tinyTypeCode": "YBTH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1015,
+              "smallTypeID": 1002,
+              "name": "胸部套盒",
+              "tinyTypeCode": "XBTH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1016,
+              "smallTypeID": 1002,
+              "name": "私密套盒",
+              "tinyTypeCode": "SMTH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1017,
+              "smallTypeID": 1002,
+              "name": "身体套盒",
+              "tinyTypeCode": "STTH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1018,
+              "smallTypeID": 1002,
+              "name": "精油套盒",
+              "tinyTypeCode": "JYTH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1019,
+              "smallTypeID": 1002,
+              "name": "艾灸套盒",
+              "tinyTypeCode": "AJTH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1003,
+          "bigTypeID": 1000,
+          "name": "针剂/线材",
+          "smallTypeCode": "ZJXC",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1020,
+              "smallTypeID": 1003,
+              "name": "针剂",
+              "tinyTypeCode": "ZJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1021,
+              "smallTypeID": 1003,
+              "name": "线材",
+              "tinyTypeCode": "XC",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "bigTypeID": 1001,
+      "name": "轻光电",
+      "bigTypeCode": "QGD",
+      "validFlag": "1",
+      "sortIndex": 90,
+      "seo": null,
+      "displayOnHomePageFlag": null,
+      "smalltypeList": [
+        {
+          "smallTypeID": 1004,
+          "bigTypeID": 1001,
+          "name": "面部仪器",
+          "smallTypeCode": "MBYQ",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1022,
+              "smallTypeID": 1004,
+              "name": "皮肤检测(仪)",
+              "tinyTypeCode": "PFJC",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1023,
+              "smallTypeID": 1004,
+              "name": "小气泡清洁仪",
+              "tinyTypeCode": "XQPQ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1024,
+              "smallTypeID": 1004,
+              "name": "水光仪器",
+              "tinyTypeCode": "SGYQ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1025,
+              "smallTypeID": 1004,
+              "name": "导入仪",
+              "tinyTypeCode": "DRY",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1026,
+              "smallTypeID": 1004,
+              "name": "舒敏祛痘",
+              "tinyTypeCode": "SMQD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1027,
+              "smallTypeID": 1004,
+              "name": "家用小仪器",
+              "tinyTypeCode": "JYXY",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1028,
+              "smallTypeID": 1004,
+              "name": "多功能机",
+              "tinyTypeCode": "DGNJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1005,
+          "bigTypeID": 1001,
+          "name": "身体仪器",
+          "smallTypeCode": "STYQ",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1029,
+              "smallTypeID": 1005,
+              "name": "紧致塑形",
+              "tinyTypeCode": "JZSX",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1030,
+              "smallTypeID": 1005,
+              "name": "理疗仪",
+              "tinyTypeCode": "LLY",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "bigTypeID": 1002,
+      "name": "重光电",
+      "bigTypeCode": "ZGD",
+      "validFlag": "1",
+      "sortIndex": 80,
+      "seo": null,
+      "displayOnHomePageFlag": null,
+      "smalltypeList": [
+        {
+          "smallTypeID": 1006,
+          "bigTypeID": 1002,
+          "name": "面部仪器",
+          "smallTypeCode": "MBYQ",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1031,
+              "smallTypeID": 1006,
+              "name": "激光/光子",
+              "tinyTypeCode": "JGGZ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1032,
+              "smallTypeID": 1006,
+              "name": "脸部抗衰",
+              "tinyTypeCode": "LBKS",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1007,
+          "bigTypeID": 1002,
+          "name": "身体仪器",
+          "smallTypeCode": "STYQ",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1033,
+              "smallTypeID": 1007,
+              "name": "减脂/溶脂塑形",
+              "tinyTypeCode": "JZRZ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1034,
+              "smallTypeID": 1007,
+              "name": "脱毛嫩肤",
+              "tinyTypeCode": "TMNF",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1035,
+              "smallTypeID": 1007,
+              "name": "祛妊娠纹",
+              "tinyTypeCode": "QRSW",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1036,
+              "smallTypeID": 1007,
+              "name": "胸部抗衰",
+              "tinyTypeCode": "XBKS",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1037,
+              "smallTypeID": 1007,
+              "name": "私密抗衰",
+              "tinyTypeCode": "SMKS",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "bigTypeID": 1003,
+      "name": "耗材配件",
+      "bigTypeCode": "HCPJ",
+      "validFlag": "1",
+      "sortIndex": 70,
+      "seo": null,
+      "displayOnHomePageFlag": null,
+      "smalltypeList": [
+        {
+          "smallTypeID": 1008,
+          "bigTypeID": 1003,
+          "name": "产品配套",
+          "smallTypeCode": "CPPT",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1038,
+              "smallTypeID": 1008,
+              "name": "水光仪器耗材",
+              "tinyTypeCode": "SGYQ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1039,
+              "smallTypeID": 1008,
+              "name": "小气泡耗材",
+              "tinyTypeCode": "XQPH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1040,
+              "smallTypeID": 1008,
+              "name": "小仪器耗材",
+              "tinyTypeCode": "XYQH",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1009,
+          "bigTypeID": 1003,
+          "name": "配件",
+          "smallTypeCode": "PJ",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1041,
+              "smallTypeID": 1009,
+              "name": "探头",
+              "tinyTypeCode": "TT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1042,
+              "smallTypeID": 1009,
+              "name": "滤玻片",
+              "tinyTypeCode": "LBP",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1043,
+              "smallTypeID": 1009,
+              "name": "手具",
+              "tinyTypeCode": "SJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1010,
+          "bigTypeID": 1003,
+          "name": "凝胶类/膏类",
+          "smallTypeCode": "NJLG",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1044,
+              "smallTypeID": 1010,
+              "name": "麻膏",
+              "tinyTypeCode": "MG",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1045,
+              "smallTypeID": 1010,
+              "name": "耦合剂",
+              "tinyTypeCode": "OHJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1046,
+              "smallTypeID": 1010,
+              "name": "射频凝胶/射频膏",
+              "tinyTypeCode": "SPNJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "bigTypeID": 1004,
+      "name": "会所常用品",
+      "bigTypeCode": "HSCY",
+      "validFlag": "1",
+      "sortIndex": 60,
+      "seo": null,
+      "displayOnHomePageFlag": null,
+      "smalltypeList": [
+        {
+          "smallTypeID": 1011,
+          "bigTypeID": 1004,
+          "name": "常用耗材",
+          "smallTypeCode": "CYHC",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1047,
+              "smallTypeID": 1011,
+              "name": "洁面巾",
+              "tinyTypeCode": "JMJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1048,
+              "smallTypeID": 1011,
+              "name": "化妆棉",
+              "tinyTypeCode": "HZM",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1049,
+              "smallTypeID": 1011,
+              "name": "压缩面膜",
+              "tinyTypeCode": "YSMM",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1050,
+              "smallTypeID": 1011,
+              "name": "内裤",
+              "tinyTypeCode": "NK",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1051,
+              "smallTypeID": 1011,
+              "name": "口罩",
+              "tinyTypeCode": "KZ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1052,
+              "smallTypeID": 1011,
+              "name": "保鲜膜",
+              "tinyTypeCode": "BXM",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1053,
+              "smallTypeID": 1011,
+              "name": "棉签",
+              "tinyTypeCode": "MQ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1054,
+              "smallTypeID": 1011,
+              "name": "浴帽",
+              "tinyTypeCode": "YM",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1055,
+              "smallTypeID": 1011,
+              "name": "床单",
+              "tinyTypeCode": "CD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1056,
+              "smallTypeID": 1011,
+              "name": "手套",
+              "tinyTypeCode": "ST",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1057,
+              "smallTypeID": 1011,
+              "name": "头垫",
+              "tinyTypeCode": "TD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1058,
+              "smallTypeID": 1011,
+              "name": "拖鞋",
+              "tinyTypeCode": "TX",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1059,
+              "smallTypeID": 1011,
+              "name": "美发",
+              "tinyTypeCode": "MF",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1060,
+              "smallTypeID": 1011,
+              "name": "花茶",
+              "tinyTypeCode": "HC",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1061,
+              "smallTypeID": 1011,
+              "name": "其他",
+              "tinyTypeCode": "QT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1012,
+          "bigTypeID": 1004,
+          "name": "泡浴类",
+          "smallTypeCode": "PYL",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1062,
+              "smallTypeID": 1012,
+              "name": "瑶浴包",
+              "tinyTypeCode": "YYB",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1063,
+              "smallTypeID": 1012,
+              "name": "沐足袋",
+              "tinyTypeCode": "MZD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1064,
+              "smallTypeID": 1012,
+              "name": "沐浴袋",
+              "tinyTypeCode": "MYD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1065,
+              "smallTypeID": 1012,
+              "name": "脸盆袋",
+              "tinyTypeCode": "LPD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1066,
+              "smallTypeID": 1012,
+              "name": "擦脚巾",
+              "tinyTypeCode": "CJJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1067,
+              "smallTypeID": 1012,
+              "name": "木桶",
+              "tinyTypeCode": "MT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1068,
+              "smallTypeID": 1012,
+              "name": "桑拿服",
+              "tinyTypeCode": "SNF",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1069,
+              "smallTypeID": 1012,
+              "name": "其他",
+              "tinyTypeCode": "QT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1013,
+          "bigTypeID": 1004,
+          "name": "美容家具",
+          "smallTypeCode": "MRJJ",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1070,
+              "smallTypeID": 1013,
+              "name": "美容椅",
+              "tinyTypeCode": "MRY",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1071,
+              "smallTypeID": 1013,
+              "name": "美容推车",
+              "tinyTypeCode": "MRTC",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1072,
+              "smallTypeID": 1013,
+              "name": "美容床",
+              "tinyTypeCode": "MRC",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1014,
+          "bigTypeID": 1004,
+          "name": "布草类",
+          "smallTypeCode": "BCL",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1073,
+              "smallTypeID": 1014,
+              "name": "美容师服",
+              "tinyTypeCode": "MRSF",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1074,
+              "smallTypeID": 1014,
+              "name": "浴袍",
+              "tinyTypeCode": "YP",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1075,
+              "smallTypeID": 1014,
+              "name": "毛巾",
+              "tinyTypeCode": "MJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1076,
+              "smallTypeID": 1014,
+              "name": "浴巾",
+              "tinyTypeCode": "YJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1077,
+              "smallTypeID": 1014,
+              "name": "方巾",
+              "tinyTypeCode": "FJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1078,
+              "smallTypeID": 1014,
+              "name": "床单",
+              "tinyTypeCode": "CD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1079,
+              "smallTypeID": 1014,
+              "name": "四件套",
+              "tinyTypeCode": "SJT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1015,
+          "bigTypeID": 1004,
+          "name": "理疗养生",
+          "smallTypeCode": "LLYS",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1080,
+              "smallTypeID": 1015,
+              "name": "艾条",
+              "tinyTypeCode": "AT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1081,
+              "smallTypeID": 1015,
+              "name": "艾柱",
+              "tinyTypeCode": "AZ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1082,
+              "smallTypeID": 1015,
+              "name": "理疗工具",
+              "tinyTypeCode": "LLGJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1083,
+              "smallTypeID": 1015,
+              "name": "艾灸仪",
+              "tinyTypeCode": "AJY",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1084,
+              "smallTypeID": 1015,
+              "name": "其他",
+              "tinyTypeCode": "QT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1016,
+          "bigTypeID": 1004,
+          "name": "美容工具",
+          "smallTypeCode": "MRGJ",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1085,
+              "smallTypeID": 1016,
+              "name": "面膜刷",
+              "tinyTypeCode": "MMS",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1086,
+              "smallTypeID": 1016,
+              "name": "面膜碗",
+              "tinyTypeCode": "MMW",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1087,
+              "smallTypeID": 1016,
+              "name": "刮痧板",
+              "tinyTypeCode": "GSB",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1088,
+              "smallTypeID": 1016,
+              "name": "小工具",
+              "tinyTypeCode": "XGJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1017,
+          "bigTypeID": 1004,
+          "name": "美容仪",
+          "smallTypeCode": "MRY",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1089,
+              "smallTypeID": 1017,
+              "name": "冷热喷",
+              "tinyTypeCode": "LRP",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1090,
+              "smallTypeID": 1017,
+              "name": "冷光灯",
+              "tinyTypeCode": "LGD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1091,
+              "smallTypeID": 1017,
+              "name": "超声波",
+              "tinyTypeCode": "CSB",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1092,
+              "smallTypeID": 1017,
+              "name": "其他",
+              "tinyTypeCode": "QT",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "bigTypeID": 1005,
+      "name": "健康管理",
+      "bigTypeCode": "JKGL",
+      "validFlag": "1",
+      "sortIndex": 50,
+      "seo": null,
+      "displayOnHomePageFlag": null,
+      "smalltypeList": [
+        {
+          "smallTypeID": 1018,
+          "bigTypeID": 1005,
+          "name": "设备",
+          "smallTypeCode": "SB",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1093,
+              "smallTypeID": 1018,
+              "name": "肠道运动机",
+              "tinyTypeCode": "CDYD",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            },
+            {
+              "tinyTypeID": 1094,
+              "smallTypeID": 1018,
+              "name": "resolady",
+              "tinyTypeCode": "RESO",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        },
+        {
+          "smallTypeID": 1019,
+          "bigTypeID": 1005,
+          "name": "产品",
+          "smallTypeCode": "CP1",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1095,
+              "smallTypeID": 1019,
+              "name": "益生菌",
+              "tinyTypeCode": "YSJ",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "bigTypeID": 1006,
+      "name": "其它",
+      "bigTypeCode": "QT1",
+      "validFlag": "1",
+      "sortIndex": 50,
+      "seo": null,
+      "displayOnHomePageFlag": null,
+      "smalltypeList": [
+        {
+          "smallTypeID": 1020,
+          "bigTypeID": 1006,
+          "name": "其它",
+          "smallTypeCode": "QT",
+          "validFlag": "1",
+          "sortIndex": 0,
+          "seo": null,
+          "displayOnHomePageFlag": null,
+          "tinytypeList": [
+            {
+              "tinyTypeID": 1096,
+              "smallTypeID": 1020,
+              "name": "其它",
+              "tinyTypeCode": "QT11",
+              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
+              "validFlag": "1",
+              "seo": null,
+              "sortIndex": 0
+            }
+          ]
+        }
+      ]
+    }
+]
 export default{
 	footTavList,
-	cateList
+	cateList,
+	categoryList
 }

pages.json

@@ -1,9 +1,9 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/user/operator/list",
+			"path": "pages/user-module/register",
 			"style": {
-				"navigationBarTitleText": "运营人员管理"
+				"navigationBarTitleText": "注册"
 			}
 		},{
 			"path": "pages/tabBar/home/home",
@@ -11,8 +11,7 @@
 				"navigationBarTitleText": "采美采购商城",
 				"enablePullDownRefresh":true
 			}
-		},
-		{
+		},{
 		    "path" : "pages/tabBar/category/category",
 		    "style" : {
 				"navigationBarTitleText": "分类",
@@ -20,115 +19,112 @@
 					"bounce": "none"
 				}
 			}
-		},
-		{
+		},{
 			"path": "pages/search/search",
 			"style": {
 				"navigationBarTitleText": "搜索"
 			}
-		},
-		{
+		},{
 			"path": "pages/tabBar/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
 				"enablePullDownRefresh":true
 			}
-		},
-		{
+		},{
 			"path": "pages/tabBar/user/user",
 			"style": {
 				"navigationBarTitleText": "我的",
 				"enablePullDownRefresh" : true
 			}
-		},
-		{
+		},{
 			"path": "pages/user/account/account",
 			"style": {
 				"navigationBarTitleText": "账户余额明细",
 				"enablePullDownRefresh" : true
 			}
-		},
-		{
+		},{
 			"path": "pages/user/address/addressManage",
 			"style": {
 				"navigationBarTitleText": "添加新地址"
 			}
-		},
-		{
+		},{
 			"path": "pages/user/address/address",
 			"style": {
 				"navigationBarTitleText": "地址列表"
 			}
-		},
-		{
+		},{
 			"path": "pages/user/about/about",
 			"style": {
 				"navigationBarTitleText": "关于我们"
 			}
-		},
-		{
+		},{
 			"path": "pages/goods/goods",
 			"style": {
 				"navigationBarTitleText": "商品列表"
 			}
-		},
-		{
+		},{
 			"path": "pages/goods/product",
 			"style": {
 				"navigationBarTitleText": "商品详情",
 				"navigationStyle":"custom"
 			}
-		},
-		{
+		},{
 			"path": "pages/user/order/order-cashier",
 			"style": {
 				"navigationBarTitleText": "收银台",
 				"navigationStyle":"custom"
 			}
-		},
-		{
+		},{
 			"path": "pages/service/aftersale",
 			"style": {
 				"navigationBarTitleText": "售后无忧"
 			}
-		},
-		{
+		},{
 			"path": "pages/service/shoppingnotice",
 			"style": {
 				"navigationBarTitleText": "购物须知"
 			}
-		},
-		{
+		},{
 			"path": "pages/service/member",
 			"style": {
 				"navigationBarTitleText": "正品联盟"
 			}
-		}
-        ,{
+		},{
+			"path": "pages/service/organagree",
+			"style": {
+				"navigationBarTitleText": "机构协议"
+			}
+		},{
+			"path": "pages/service/useragree",
+			"style": {
+				"navigationBarTitleText": "用户协议"
+			}
+		},{
+			"path": "pages/service/privacyagree",
+			"style": {
+				"navigationBarTitleText": "隐私权政策"
+			}
+		},{
             "path" : "pages/user/invoice/invoice",
             "style" : {
 				"navigationBarTitleText": "发票信息"
 			}
-        }
-        ,{
+        },{
             "path" : "pages/user/regularPurchase/regularPurchase",
             "style" : {
 				"navigationBarTitleText": "再次购买"
 			}
-        },
-		{
+        },{
 			"path": "pages/user/order/create-order",
 			"style": {
 				"navigationBarTitleText": "确认订单"			
 			}
-		}, 
-		{
+		},{
 			"path": "pages/user/order/orderShareLogin",
 			"style": {
 				"navigationBarTitleText": "订单详情"
 			}
-		},
-		{
+		},{
 			"path": "pages/user/order/myOrder",
 			"style": {
 				"navigationBarTitleText": "我的订单",
@@ -136,8 +132,7 @@
 				"onReachBottomDistance": 50,
 				"navigationStyle":"custom"
 			}
-		},	
-		{
+		},{
 			"path": "pages/user/order/order-list",
 			"style": {
 				"navigationBarTitleText": "我的订单",
@@ -145,27 +140,23 @@
 				// "onReachBottomDistance": 50,
 				"navigationStyle":"custom"
 			}
-		},	
-		{
+		},{
 			"path": "pages/user/order/order-details",
 			"style": {
 				"navigationBarTitleText": "订单详情",
 				"navigationStyle":"custom"
 			}
-		},
-		{
+		},{
 			"path": "pages/user/order/order-sharedetails",
 			"style": {
 				"navigationBarTitleText": "订单详情"
 			}
-		},
-		{
+		},{
 			"path": "pages/user/order/order-logistics",
 			"style": {
 				"navigationBarTitleText": "物流信息"
 			}
-		},
-		{
+		},{
 			"path": "pages/search/search-order",
 			"style": {
 				"navigationBarTitleText": "搜索"
@@ -180,11 +171,6 @@
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
-		},{
-			"path": "pages/user-module/register",
-			"style": {
-				"navigationBarTitleText": "注册"
-			}
 		},{
 			"path": "pages/user-module/password",
 			"style": {
@@ -210,11 +196,21 @@
 			"style": {
 				"navigationBarTitleText": "修改资料"
 			}
+		},{
+			"path": "pages/user/operator/list",
+			"style": {
+				"navigationBarTitleText": "运营人员管理"
+			}
 		},{
 			"path": "pages/user/operator/addoperator",
 			"style": {
 				"navigationBarTitleText": "添加运营人员"
 			}
+		},{
+			"path": "pages/user/operator/bindstep",
+			"style": {
+				"navigationBarTitleText": "运营人员绑定步骤"
+			}
 		},{
 			"path": "pages/user/setting/setting",
 			"style": {

pages/goods/goods.vue

@@ -36,6 +36,7 @@
 		methods:{
 			setServerUrl(option) {
 				let self = this;
+				console.log(option)
 				const {type, from: value} = option;
 				this.lastPageType = type;
 				this.lastPageVal = value;

pages/goods/product.vue

@@ -568,7 +568,7 @@
 			border-bottom: 1px solid #F8F8F8;
 			.p-title{
 				line-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				font-weight: Bold;
 				-o-text-overflow: ellipsis;
@@ -590,10 +590,10 @@
 					margin:0 2rpx;
 				}
 				.txt.sm{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 				.txt.big{
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 				}
 			}
 			.p-minBuy{
@@ -614,7 +614,7 @@
 				height: 44rpx;
 				line-height: 44rpx;
 				color: #F8C499;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 			}
 		}
 		.wrap-ladder{
@@ -679,7 +679,7 @@
 			.label-a{
 				padding: 0 18rpx;
 				line-height: 40rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FFFFFF;
 				text-align: center;
 				border-radius: 20rpx;
@@ -696,7 +696,7 @@
 			.info-viewT{
 				width: 100%;
 				min-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				line-height: 40rpx;
 				text-align: left;
@@ -718,7 +718,7 @@
 			.info-f{
 				width: 50%;
 				float: left;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				line-height: 40rpx;
 				margin-bottom: 24rpx;
@@ -731,16 +731,16 @@
 			width: 100%;
 			height: 72rpx;
 			line-height: 72rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			border-bottom: 1px solid #F8F8F8;
 			.iconfont{
 				color: $color-system;
 				margin-left: 20rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 			}
 			.text{
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: $text-color;
 				margin-left: 10rpx;
 			}
@@ -761,7 +761,7 @@
 				justify-content: center;
 				align-items: center;
 				height: 96rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				position: relative;
 				margin-right: 48rpx;
@@ -796,7 +796,7 @@
 		line-height: 90rpx;
 		text-align: center;
 		color: #FFFFFF;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		position: fixed;
 		bottom: 110rpx;
 		left: 0;
@@ -822,12 +822,12 @@
 				float: left;
 				flex-direction: column;
 				align-items: center;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: $text-color;
 				line-height: 34rpx;
 				position: relative;
 				.animation-num{
-					font-size:$font-size-lg ;
+					font-size:$font-size-32 ;
 					color: #FF2A2A;
 					position: absolute;
 					top: -12rpx;
@@ -865,7 +865,7 @@
 					flex-direction: column;
 					align-items: center;
 					box-sizing: border-box;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					text-align: center;
 					text-decoration: none;
 					line-height: 34rpx;
@@ -887,7 +887,7 @@
 				width: 200rpx;
 				line-height: 110rpx;
 				text-align: center;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: #FFFFFF;
 			}
 			.btn-cart{
@@ -1026,7 +1026,7 @@
 					align-items: center;
 					justify-content: center;
 					background: $btn-confirm;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					border-radius: 14rpx;
 				}
 			}
@@ -1093,14 +1093,14 @@
 				display: flex;
 				.layer-nunbox-text{
 					line-height: 44rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 				}
 				.number-box{
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					.iconfont{
-						font-size: $font-size-lg;
+						font-size: $font-size-32;
 						padding:0 20rpx;
 						font-size: $text-color;
 					}
@@ -1111,7 +1111,7 @@
 						background: #F8F8F8;
 						border-radius: 4rpx;
 						text-align: center;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 					}
 				}
 				.product-step{
@@ -1129,7 +1129,7 @@
 			}
 			.text{
 				line-height: 44rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				.p{
 					color: #FF2A2A;
 				}
@@ -1137,7 +1137,7 @@
 					margin-left: 30rpx;
 				}
 				.p.sm{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 			}
 		}

pages/search/search-order.vue

@@ -698,7 +698,7 @@
 			width: 100%;
 			height: 40rpx;
 			float: left;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 40rpx;
 			font-weight: bold;
 			.order-title-num{
@@ -717,7 +717,7 @@
 			height: 40rpx;
 			float: left;
 			margin-top: 8rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 40rpx;
 			color: #999999;
 			text-align: left;
@@ -740,7 +740,7 @@
 		.title-text{
 			float: left;
 			margin-left: 16rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
 			line-height: 48rpx;
@@ -774,7 +774,7 @@
 		width: 468rpx;
 		height: 100%;
 		line-height: 36rpx;
-		font-size: $font-size-sb;	
+		font-size: $font-size-26;	
 		position: relative;
 		.producttitle{
 			width: 100%;
@@ -799,7 +799,7 @@
 			bottom: 0;
 			.price{
 				line-height: 48rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				width: 48%;
 				color: #FF2A2A;
 				float: left;
@@ -823,7 +823,7 @@
 			width: 100%;
 			height: 34rpx;
 			line-height: 34rpx;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: #999999;
 			text-align: right;
 		}
@@ -832,7 +832,7 @@
 			float: left;
 			height: 48rpx;
 			line-height: 48rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			font-weight: bold;
 			color: $text-color;
 			.count{

pages/service/organagree.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="container clearfix rich-text-temp">
+		<rich-text-template ref="childTemplate"></rich-text-template>
+	</view>
+</template>
+
+<script>
+	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	
+	export default{
+		components: {
+		   richTextTemplate
+		},
+		data() {
+			return{
+				serverUrl: '',
+				type: ''
+			}
+		},
+		onLoad(){
+			this.serverUrl = '/home/afterSale';
+			this.type = 'afterSale';
+			this.initData();
+		},
+		methods:{
+			initData(){
+				let self = this;
+				self.$api.get(self.serverUrl,{organizeID:self.userOrganizeID}, response => {
+					if (response.code == "1") {
+						let _data =response.data,
+							type = self.type;
+						if(type) {
+							let html = self.$api.adaptRichTextImg(_data[type]);
+							self.$refs.childTemplate.html = html;
+						}
+					} else {
+						uni.showToast({icon:'none', title: response.msg, duration: 2000});
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/service/privacyagree.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="container clearfix rich-text-temp">
+		<rich-text-template ref="childTemplate"></rich-text-template>
+	</view>
+</template>
+
+<script>
+	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	
+	export default{
+		components: {
+		   richTextTemplate
+		},
+		data() {
+			return{
+				serverUrl: '',
+				type: ''
+			}
+		},
+		onLoad(){
+			this.serverUrl = '/home/afterSale';
+			this.type = 'afterSale';
+			this.initData();
+		},
+		methods:{
+			initData(){
+				let self = this;
+				self.$api.get(self.serverUrl,{organizeID:self.userOrganizeID}, response => {
+					if (response.code == "1") {
+						let _data =response.data,
+							type = self.type;
+						if(type) {
+							let html = self.$api.adaptRichTextImg(_data[type]);
+							self.$refs.childTemplate.html = html;
+						}
+					} else {
+						uni.showToast({icon:'none', title: response.msg, duration: 2000});
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/service/useragree.vue

@@ -0,0 +1,47 @@
+<template>
+	<view class="container clearfix rich-text-temp">
+		<rich-text-template ref="childTemplate"></rich-text-template>
+	</view>
+</template>
+
+<script>
+	import richTextTemplate from '@/components/module/listTemplate/richTextTemplate'
+	
+	export default{
+		components: {
+		   richTextTemplate
+		},
+		data() {
+			return{
+				serverUrl: '',
+				type: ''
+			}
+		},
+		onLoad(){
+			this.serverUrl = '/home/afterSale';
+			this.type = 'afterSale';
+			this.initData();
+		},
+		methods:{
+			initData(){
+				let self = this;
+				self.$api.get(self.serverUrl,{organizeID:self.userOrganizeID}, response => {
+					if (response.code == "1") {
+						let _data =response.data,
+							type = self.type;
+						if(type) {
+							let html = self.$api.adaptRichTextImg(_data[type]);
+							self.$refs.childTemplate.html = html;
+						}
+					} else {
+						uni.showToast({icon:'none', title: response.msg, duration: 2000});
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/tabBar/cart/cart.vue

@@ -732,7 +732,7 @@
 			}
 		}
 		.text{
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			margin-left: 10rpx;
 		}
 	}
@@ -758,7 +758,7 @@
 			}
 			.text{
 				margin-left: 37rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				font-weight: bold;
@@ -803,17 +803,17 @@
 				display: none;
 			}
 			.sum{
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 40rpx;
 				color: $text-color;
 				display: flex;
 				justify-content: flex-end;
 				.money{
 					color: #FF2A2A;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 				}
 				.money-sign{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: #FF2A2A;
 				}
 			}
@@ -822,7 +822,7 @@
 			width: 386rpx;
 			height: 100%;
 			line-height: 36rpx;
-			font-size: $font-size-sb;	
+			font-size: $font-size-26;	
 			position: relative;
 			.producttitle{
 				width: 100%;
@@ -844,7 +844,7 @@
 					border-radius:18rpx;
 					text-align: center;
 					color: #FFFFFF;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					margin-right: 24rpx;
 				}
 			}
@@ -859,7 +859,7 @@
 				bottom: 0;
 				.price{
 					line-height: 48rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					width: 48%;
 					color: #FF2A2A;
 					float: left;
@@ -867,7 +867,7 @@
 						color: #999999;
 					}
 					.money-sign{
-						font-size: $font-size-sm;
+						font-size: $font-size-24;
 						color: #FF2A2A;
 					}
 				}
@@ -886,7 +886,7 @@
 						justify-content: center;
 						align-items: center;
 						.iconfont{
-							font-size: $font-size-sm;
+							font-size: $font-size-24;
 							padding:0 20rpx;
 							color: $text-color;
 							text-align: center;
@@ -900,7 +900,7 @@
 							background: #F8F8F8;
 							border-radius: 4rpx;
 							text-align: center;
-							font-size: $font-size-sm;
+							font-size: $font-size-24;
 						}
 					}
 					.uni-numbox{
@@ -912,7 +912,7 @@
 							line-height: 40rpx;
 						}
 						.uni-numbox-value {
-							font-size: $font-size-base;
+							font-size: $font-size-28;
 							width: 60rpx;
 						}
 					}
@@ -939,7 +939,7 @@
 				width: 100rpx;
 				float: left;
 				line-height: 110rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				.checkbox{
 					width: 40rpx;
 					text-align: center;
@@ -958,7 +958,7 @@
 					flex-direction: column;
 					align-items: center;
 					box-sizing: border-box;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					text-align: center;
 					text-decoration: none;
 					border-radius: 0;
@@ -978,7 +978,7 @@
 				}
 			}
 			.sum{
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 110rpx;
 				color: $text-color;
 				display: flex;
@@ -987,7 +987,7 @@
 					color: #FF2A2A;
 				}
 				.money-sign{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: #FF2A2A;
 				}
 			}
@@ -1007,7 +1007,7 @@
 			.btn{
 				width: 200rpx;
 				height: 100%;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 110rpx;
 				color: #FFFFFF;
 				display: flex;
@@ -1034,7 +1034,7 @@
 				width: 50%;
 				height: 100%;
 				line-height: 110rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: #FFFFFF;
 				text-align: center;
 				float: left;

pages/tabBar/category/category.vue

@@ -1,186 +1,271 @@
 <template>
-	<view class="content">
-		<scroll-view scroll-y class="left-aside">
-			<view v-for="item in flist" :key="item.id" class="f-item b-b" :class="{active: item.id === currentId}" @click="tabtap(item)">
-				{{item.name}}
-			</view>
-		</scroll-view>
-		<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop">
-			<view v-for="item in slist" :key="item.id" class="s-list" :id="'main-'+item.id">
-				<text class="s-item">{{item.name}}</text>
-				<view class="t-list">
-					<view @click="navToList(item.id, titem.id)" v-if="titem.pid === item.id" class="t-item" v-for="titem in tlist" :key="titem.id">
-						<image :src="titem.picture"></image>
-						<text>{{titem.name}}</text>
+	<view id="category">
+		<!--顶部搜索导航栏-->
+		<view class="'search-input-fixed">
+			<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
+		</view>
+		<view class="category-list">
+			<!-- 左侧分类导航 -->
+			<scroll-view  scroll-y="true" class="left-aside" >
+				<view class="row" v-if="m.smalltypeList.length > 0" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory(index)">
+					<view class="text">
+						{{m.name}}
 					</view>
+					<view class="block"></view>
 				</view>
-			</view>
-		</scroll-view>
+			</scroll-view>
+			<!--右侧子导航-->
+			<scroll-view  scroll-y="true" class="right-aside">
+				<view class="category" v-if="n.smalltypeList.length > 0" v-for="(n,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
+					<view class="category-box" v-for="(o,oIndex) in n.smalltypeList" :key="oIndex">
+						<view class="title">{{o.name}}</view>
+						<view class="list" v-if="o.tinytypeList.length > 0">
+							<view class="box" v-for="(pro,proIndex) in o.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,proIndex)">
+								<image :src="pro.icon"></image>
+								<view class="text">{{pro.name}}</view>
+							</view>
+						</view>
+						<view v-else class="no-data">
+							该栏目暂无分类~
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
 	</view>
 </template>
-
 <script>
-	export default {
+/**
+ * @des 分类
+ * @author zhjy
+ * @date 2020-03-19 11:19
+ */
+import btSearch from '@/components/uni-search/bt-search.vue'
+  export default {
+		components: {
+			btSearch
+		},
 		data() {
 			return {
-				sizeCalcState: false,
-				tabScrollTop: 0,
-				currentId: 1,
-				flist: [],
-				slist: [],
-				tlist: [],
+				headerShow:true,
+				hotSearchText: '你想要的这里都有',
+				showCategoryIndex: 0,
+				//分类列表
+				categoryList: [],
+				search: '',
+				cateTop: {}
 			}
 		},
-		onLoad(){
-			this.loadData();
+		onShow() {
+			this.initData();
 		},
 		methods: {
-			async loadData(){
-				let list = await this.$util.json('cateList');
-				list.forEach(item=>{
-					// console.log('item---->',item)
-					if(!item.pid){
-						this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
-						// console.log('flist---->',this.flist)
-					}else if(!item.picture){
-						this.slist.push(item); //没有图的是2级分类
-						// console.log('slist---->',this.slist)
-					}else{
-						this.tlist.push(item); //3级分类
-						// console.log('tlist---->',this.tlist)
-					}
-				}) 
+			// 跳转至商品列表
+			navToList(id){
+				uni.navigateTo({
+					url: `/pages/product/list?cate_id=${id}`
+				})
 			},
-			//一级分类点击
-			tabtap(item){
-				if(!this.sizeCalcState){
-					this.calcSize();
-				}
-				this.currentId = item.id;
-				// console.log('this.currentId',this.currentId)
-				// console.log('this.id',item.id)
-				// console.log('this.slist',this.slist)
-				
-				let index = this.slist.findIndex(sitem=>sitem.pid === item.id);
-				this.tabScrollTop = this.slist[index].top;
+			// 数据初始化
+			async initData() {
+				this.getProductCate();
 			},
-			//右侧栏滚动
-			asideScroll(e){
-				if(!this.sizeCalcState){
-					this.calcSize();
-				}
-				let scrollTop = e.detail.scrollTop;
-				let tabs = this.slist.filter(item=>item.top <= scrollTop).reverse();
-				if(tabs.length > 0){
-					this.currentId = tabs[0].pid;
+			// 获取商品分类列表
+			async getProductCate () {
+				let list = await this.$util.json('categoryList');
+				this.categoryList = list
+				console.log(this.categoryList)
+				// 查询第一个拥有二级菜单的子菜单
+				for (let i = 0; i < this.categoryList.length; i++) {
+					if (this.categoryList[i].smalltypeList.length > 0) {
+						this.showCategoryIndex = i;
+						break;
+					}
 				}
 			},
-			//计算右侧栏每个tab的高度等信息
-			calcSize(){
-				let h = 0;
-				this.slist.forEach(item=>{
-					let view = uni.createSelectorQuery().select("#main-" + item.id);
-					view.fields({
-						size: true
-					}, data => {
-						item.top = h;
-						h += data.height;
-						item.bottom = h;
-					}).exec();
-				})
-				this.sizeCalcState = true;
+			//分类切换显示
+			showCategory(index){
+				this.showCategoryIndex = index;
 			},
-			navToList(sid, tid){
+			// 跳转至搜索详情页
+			toSearch () {
 				uni.navigateTo({
-					url: `/pages/product/list?fid=${this.currentId}&sid=${sid}&tid=${tid}`
+					url: `/pages/search/search?search=${JSON.stringify(this.search)}`
 				})
-			}
+			},
+			//分类导航跳转
+			navToListPage(pro,index){
+				console.log(index)
+				let self = this;
+				console.log(pro)
+				uni.setStorage({
+					key: 'commodity_id',
+					data: pro.tinyTypeID,
+					success: function () {
+						self.$api.navToListPage({type:'商品分类',value:pro.name,id:pro.tinyTypeID});
+					}
+				})
+			},
+			// 跳至广告图指定页面
+			indexTopToDetailPage(type, url){
+				switch (type) {
+					case 'product_view':
+						url = `/pages/product/product?id=${url}`;
+						break;
+					case 'article_view':
+						this.$api.msg('article_view');
+						break;
+					case 'coupon_view':
+						url = `/pages/coupon/detail?id=${url}`;
+						break;
+					case 'helper_view':
+						this.$api.msg('helper_view');
+						break;
+					case 'product_list_for_cate':
+						url = `/pages/product/list?cate_id=${url}`;
+						break;
+					default:
+						break;
+				}
+				if (url) {
+					uni.navigateTo({
+						url,
+					})
+				}
+			},
 		}
 	}
 </script>
-
-<style lang='scss'>
-	page,
-	.content {
-		height: 100%;
-		background-color: #f8f8f8;
-	}
-
-	.content {
-		display: flex;
-	}
-	.left-aside {
-		flex-shrink: 0;
-		width: 200rpx;
-		height: 100%;
+<style scoped lang="scss">
+	page {
 		background-color: #fff;
 	}
-	.f-item {
-		display: flex;
-		align-items: center;
-		justify-content: center;
+	.search-input-fixed{
 		width: 100%;
-		height: 100rpx;
-		font-size: 28rpx;
-		color: #333333;
-		position: relative;
-		&.active{
-			color:$color-system;
-			background: #f8f8f8;
-			&:before{
-				content: '';
+		height:auto;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1000;
+		background: #FFFFFF;
+		border-bottom: 1px solid #F7F7F7;
+	}		
+	#category {
+		/*模块分类*/
+		.category-list{
+			width: 100%;
+			background-color: #fff;
+			display: flex;
+			
+			.left-aside,.right-aside{
 				position: absolute;
-				left: 0;
-				top: 50%;
-				transform: translateY(-50%);
-				height: 60rpx;
-				width: 8rpx;
-				background-color: $color-system;
-				border-radius: 0 4px 4px 0;
-				opacity: .8;
+				top: 100rpx;
+				/*  #ifdef  APP-PLUS  */
+				top: calc(100rpx + var(--status-bar-height));
+				/*  #endif  */
+				bottom: 0rpx;
+			}
+			.left-aside{
+				width: 200rpx;
+				left: 0rpx;
+				background-color: #f2f2f2;
+				.row{
+					width: 100%;
+					height: 100rpx;
+					display: flex;
+					align-items: center;
+					position: relative;
+					.text{
+						width: 100%;
+						position: relative;
+						font-size: $font-size-28;
+						display: flex;
+						justify-content: center;
+						color: $text-color;
+						/* transition: transform 0.3s ease;*/
+						transition-property: transform;
+						transition-duration: 0.2s;
+						transition-timing-function: ease;
+					}
+					.block{
+						position: absolute;
+						width: 0rpx;
+						left: 0;
+						/* transition: transform 0.3s ease;*/
+						transition-property: transform;
+						transition-duration: 0.2s;
+						transition-timing-function: ease;
+					}
+					&.on{
+						height: 100rpx;
+						background-color: #fff;
+						.text{
+							font-size: $font-size-30;
+							color: $color-system;
+						}
+						.block{
+							width: 10rpx;
+							height: 100rpx;
+							top: 0;
+							background-color: $color-system;
+							border-radius: 0 5rpx 5rpx 0;
+						}
+					}
+				}
+			}
+			.right-aside{
+				width: 550rpx;
+				left: 200rpx;
+				.category{
+					width: calc(100%);
+					padding: 0 15rpx 20rpx 0;
+					background: #F7F7F7;
+					.category-box{
+						background: #FFFFFF;
+						margin-bottom: 20rpx;
+						.title{
+							padding: 0 24rpx;
+							line-height: 80rpx;
+							height: 80rpx;
+							text-align: left;
+							color: $text-color;
+							font-size: $font-size-26;
+							border-bottom: 1px solid #F7F7F7;
+							font-weight: 600;
+						}
+						.list{
+							margin-top: 24rpx;
+							width: 100%;
+							display: flex;
+							flex-wrap: wrap;
+							.box{
+								width: calc(71.44vw / 3);
+								margin-bottom: 40rpx;
+								display: flex;
+								justify-content: center;
+								align-items: center;
+								flex-wrap: wrap;
+								image{
+									width: 140rpx;
+									height: 140rpx;
+								}
+								.text{
+									margin-top: 8rpx;
+									width: 100%;
+									display: flex;
+									justify-content: center;
+									font-size: $font-size-24;
+								}
+							}
+						}
+						.no-data {
+							text-align: center;
+							margin: 30rpx 0;
+							color: $color-system;
+						}
+					}
+				}
 			}
-		}
-	}
-
-	.right-aside{
-		flex: 1;
-		overflow: hidden;
-		padding-left: 20rpx;
-	}
-	.s-item{
-		display: flex;
-		align-items: center;
-		height: 70rpx;
-		padding-top: 8rpx;
-		font-size: 28rpx;
-		color: $text-color;
-	}
-	.t-list{
-		display: flex;
-		flex-wrap: wrap;
-		width: 100%;
-		background: #fff;
-		padding-top: 12rpx;
-		&:after{
-			content: '';
-			flex: 99;
-			height: 0;
-		}
-	}
-	.t-item{
-		flex-shrink: 0;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		flex-direction: column;
-		width: 176rpx;
-		font-size: 26rpx;
-		color: #666;
-		padding-bottom: 20rpx;
-		
-		image{
-			width: 140rpx;
-			height: 140rpx;
 		}
 	}
 </style>

pages/tabBar/home/home.vue

@@ -377,7 +377,7 @@
 			float: left;
 			flex-direction: column;
 			align-items: center;
-			font-size: $font-size-sb;
+			font-size: $font-size-26;
 			color: $text-color;
 			line-height: 36rpx;
 			&:last-child{
@@ -399,7 +399,7 @@
 			float: left;
 			flex-direction: column;
 			align-items: center;
-			font-size: $font-size-sb;
+			font-size: $font-size-26;
 			color: $text-color;
 			line-height: 36rpx;
 			&:last-child{
@@ -475,7 +475,7 @@
 			}
 			.tit{
 				flex: 4.4;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: right;
 			}
@@ -483,7 +483,7 @@
 				flex: 0.6;
 				color: $text-color;
 				text-align: left;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 			}
 		}
 	}	
@@ -502,7 +502,7 @@
 		.floor-item{
 			width: 210rpx;
 			padding-right: 24rpx;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: $text-color;
 			line-height: 36rpx;
 			border-radius: 10rpx;
@@ -534,7 +534,7 @@
 				display: flex;
 				margin-top: 8rpx;
 				.p-no{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: #F8C499;
 					margin-left: 10rpx;
 				}
@@ -548,10 +548,10 @@
 				line-height: 20rpx;
 				margin-top: 18rpx;
 				.sm{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 				.big{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 				}
 			}
 		}
@@ -593,7 +593,7 @@
 				display: flex;
 				flex-direction: column;
 				align-items: center;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: $text-color;
 				&:last-child{
 					margin-right: 0;
@@ -616,7 +616,7 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: $text-color;
 			line-height: 80rpx;
 			padding-top: 20rpx;

pages/tabBar/user/user.vue

@@ -267,7 +267,7 @@
 			margin-bottom: 16rpx;
 			.u-h1{
 				width: 410rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 40rpx;
 				color: #FFFFFF;
 				margin-bottom: 8rpx;
@@ -281,7 +281,7 @@
 				align-items: center;
 			}
 			.u-p{
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				line-height: 40rpx;
 				color: #FFFFFF;
 			}
@@ -308,7 +308,7 @@
 		margin-bottom: 24rpx;
 	}	
 	.tab-title{
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 80rpx;
 		color: #333333;
 		text-align:left;
@@ -351,7 +351,7 @@
 		}
 		.order-t{
 			line-height: 50rpx;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: $text-color;
 		}
 	}
@@ -382,18 +382,18 @@
 		}
 		.cell-more{
 			align-self: baseline;
-			font-size:$font-size-base;
+			font-size:$font-size-28;
 			color:$text-color;
 			margin-left:10rpx;
 		}
 		.cell-tit{
 			flex: 1;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			margin-right:10rpx;
 		}
 		.cell-tip{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 		}
 	}	

pages/user-module/apply.vue

@@ -606,20 +606,20 @@
 					}
 				}
 				.name{
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #FFFFFF;
 					float: left;
 				}
 				.icon{
 					float: right;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #FFFFFF;
 				}
 				.icon-xiangxiajiantou{
 					transform: rotate(0deg);
 					transform-origin: center center;
 					float: right;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #FFFFFF;
 					/* transition: transform 0.3s ease;*/
 					transition-property: transform;
@@ -652,7 +652,7 @@
 					.item{
 						height: auto;
 						line-height: 60rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: #FF0000;
 						.num{
 							margin-right: 10rpx;
@@ -680,11 +680,11 @@
 				flex-direction: column;
 				align-items: center;
 				line-height: 44rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FF0000;
 				margin-bottom: 40rpx;
 				.iconfont{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 			}
 			.register-row{
@@ -694,12 +694,12 @@
 				margin-bottom: 20rpx;
 				.register-title{
 					line-height: 60rpx;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: $text-color;
 					text-align: left;
 					padding-left: 20rpx;
 					.txt{
-						font-size: $font-size-sb;
+						font-size: $font-size-26;
 					}
 				}
 				.row-btn{
@@ -708,7 +708,7 @@
 					top: 0;
 					line-height: 88rpx;
 					text-align: center;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $color-system;
 				}
 				.register-from{
@@ -720,7 +720,7 @@
 					position: relative;
 					.label{
 						text-align: left;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: #666666;
 						line-height: 40rpx;
 						float: left;
@@ -728,7 +728,7 @@
 					.row-input{
 						width: 440rpx;
 						padding-left:10rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 40rpx;
 						float: left;
@@ -845,7 +845,7 @@
 							padding: 24rpx;
 							text-align: left;
 							border-radius: 10rpx;
-							font-size: $font-size-base;
+							font-size: $font-size-28;
 							color: $text-color;
 						}
 						.confirm-btn{
@@ -865,7 +865,7 @@
 						.item {
 						  width: 156rpx;
 						  height: 60rpx;
-						  font-size:$font-size-base;
+						  font-size:$font-size-28;
 						  line-height: 60rpx;
 						  border-radius:10rpx;
 						  margin-bottom: 20rpx;
@@ -898,7 +898,7 @@
 						height: 180rpx;
 						background: #F7F7F7;
 						padding: 24rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						z-index: 1;
 						border-radius: 14rpx;
@@ -916,7 +916,7 @@
 				margin: 40rpx 0 0 0;
 				.label{
 					float: left;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 102rpx;
 					width: 150rpx;
@@ -938,7 +938,7 @@
 						border-radius: 10rpx;
 						margin: 0 20rpx;
 						.iconfont{
-							font-size: $font-size-base;
+							font-size: $font-size-28;
 						}
 					}
 					.upload-image{
@@ -961,7 +961,7 @@
 							line-height: 40rpx;
 							text-align: center;
 							.iconfont{
-								font-size: $font-size-lg;
+								font-size: $font-size-32;
 								color: #999999;
 							}
 						}
@@ -980,7 +980,7 @@
 					width: 100%;
 					height: 100%;
 					background: #F7F7F7;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					border-radius: 14rpx;
@@ -1005,7 +1005,7 @@
 							float: left;
 							margin: 4rpx 6rpx 0 0;
 							color: #999999;
-							font-size: $font-size-lg;
+							font-size: $font-size-32;
 							&.icon-gouxuan{
 								color: $color-system;
 							}
@@ -1023,7 +1023,7 @@
 				width: 702rpx;
 				height: 88rpx;
 				border-radius: 14rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;
 				margin: 0 auto;

pages/user-module/bindemail.vue

@@ -210,7 +210,7 @@
 					width: 100%;
 					height: 100%;
 					background: #F7F7F7;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					border-radius: 14rpx;
@@ -221,7 +221,7 @@
 			width: 702rpx;
 			height: 88rpx;
 			border-radius: 14rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
@@ -255,7 +255,7 @@
 					margin: auto;
 					width: 70%;
 					height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 88rpx;
 					color: #FFFFFF;
 					text-align: center;

pages/user-module/bindwechat.vue

@@ -279,7 +279,7 @@
 					width: 100%;
 					height: 100%;
 					background: #F7F7F7;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					border-radius: 14rpx;
@@ -290,7 +290,7 @@
 			width: 702rpx;
 			height: 88rpx;
 			border-radius: 14rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
@@ -324,7 +324,7 @@
 					margin: auto;
 					width: 70%;
 					height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 88rpx;
 					color: #FFFFFF;
 					text-align: center;

pages/user-module/information.vue

@@ -632,11 +632,11 @@
 				flex-direction: column;
 				align-items: center;
 				line-height: 44rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FF0000;
 				margin-bottom: 40rpx;
 				.iconfont{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 			}
 			.register-row{
@@ -646,12 +646,12 @@
 				margin-bottom: 20rpx;
 				.register-title{
 					line-height: 60rpx;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: $text-color;
 					text-align: left;
 					padding-left: 20rpx;
 					.txt{
-						font-size: $font-size-sb;
+						font-size: $font-size-26;
 						font-weight: normal;
 					}
 				}
@@ -661,7 +661,7 @@
 					top: 0;
 					line-height: 88rpx;
 					text-align: center;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $color-system;
 				}
 				.register-from{
@@ -673,7 +673,7 @@
 					position: relative;
 					.label{
 						text-align: left;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: #666666;
 						line-height: 40rpx;
 						float: left;
@@ -681,7 +681,7 @@
 					.row-input{
 						width: 440rpx;
 						padding-left:10rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 40rpx;
 						float: left;
@@ -798,7 +798,7 @@
 							padding: 24rpx;
 							text-align: left;
 							border-radius: 10rpx;
-							font-size: $font-size-base;
+							font-size: $font-size-28;
 							color: $text-color;
 						}
 						.confirm-btn{
@@ -818,7 +818,7 @@
 						.item {
 						  width: 156rpx;
 						  height: 60rpx;
-						  font-size:$font-size-base;
+						  font-size:$font-size-28;
 						  line-height: 60rpx;
 						  border-radius:10rpx;
 						  margin-bottom: 20rpx;
@@ -851,7 +851,7 @@
 						height: 180rpx;
 						background: #F7F7F7;
 						padding: 24rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						z-index: 1;
 						border-radius: 14rpx;
@@ -869,7 +869,7 @@
 				margin: 40rpx 0 0 0;
 				.label{
 					float: left;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 102rpx;
 					width: 150rpx;
@@ -891,7 +891,7 @@
 						border-radius: 10rpx;
 						margin: 0 20rpx;
 						.iconfont{
-							font-size: $font-size-base;
+							font-size: $font-size-28;
 						}
 					}
 					.upload-image{
@@ -914,7 +914,7 @@
 							line-height: 40rpx;
 							text-align: center;
 							.iconfont{
-								font-size: $font-size-lg;
+								font-size: $font-size-32;
 								color: #999999;
 							}
 						}
@@ -933,7 +933,7 @@
 					width: 100%;
 					height: 100%;
 					background: #F7F7F7;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					border-radius: 14rpx;
@@ -958,7 +958,7 @@
 							float: left;
 							margin: 4rpx 6rpx 0 0;
 							color: #999999;
-							font-size: $font-size-lg;
+							font-size: $font-size-32;
 							&.icon-gouxuan{
 								color: $color-system;
 							}
@@ -976,7 +976,7 @@
 				width: 702rpx;
 				height: 88rpx;
 				border-radius: 14rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;
 				margin: 0 auto;

pages/user-module/login-accont.vue

@@ -265,7 +265,7 @@
 				width: 100%;
 				height: 100%;
 				background: #F7F7F7;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 40rpx;
 				color: #333333;
 				border-radius: 14rpx;
@@ -288,7 +288,7 @@
 				margin-bottom: 40rpx;
 				padding: 0 24rpx;
 				line-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				.login-reg{
 					float: left;
 					color: $color-system;
@@ -303,7 +303,7 @@
 			width: 702rpx;
 			height: 88rpx;
 			border-radius: 14rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
@@ -312,7 +312,7 @@
 		}
 		.login-btn-last{
 			width: 702rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 160rpx;
 			margin: 0 auto;
 			color: $text-color;
@@ -344,7 +344,7 @@
 					margin: auto;
 					width: 70%;
 					height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 88rpx;
 					color: #FFFFFF;
 					text-align: center;

pages/user-module/login.vue

@@ -240,7 +240,7 @@
 				width: 100%;
 				height: 100%;
 				background: #F7F7F7;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 40rpx;
 				color: #333333;
 				border-radius: 14rpx;
@@ -250,7 +250,7 @@
 			width: 702rpx;
 			height: 88rpx;
 			border-radius: 14rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
@@ -283,7 +283,7 @@
 					margin: auto;
 					width: 70%;
 					height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 88rpx;
 					color: #FFFFFF;
 					text-align: center;

pages/user-module/password.vue

@@ -257,7 +257,7 @@
 				align-items: center;
 				line-height: 80rpx;
 				color: $text-color;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				background: #F7F7F7;
 				
 				&.current{
@@ -359,7 +359,7 @@
 					width: 100%;
 					height: 100%;
 					background: #F7F7F7;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					border-radius: 14rpx;
@@ -370,7 +370,7 @@
 			width: 702rpx;
 			height: 88rpx;
 			border-radius: 14rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
@@ -404,7 +404,7 @@
 					margin: auto;
 					width: 70%;
 					height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 88rpx;
 					color: #FFFFFF;
 					text-align: center;

pages/user-module/register.vue

@@ -15,7 +15,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" v-model="registerEmail" placeholder="请输入您的常用邮箱" maxlength="30"/>
+					<input class="row-input" type="text"  v-model="registerEmail" @input="registerEmailInput" placeholder="请输入您的常用邮箱" maxlength="30"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -23,8 +23,8 @@
 					<view class="label">邮箱验证码:</view>
 					<input class="row-input" type="text" v-model="regEmailCode" placeholder="请输入邮箱验证码" maxlength="6"/>
 				</view>
-				<view class="register-from btn" :class="[isDisabled === true ? 'disabled' : 'none']">
-					<button class="row-input"  type="button" @click.stop="getEmailCode" :disabled="isDisabled">获取验证码</button>
+				<view class="register-from btn" :class="[isEmialDisabled === true ? 'disabled' : 'none']">
+					<button class="row-input"  type="button" @click.stop="getEmailCode" :disabled="isEmialDisabled">{{emialCodecount}}</button>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -40,7 +40,7 @@
 				</view>
 			</view>
 			<view class="register-row clearfix">
-				<view class="register-btn"  @click="steps(2)">下一步</view>
+				<view class="register-btn"  @click="registerStepsfirst()">下一步</view>
 			</view>
 		</view>
 		<view class="register-main clearfix" v-if="tabCurrentIndex === 2">
@@ -258,7 +258,10 @@
 				<view class="register-agree">
 					<view class="agree-text"  @tap.stop="agreeCheck()">
 						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
-						我已阅读并同意<text>《机构协议》</text><text>《用户协议》</text>及<text>《隐私权政策》</text>
+						我已阅读并同意
+						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
 					</view>
 				</view>
 				<view class="register-row ">
@@ -284,6 +287,7 @@
 	import uniTag from '@/components/uni-tag/uni-tag.vue';
 	import authorize from '@/common/config/authorize.js' 
 	import URLCONFIG from '@/common/config/config.js' 
+	import { getEmailCode } from "@/api/utils.js";
 	var self;
 	export default{
 		components:{
@@ -292,8 +296,14 @@
 		},
 		data() {
 			return{
+				registerEmail:'', //注册邮箱
+				regEmailCode:'',  //邮箱验证码
+				isEmialDisabled: true,
+			    count: '',
+			    emialCodecount: '获取验证码',
+			    emialTimer: null,
 				isDisabled:true,
-				tabCurrentIndex:3,	
+				tabCurrentIndex:1,	
 				isShowInput:false,
 				isCheck:false,		//是否全选
 				uploadBusinessImage:'',
@@ -323,20 +333,6 @@
 				isDepartment:false, //是否显示科室
 				isShowAustomItem:false, //是否显示其他添加
 				customItemValue:'', //自定义项目
-				invitationCode:'',  //获取用户登录的邀请码
-				isToast:false,		//控制显示未输入邀请码提示	
-				isUserInfo:false,	//控制显示授权弹窗
-				nickName:'',		//存储用户名
-				userInfo:'',		//存储微信用户授权信息
-				isSuccess:false,
-				toestText:'',
-				telPhone:'',
-				registerType:'',		//跳转类型
-				alertText:'',
-				listType: '',
-				listVal: '',
-				detilType:'',
-				id:'',//商品ID
 				addressData:{
 					addressID:'',
 					address:'请选择机构所在地区',
@@ -360,7 +356,48 @@
 			}
 		},
 		methods:{
-			...mapMutations(['register']),
+			registerStepsfirst(){
+				if( this.registerEmail == ''){
+					this.$util.msg('请输入邮箱地址',3000);
+					return
+				}
+			},
+			getEmailCode(){
+				if(!this.$reg.isEmail(this.registerEmail)){
+					this.$util.msg('请输入正确的邮箱地址',3000);
+					console.log(this.$reg.isEmail(this.registerEmail))
+					return
+				}
+				this.$api.get(getEmailCode,{email:this.registerEmail,status:2}, res => {
+					console.log(res)
+				})
+				const TIME_COUNT = 120;
+		     	if (!this.emialTimer) {
+		       		this.count = TIME_COUNT;
+		       		this.isEmialDisabled = false;
+		       		this.emialTimer = setInterval(() => {
+		       			if (this.count > 1 && this.count <= TIME_COUNT) {
+		         			this.count--
+		         			this.emialCodecount = this.count +'s'
+		        		} else {
+			         		this.isEmialDisabled = true;
+			         		clearInterval(this.emialTimer)
+			         		this.emialTimer = null
+							this.emialCodecount = '获取验证码'
+		        		}
+		       		},1000)
+		      	}
+				this.isEmialDisabled = true;
+			},
+			registerEmailInput(e){
+				console.log(this.$reg.isEmail(e.detail.value))
+				 this.registerEmail = e.detail.value;
+				 if(!this.registerEmail){
+					 this.isEmialDisabled = true
+				 }else{
+					 this.isEmialDisabled = false
+				 }
+			},
 			goregister() {
 				self.$api.get('/register/isEnabled',{userOrganizeID:self.userOrganizeID,invitationCode:self.invitationCode}, res => {
 					if (res.code == "1") {
@@ -572,9 +609,7 @@
 					this.isDisabled = false
 				}
 			},
-			getEmailCode(){
-				this.isDisabled = true
-			},
+			
 			showAustomItem() {
 				this.isShowAustomItem = !this.isShowAustomItem
 			},
@@ -618,7 +653,7 @@
 				border-radius: 30rpx;
 				text-align: center;
 				color: #999999;
-				font-size:$font-size-sb;
+				font-size:$font-size-26;
 				float: left;
 				margin-right: 72rpx;
 				position: relative;
@@ -651,11 +686,11 @@
 				flex-direction: column;
 				align-items: center;
 				line-height: 44rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FF0000;
 				margin-bottom: 40rpx;
 				.iconfont{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 			}
 			.register-row{
@@ -672,7 +707,7 @@
 					position: relative;
 					.label{
 						text-align: left;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 40rpx;
 						float: left;
@@ -680,7 +715,7 @@
 					.row-input{
 						width: 440rpx;
 						padding-left:10rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 40rpx;
 						float: left;
@@ -844,7 +879,7 @@
 							padding: 24rpx;
 							text-align: left;
 							border-radius: 10rpx;
-							font-size: $font-size-base;
+							font-size: $font-size-28;
 							color: $text-color;
 						}
 						.confirm-btn{
@@ -864,7 +899,7 @@
 						.item {
 						  width: 156rpx;
 						  height: 60rpx;
-						  font-size:$font-size-base;
+						  font-size:$font-size-28;
 						  line-height: 60rpx;
 						  border-radius:10rpx;
 						  margin-bottom: 20rpx;
@@ -897,7 +932,7 @@
 						height: 180rpx;
 						background: #F7F7F7;
 						padding: 24rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						z-index: 1;
 						border-radius: 14rpx;
@@ -915,7 +950,7 @@
 				margin: 40rpx 0 0 0;
 				.label{
 					float: left;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 102rpx;
 					width: 150rpx;
@@ -937,7 +972,7 @@
 						border-radius: 10rpx;
 						margin: 0 20rpx;
 						.iconfont{
-							font-size: $font-size-base;
+							font-size: $font-size-28;
 						}
 					}
 					.upload-image{
@@ -960,7 +995,7 @@
 							line-height: 40rpx;
 							text-align: center;
 							.iconfont{
-								font-size: $font-size-lg;
+								font-size: $font-size-32;
 								color: #999999;
 							}
 						}
@@ -979,7 +1014,7 @@
 					width: 100%;
 					height: 100%;
 					background: #F7F7F7;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 40rpx;
 					color: #333333;
 					border-radius: 14rpx;
@@ -1003,7 +1038,7 @@
 							float: left;
 							margin: 4rpx 6rpx 0 0;
 							color: #999999;
-							font-size: $font-size-lg;
+							font-size: $font-size-32;
 							&.icon-gouxuan{
 								color: $color-system;
 							}
@@ -1021,7 +1056,7 @@
 				width: 702rpx;
 				height: 88rpx;
 				border-radius: 14rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;
 				margin: 0 auto;

pages/user/account/account.vue

@@ -341,7 +341,7 @@ page, .container{
 	display: flex;
 	.uni-input{
 		flex: 8;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		text-align: center;
 		line-height: 40rpx;
@@ -362,7 +362,7 @@ page, .container{
 		height: 40rpx;
 		line-height:40rpx;
 		padding: 26rpx 0 22rpx 0;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		float: left;
 		color: $text-color;
 		text-align: center;
@@ -427,7 +427,7 @@ page, .container{
 		.list-t{
 			height: 34rpx;
 			line-height: 34rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			display: flex;
 			margin-bottom: 28rpx;
@@ -448,7 +448,7 @@ page, .container{
 		.list-b{
 			height: 34rpx;
 			line-height: 34rpx;
-			font-size:$font-size-base;;
+			font-size:$font-size-28;;
 			margin-top: 24rpx;
 			color: $text-color;
 			display: flex;
@@ -529,7 +529,7 @@ page, .container{
 		height: 158rpx;
 	}
 	.error-text{
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		line-height: 88rpx;
 	}

pages/user/address/address.vue

@@ -221,7 +221,7 @@
 	.u-box{
 		display: flex;
 		align-items: center;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		line-height: 40rpx;
 		margin-bottom: 12rpx;
@@ -239,7 +239,7 @@
 				height: 40rpx;
 				background: $color-system;
 				border-radius: 20rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FFFFFF;
 				line-height: 40rpx;
 				text-align: center;
@@ -254,7 +254,7 @@
 				flex: 1;
 				line-height: 40rpx;
 				.txt{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: $text-color;
 					line-height: 40rpx;
 				}
@@ -269,7 +269,7 @@
 			}
 		}
 		.address{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			line-height: 40rpx;
 			-o-text-overflow: ellipsis;
@@ -292,7 +292,7 @@
 		justify-content: center;
 		width: 702rpx;
 		height: 88rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		text-align: center;

pages/user/address/addressManage.vue

@@ -222,7 +222,7 @@
 		.textarea{
 			width: 100%;
 			height: 100%;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			z-index: 1;
 		}
@@ -237,7 +237,7 @@
 		background: #FFFFFF;
 		margin-top: 16upx;
 		.tit{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 40rpx;
 			color: #333333;
 			flex: 1;
@@ -249,7 +249,7 @@
 	.add-btn{
 		width: 702rpx;
 		height: 88rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		margin: 0 auto;

pages/user/operator/addoperator.vue

@@ -1,8 +1,242 @@
 <template>
+	<view class="container operator clearfix">
+		<view class="operator-content">
+			<view class="operator-from">
+				<view class="from-row">
+					<input class="input" type="text" v-model="linkman" placeholder="请输入运营人员姓名" maxlength="6"/>
+				</view>
+				<view class="from-row">
+					<input class="input" type="text" v-model="clubMobile" placeholder="请输入运营人员手机号" maxlength="11"/>
+				</view>
+				<button class="add-btn" @click="confirm">{{buttonText}}</button>
+			</view>
+			<view class="operator-text">
+				<view class="title" @click="this.$api.navigateTo('/pages/user/operator/bindstep')">
+					<text class="iconfont icon-gantanhao-yuankuang"></text>
+					<text class="text-m">运营人员绑定步骤</text>
+					<text class="text-s">（点击查看图片引导）</text>
+				</view>
+				<view class="text-main">
+					<view>1. 添加运营人员后，运营人员会收到一条邀请码短信</view>
+					<view>2.运营人员在微信搜索“采美采购商城”小程序，在登录页使用邀请码授权绑定微信或关注“采美365网”公众号，在聊天框中输入“绑定运营人员”并发送，点击自动回复的链接，然后输入邀请码绑定微信</view>
+					<view>3. 绑定微信后，运营人员可通过微信授权直接登录采美365网</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
-<script>
+<script>	
+	import authorize from '@/common/config/authorize.js'	
+	export default {
+		data() {
+			return {
+				buttonText:'确定',
+				addType:1,				//记录添加地址的类型
+				linkman:'',
+				clubMobile:'',
+				isConfirm:true,
+				isShowInput:false,
+				switchDefault:false,
+				params:{}				//参数
+			}
+		},
+		onLoad(option){
+			// console.log(option.data)
+			let title = '添加新地址'
+			if(option.type==='edit'){
+				title = '编辑收货地址'
+				this.isConfirm = false;
+				this.addType = 2;				
+				this.addressData = JSON.parse(option.data)
+				this.addressData.address = `${this.addressData.province}-${this.addressData.city}-${this.addressData.town}`
+				this.addressData.userOrganizeID = this.userOrganizeID;
+				this.addressData.defaultFlag = this.addressData.defaultFlag;
+				if(this.addressData.defaultFlag == 1){
+					this.switchDefault = true
+				}else{
+					this.switchDefault = false
+				}
+			}
+			uni.setNavigationBarTitle({
+				title
+			})
+		},
+		methods: {			
+			//提交
+			confirm(){
+				let data = this.addressData;
+				if(this.linkman== ''){
+					this.$util.msg('请输入运营人员姓名');
+					return;
+				}
+				if(this.clubMobile == ''){
+					this.$util.msg('请输入运营人员手机号');
+					return;
+				}
+				if(!/(^1[0-9][0-9]{9}$)/.test(this.clubMobile)){
+					this.$util.msg('请输入正确的手机号码');
+					return;
+				}
+				if(this.addType ==1){
+					this.params ={
+							userID:data.userID  ,//用户id ,只在新增收货地址时传
+							shouHuoRen:data.shouHuoRen ,//收货人
+							townID:data.townID,//区ID
+							addressDetail:data.addressDetail,//地址
+							mobile:data.mobile,//手机
+							userOrganizeID:this.userOrganizeID,//组织ID
+							defaultFlag:data.defaultFlag//是否默认收货地址(0 不是默认,1 默认)
+						}
+					this.postAddressData(this.params)	
+				}else{
+					this.params =  this.addressData;
+					this.postAddressData(this.params)
+				}
+			},
+			postAddressData(res){
+				let self = this;
+				self.btnText(true)
+				authorize.getCode('weixin').then(wechatcode =>{
+					self.$api.post('/personal/save?code='+`${wechatcode}`,JSON.stringify(res),
+						response => {
+							if(response.code==1){
+								self.$util.msg(response.msg,3000);
+								self.btnText(false)
+								uni.navigateBack();
+							}else{
+								self.$util.msg(response.msg,3000);
+								setTimeout(function(){
+									uni.switchTab({
+										url:'/pages/tabBar/home/home'
+									})
+								},1000)
+							}
+						}
+					)
+				})	
+			},
+			btnText(flg){
+				if(flg){
+					this.isConfirm = true;
+					this.buttonText = '保存中...'
+				}else{
+					this.isConfirm = false;
+					this.buttonText = '保存'
+				}
+			},
+			onShouHuoRen(e){
+			   this.addressData.shouHuoRen = e.detail.value;
+			   // console.log(this.addressData.shouHuoRen)
+			   this.initInput();
+			},
+			onMobile(e){
+			   this.addressData.mobile = e.detail.value;
+			   // console.log(this.addressData.mobile)
+			   this.initInput();
+			},
+			onTextareaInput(e){
+			   this.addressData.addressDetail = e.detail.value;
+			   // console.log(this.addressData.addressDetail)
+			   this.initInput();
+			},
+			initInput(){
+				if(this.addressData.shouHuoRen !== "" && this.addressData.mobile !=="" && this.addressData.addressDetail !==""){
+					this.isConfirm =false;
+				}else{
+					this.isConfirm =true;
+				}
+			}
+		},
+		onShow() {
+			this.$api.getStorage().then((resolve) =>{
+				this.addressData.userID = resolve.userID
+			})
+		}
+	}
 </script>
 
-<style>
+<style lang="scss">
+	page{
+		height: auto;
+		background: $bg-color;
+		border-top: 1px solid #EBEBEB;
+	}
+	.operator{
+		padding-top: 160rpx;
+		.operator-content{
+			width: 702rpx;
+			padding:0 24rpx;
+			.operator-from{
+				width: 100%;
+				height: auto;
+				.from-row{
+					width: 100%;
+					height: 40rpx;
+					padding: 24rpx;
+					background: #F7F7F7;
+					border-radius: 14rpx;
+					margin-bottom: 20rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					.input{
+						width: 100%;
+						height: 100%;
+						text-align: left;
+					}
+				}
+			}
+			.operator-text{
+				width: 100%;
+				height: auto;
+				margin-top: 50rpx;
+				line-height: 40rpx;
+				.title{
+					margin-bottom: 50rpx;
+					.icon-gantanhao-yuankuang{
+						font-size: $font-size-32;
+						color: #166CE1;
+						margin-right: 10rpx;
+					}
+					.text-m{
+						font-size: $font-size-30;
+						color: #166CE1;
+					}
+					.text-s{
+						font-size: $font-size-24;
+						color: #999999;
+					}
+				}
+				.text-main{
+					width: 100%;
+					height: auto;
+					view{
+						line-height: 40rpx;
+						font-size: $font-size-28;
+						color: $text-color;
+						text-align: justify;
+						margin-bottom: 10rpx;
+					}
+				}
+			}
+			
+		}
+		.add-btn{
+			width: 702rpx;
+			height: 88rpx;
+			font-size: $font-size-28;
+			line-height: 88rpx;
+			color: #FFFFFF;
+			margin: 0 auto;
+			text-align: center;
+			background: $btn-confirm;
+			border-radius: 14rpx;
+			margin-top: 80rpx;
+		}
+		.add-btn.disabled{
+			background: #F8F8F8;
+			border-radius: 14rpx;
+		}
+	}
 </style>
+

pages/user/operator/bindstep.vue

@@ -0,0 +1,35 @@
+<template>
+	<view class="container step">
+		<image  class="step-img" :src="stepImage" mode="" @click="viewMentuzImage"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data (){
+			return {
+				stepImage:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%BF%90%E8%90%A5%E4%BA%BA%E5%91%98%E7%BB%91%E5%AE%9A%E6%AD%A5%E9%AA%A41%403x.png'
+			}
+		},
+		methods:{
+			viewMentuzImage(e) {
+				let self = this
+				uni.previewImage({
+					urls: self.stepImage,
+					current: 0
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.step{
+		width: 100%;
+		height: auto;
+		.step-img{
+			width: 100%;
+			height: 3798rpx;
+		}
+	}
+</style>

pages/user/operator/list.vue

@@ -24,7 +24,7 @@
 		<view class="operator-main">
 			<view v-if="isEmpty" class="empty-container">
 				<view class="txt">暂无运营人员</view>
-				<view class="add-btn" @click="addAddress('add')">添加运营人员</view>
+				<view class="add-btn" @click="this.$api.navigateTo('/pages/user/operator/addoperator')">添加运营人员</view>
 			</view>
 			<view v-else class="operator-list">
 				<scroll-view scroll-y="true">
@@ -52,7 +52,7 @@
 						</view>
 					</view>
 				</scroll-view>
-				<view class="add-btn" @click="addAddress('add')">添加运营人员</view>
+				<view class="add-btn" @click="this.$api.navigateTo('/pages/user/operator/addoperator')">添加运营人员</view>
 			</view>
 		</view>
 		<view class="operator-model" v-if="isOperatorModel" @click.stop="closeModel">
@@ -210,14 +210,16 @@
 			deleteOperator(id){//删除运营人员
 				console.log('删除地址的ID',id)
 				this.$util.modal('提示','确定删除运营人员吗？',true,() =>{
-					
+					this.$util.msg('删除成功',3000);
+					this.isOperatorModel = false
 				})
 				// this.isShowDelModal = true;
 				// this.deleteAddressId =id;
 			},
 			updateInvitationCode(){	//更新邀请码	
 				this.$util.modal('提示','确定更新邀请码并发送给运营人员？',true,() =>{
-					
+					this.$util.msg('更新邀请码成功',3000);
+					this.isOperatorModel = false
 				})
 			},
 			confirmDetele(){
@@ -374,7 +376,7 @@
 					.input{
 						width: 180rpx;
 						padding-left:10rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 40rpx;
 						float: left;
@@ -386,7 +388,7 @@
 					.input{
 						width: 220rpx;
 						padding-left:10rpx;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 						color: $text-color;
 						line-height: 40rpx;
 						float: left;
@@ -395,7 +397,7 @@
 				}
 				.label{
 					text-align: left;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color:$text-color;
 					line-height: 40rpx;
 					float: left;
@@ -407,7 +409,7 @@
 				height: 88rpx;
 				border: 1px solid $color-system;
 				border-radius: 14rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $color-system;
 				line-height: 88rpx;
 			}
@@ -441,7 +443,7 @@
 				.txt{
 					display: flex;
 					flex: 1;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 46rpx;
 				}
@@ -461,10 +463,10 @@
 					border-radius: 10rpx;
 					border: 1px solid #DDDDDD;
 					line-height: 64rpx;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					.icon-iconfontweixin{
 						margin-right: 8rpx;
-						font-size: $font-size-lg;
+						font-size: $font-size-32;
 					}
 				}
 			}
@@ -479,10 +481,10 @@
 					border-radius: 10rpx;
 					border: 1px solid #DDDDDD;
 					line-height: 64rpx;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: #FF0000;
 					.icon-shanchu{
-						font-size: $font-size-lg;
+						font-size: $font-size-32;
 						margin-right: 6rpx;
 					}
 				}
@@ -526,7 +528,7 @@
 			}
 			.content{
 				.ciew-t{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 48rpx;
 				}
@@ -536,7 +538,7 @@
 				height: 68rpx;
 				border-top: 1px solid #F7F7F7;
 				line-height: 68rpx;
-				font-size: $font-size-sb;
+				font-size: $font-size-26;
 				text-align: center;
 				color: $color-system;
 				position: absolute;
@@ -557,7 +559,7 @@
 		justify-content: center;
 		width: 702rpx;
 		height: 88rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		text-align: center;

pages/user/order/create-order.vue

@@ -285,7 +285,7 @@
 		padding: 0 24rpx;
 		height: 86rpx;
 		line-height: 86rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		background: #FFFFFF;
 		float: left;
@@ -336,7 +336,7 @@
 				float: left;
 				.title{
 					line-height: 40rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: center;
 					font-weight: bold;
@@ -344,14 +344,14 @@
 				}
 				.text{
 					line-height: 36rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: justify;
 					margin-top: 22rpx;
 				}
 				.tel{
 					line-height: 36rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: justify;
 					margin-top: 22rpx;
@@ -367,7 +367,7 @@
 				float: left;
 				background: #000000;
 				line-height: 88rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				text-align: center;
 				color: #FFFFFF;
 				border-radius: 0;
@@ -387,7 +387,7 @@
 			width: 100%;
 			height: 86rpx;
 			line-height: 86rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			float: left;
 			.balabce-t-le{
@@ -407,7 +407,7 @@
 					width: 60rpx;
 					float: left;
 					height: 100%;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					.checkbox{
 						width: 40rpx;
 						text-align: right;
@@ -428,7 +428,7 @@
 			.balabce-b-text{
 				width: 100%;
 				line-height: 58rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FF2A2A;
 				text-align: right;
 				float: right;
@@ -451,7 +451,7 @@
 		height: 110rpx;
 		line-height: 110rpx;
 		justify-content: space-between;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		background-color: #FFFFFF;
 		z-index: 998;
 		color: $text-color;
@@ -472,7 +472,7 @@
 			font-weight: bold;
 			padding-right: 24rpx;
 			.price{
-				font-size: $font-size-lg;
+				font-size: $font-size-32;
 				color: #FF2A2A;
 			}
 		}

pages/user/order/myOrder.vue

@@ -479,7 +479,7 @@
 			width: 100%;
 			height: 40rpx;
 			float: left;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 40rpx;
 			font-weight: bold;
 			.order-title-num{
@@ -498,7 +498,7 @@
 			height: 40rpx;
 			float: left;
 			margin-top: 8rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 40rpx;
 			color: #999999;
 			text-align: left;
@@ -521,7 +521,7 @@
 		.title-text{
 			float: left;
 			margin-left: 16rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
 			line-height: 48rpx;
@@ -555,7 +555,7 @@
 		width: 468rpx;
 		height: 100%;
 		line-height: 36rpx;
-		font-size: $font-size-sb;	
+		font-size: $font-size-26;	
 		position: relative;
 		.producttitle{
 			width: 100%;
@@ -580,7 +580,7 @@
 			bottom: 0;
 			.price{
 				line-height: 48rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				width: 48%;
 				color: #FF2A2A;
 				float: left;
@@ -604,7 +604,7 @@
 			width: 100%;
 			height: 34rpx;
 			line-height: 34rpx;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: #999999;
 			text-align: right;
 		}
@@ -613,7 +613,7 @@
 			float: left;
 			height: 48rpx;
 			line-height: 48rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			font-weight: bold;
 			color: $text-color;
 			.count{

pages/user/order/order-cashier.vue

@@ -202,7 +202,7 @@
 					margin-top: -120rpx;
 				}
 				.txt{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 44rpx;
 				}
@@ -222,7 +222,7 @@
 					margin-bottom: 22rpx;
 				}
 				.wrapper-text{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: center;
 					line-height: 44rpx;
@@ -236,14 +236,14 @@
 					width: 702rpx;
 					text-align: justify;
 					color: #FF2A2A;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					line-height: 36rpx;
 					font-weight: normal;
 				}
 				.wrapper-title{					
 					line-height: 36rpx;
 					text-align: center;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					margin: 48rpx 0 24rpx 0;
 					font-weight: bold;
@@ -278,7 +278,7 @@
 					border-radius: 30rpx;
 					background: rgba(255,255,255,0);
 					border: 1px solid #F8C499;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					line-height: 64rpx;
 					text-align: left;
@@ -300,7 +300,7 @@
 						height: 36rpx;
 						background: linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
 						text-align: center;
-						font-size: $font-size-sm;
+						font-size: $font-size-24;
 						color: #FFFFFF;
 						border-radius: 6rpx;
 						line-height: 36rpx;
@@ -324,7 +324,7 @@
 					height: 64rpx;
 					margin: 0 22rpx;
 					line-height: 64rpx;
-					font-size:$font-size-sb;
+					font-size:$font-size-26;
 					color: #FFFFFF;
 					text-align: center;
 				}
@@ -341,7 +341,7 @@
 						position: absolute;
 						color: #FFFFFF;
 						line-height: 34rpx;
-						font-size: $font-size-sm;
+						font-size: $font-size-24;
 						text-align: left;
 						left: 0;
 						top: -65rpx;

pages/user/order/order-details.vue

@@ -300,7 +300,7 @@
 			width: 100%;
 			height: 86rpx;
 			line-height: 86rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			float: left;
 			.balabce-t-le{
@@ -320,7 +320,7 @@
 					width: 60rpx;
 					float: left;
 					height: 100%;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					.checkbox{
 						width: 40rpx;
 						text-align: right;
@@ -341,7 +341,7 @@
 			.balabce-b-text{
 				width: 100%;
 				line-height: 58rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FF2A2A;
 				text-align: right;
 				float: right;

pages/user/order/order-list.vue

@@ -512,7 +512,7 @@
 	.tab-bar-title {
 		height: 80rpx;
 		line-height: 80rpx;
-		font-size:$font-size-base;
+		font-size:$font-size-28;
 		color: $text-color;
 		font-weight: bold;
 	}
@@ -561,7 +561,7 @@
 			width: 100%;
 			height: 40rpx;
 			float: left;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 40rpx;
 			font-weight: bold;
 			.order-title-num{
@@ -580,7 +580,7 @@
 			height: 40rpx;
 			float: left;
 			margin-top: 8rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 40rpx;
 			color: #999999;
 			text-align: left;
@@ -603,7 +603,7 @@
 		.title-text{
 			float: left;
 			margin-left: 16rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			text-align: left;
 			line-height: 48rpx;
@@ -637,7 +637,7 @@
 		width: 468rpx;
 		height: 100%;
 		line-height: 36rpx;
-		font-size: $font-size-sb;	
+		font-size: $font-size-26;	
 		position: relative;
 		.producttitle{
 			width: 100%;
@@ -662,7 +662,7 @@
 			bottom: 0;
 			.price{
 				line-height: 48rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				width: 48%;
 				color: #FF2A2A;
 				float: left;
@@ -686,7 +686,7 @@
 			width: 100%;
 			height: 34rpx;
 			line-height: 34rpx;
-			font-size: $font-size-sm;
+			font-size: $font-size-24;
 			color: #999999;
 			text-align: right;
 		}
@@ -695,7 +695,7 @@
 			float: left;
 			height: 48rpx;
 			line-height: 48rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			font-weight: bold;
 			color: $text-color;
 			.count{

pages/user/order/order-logistics.vue

@@ -219,7 +219,7 @@
 				.title-text{
 					float: left;
 					margin-left: 16rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					text-align: left;
 					line-height: 48rpx;
@@ -253,7 +253,7 @@
 				width: 468rpx;
 				height: 100%;
 				line-height: 36rpx;
-				font-size: $font-size-sb;	
+				font-size: $font-size-26;	
 				position: relative;
 				.producttitle{
 					width: 100%;
@@ -271,7 +271,7 @@
 					height: 36rpx;
 					color: $text-color;
 					line-height: 36rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 				}
 			}		
 		}
@@ -296,7 +296,7 @@
 				width: 100%;
 				height: 40rpx;
 				line-height: 40rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				color: $text-color;
 				text-align: left;
 				padding-bottom: 24rpx;
@@ -309,7 +309,7 @@
 					transform: rotate(0deg);
 					transform-origin: center center;
 					float: right;
-					font-size: $font-size-lg;
+					font-size: $font-size-32;
 					color: #000000;
 					/* transition: transform 0.3s ease;*/
 					transition-property: transform;
@@ -326,7 +326,7 @@
 				.table{
 					height: 76rpx;
 					line-height: 76rpx;
-					font-size: $font-size-sb;
+					font-size: $font-size-26;
 					color: $text-color;
 					text-align: left;
 				}
@@ -341,7 +341,7 @@
 				float: left;
 				padding-top: 24rpx;
 				.main-top,.main-bot{
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					color: $text-color;
 					line-height: 40rpx;
 					margin: 4rpx 0;
@@ -350,7 +350,7 @@
 			.logistics-main-bot{
 				width: 100%;
 				height: auto;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: $text-color;
 				line-height: 56rpx;
 				text-align: justify;
@@ -378,7 +378,7 @@
 				height: 36rpx;
 				background: linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
 				text-align: center;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FFFFFF;
 				border-radius: 6rpx;
 				line-height: 36rpx;

pages/user/order/order-sharedetails.vue

@@ -153,7 +153,7 @@
 			width: 100%;
 			height: 86rpx;
 			line-height: 86rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			float: left;
 			.balabce-t-le{
@@ -173,7 +173,7 @@
 					width: 60rpx;
 					float: left;
 					height: 100%;
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					.checkbox{
 						width: 40rpx;
 						text-align: right;
@@ -194,7 +194,7 @@
 			.balabce-b-text{
 				width: 100%;
 				line-height: 58rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FF2A2A;
 				text-align: right;
 				float: right;
@@ -219,7 +219,7 @@
 			height:  64rpx;
 			margin:22rpx;
 			line-height: 64rpx;
-			font-size:$font-size-sb;
+			font-size:$font-size-26;
 			color: #FFFFFF;
 			text-align: center;
 			float: right;

pages/user/order/orderShareLogin.vue

@@ -136,7 +136,7 @@
 				width: 100%;
 				height: 100%;
 				background: #F7F7F7;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				line-height: 40rpx;
 				color: #333333;
 			}
@@ -144,7 +144,7 @@
 		.login-btn{
 			width: 702rpx;
 			height: 88rpx;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
 			margin: 0 auto;
@@ -179,7 +179,7 @@
 					margin: auto;
 					width: 70%;
 					height: 88rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					line-height: 88rpx;
 					color: #FFFFFF;
 					text-align: center;

pages/user/regularPurchase/regularPurchase.vue

@@ -293,7 +293,7 @@
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 					border-radius: 14rpx;
 					&.buy{
 						background: $btn-confirm;
@@ -367,14 +367,14 @@
 				display: flex;
 				.layer-nunbox-text{
 					line-height: 44rpx;
-					font-size: $font-size-base;
+					font-size: $font-size-28;
 				}
 				.number-box{
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					.iconfont{
-						font-size: $font-size-lg;
+						font-size: $font-size-32;
 						padding:0 20rpx;
 						font-size: $text-color;
 					}
@@ -385,7 +385,7 @@
 						background: #F8F8F8;
 						border-radius: 4rpx;
 						text-align: center;
-						font-size: $font-size-base;
+						font-size: $font-size-28;
 					}
 				}
 				.product-step{
@@ -403,7 +403,7 @@
 			}
 			.text{
 				line-height: 44rpx;
-				font-size: $font-size-base;
+				font-size: $font-size-28;
 				.p{
 					color: #FF2A2A;
 				}
@@ -411,7 +411,7 @@
 					margin-left: 30rpx;
 				}
 				.p.sm{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 				}
 			}
 		}

pages/user/setting/password.vue

@@ -221,7 +221,7 @@
 	.u-box{
 		display: flex;
 		align-items: center;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		line-height: 40rpx;
 		margin-bottom: 12rpx;
@@ -239,7 +239,7 @@
 				height: 40rpx;
 				background: $color-system;
 				border-radius: 20rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FFFFFF;
 				line-height: 40rpx;
 				text-align: center;
@@ -254,7 +254,7 @@
 				flex: 1;
 				line-height: 40rpx;
 				.txt{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: $text-color;
 					line-height: 40rpx;
 				}
@@ -269,7 +269,7 @@
 			}
 		}
 		.address{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			line-height: 40rpx;
 			-o-text-overflow: ellipsis;
@@ -292,7 +292,7 @@
 		justify-content: center;
 		width: 702rpx;
 		height: 88rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		text-align: center;

pages/user/setting/phone.vue

@@ -221,7 +221,7 @@
 	.u-box{
 		display: flex;
 		align-items: center;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		color: $text-color;
 		line-height: 40rpx;
 		margin-bottom: 12rpx;
@@ -239,7 +239,7 @@
 				height: 40rpx;
 				background: $color-system;
 				border-radius: 20rpx;
-				font-size: $font-size-sm;
+				font-size: $font-size-24;
 				color: #FFFFFF;
 				line-height: 40rpx;
 				text-align: center;
@@ -254,7 +254,7 @@
 				flex: 1;
 				line-height: 40rpx;
 				.txt{
-					font-size: $font-size-sm;
+					font-size: $font-size-24;
 					color: $text-color;
 					line-height: 40rpx;
 				}
@@ -269,7 +269,7 @@
 			}
 		}
 		.address{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			line-height: 40rpx;
 			-o-text-overflow: ellipsis;
@@ -292,7 +292,7 @@
 		justify-content: center;
 		width: 702rpx;
 		height: 88rpx;
-		font-size: $font-size-base;
+		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		text-align: center;

pages/user/setting/setting.vue

@@ -64,18 +64,18 @@
 		}
 		.cell-more{
 			align-self: baseline;
-			font-size:$font-size-base;
+			font-size:$font-size-28;
 			color:$text-color;
 			margin-left:10rpx;
 		}
 		.cell-tit{
 			flex: 1;
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 			margin-right:10rpx;
 		}
 		.cell-tip{
-			font-size: $font-size-base;
+			font-size: $font-size-28;
 			color: $text-color;
 		}
 	}	

uni.scss

@@ -22,13 +22,15 @@ $sub-bg-color: #F7F7F7;
 $green-color: #62BF00;
 
 /* 字体大小变量 */
-$font-size-sm:24rpx;
-$font-size-sb:26rpx;
-$font-size-base:28rpx;
-$font-size-se:30rpx;
-$font-size-lg:32rpx;
+$font-size-24:24rpx;
+$font-size-26:26rpx;
+$font-size-28:28rpx;
+$font-size-30:30rpx;
+$font-size-32:32rpx;
 $font-size-36:36rpx;
-$font-size-big:44rpx;
+$font-size-38:38rpx;
+$font-size-40:40rpx;
+$font-size-44:44rpx;
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;