Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier_wx into gyq

common/api/request.js

@@ -5,8 +5,9 @@ export default (params) => {
 	let type = params.type || 1;
 	let toast = params.toast || true;
 	let token=uni.cache.get('token') || '';
+	const shopId=uni.cache.get('shopId')*1;
 	// #ifdef H5
-	token="b152112b96e24feb8aa47062136c043b"
+	token="21f0a0b10e1d40ce9c6464037fedb792"
 	// #endif
 	let header = {
 		version: uni.conf.version,
@@ -25,7 +26,7 @@ export default (params) => {
 		// #endif
 		token,
 		id: uni.cache.get('userInfo').id || '',
-		shopId: uni.cache.get('shopId') || '',
+		shopId:shopId  || '',
 		userId: uni.cache.get('userInfo').id || '',
 	}
 	if (toast) {

common/css/common.scss

@@ -52,4 +52,37 @@ page,
 	}
 	.bg-main{
 		background-color: $my-main-color;
+	}
+	.color-666{
+		color: #666;
+	}
+	.text-center{
+		text-align: center;
+	}
+	.color-333{
+		color: #333;
+	}
+	.color-000{
+		color: #000;
+	}
+	.color-999{
+		color: #999;
+	}
+	.font-16 {
+		font-size: 16px;
+	}
+	.font-700{
+		font-weight: 700;
+	}
+	.font-14{
+		font-size: 14px;
+	}
+	.font-10{
+		font-size: 10px;
+	}
+	.font-12 {
+		font-size: 12px;
+	}
+	.no-wrap{
+		white-space: nowrap;
 	}