há 5 anos atrás · 6ff37bb59c
--- a/ghs/dist/shop/css/chunk-54201642.0a1b2e89.css
+++ b/ghs/dist/shop/css/chunk-54201642.0a1b2e89.css
--- a/ghs/dist/shop/css/chunk-a93480a2.8e6572e9.css
+++ b/ghs/dist/shop/css/chunk-a93480a2.8e6572e9.css
--- a/ghs/dist/shop/index.html
+++ b/ghs/dist/shop/index.html
@@ -43,4 +43,4 @@
 
				 			.once .sub-title {
			
 
				 				color: #ababab;
			
 
				 				font-size: 12px;
			
 
				-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.faadb6c5.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.faadb6c5.js"></script></body></html>
			
 
				+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.27c8fb55.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.27c8fb55.js"></script></body></html>
			
--- a/ghs/dist/shop/js/app.27c8fb55.js
+++ b/ghs/dist/shop/js/app.27c8fb55.js
--- a/ghs/dist/shop/js/app.faadb6c5.js
+++ b/ghs/dist/shop/js/app.faadb6c5.js
--- a/ghs/dist/shop/js/chunk-0a424188.f9753792.js
+++ b/ghs/dist/shop/js/chunk-0a424188.f9753792.js
--- a/ghs/dist/shop/js/chunk-1c00496a.592ac58d.js
+++ b/ghs/dist/shop/js/chunk-1c00496a.592ac58d.js
--- a/ghs/dist/shop/js/chunk-2d0d70b6.31e86770.js
+++ b/ghs/dist/shop/js/chunk-2d0d70b6.31e86770.js
@@ -1 +0,0 @@
 
				-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d70b6"],{"74ad":function(e,t,c){"use strict";c.r(t),c.d(t,"MerchantCapitalService",(function(){return o}));var n,a,r=c("303e"),i=c("e378"),u=c("a8e5"),p=c("c081"),o=(n=Object(p["Service"])("merchant-capital"),n(a=function(e){Object(i["a"])(c,e);var t=Object(u["a"])(c);function c(){return Object(r["a"])(this,c),t.apply(this,arguments)}return c}(p["BaseService"]))||a);t["default"]=new o}}]);
			
--- a/ghs/dist/shop/js/chunk-2d0d70b6.ee714380.js
+++ b/ghs/dist/shop/js/chunk-2d0d70b6.ee714380.js
@@ -0,0 +1 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d70b6"],{"74ad":function(e,t,c){"use strict";c.r(t),c.d(t,"MerchantCapitalService",(function(){return o}));var n,a,i=c("303e"),r=c("e378"),u=c("a8e5"),p=c("c081"),o=(n=Object(p["Service"])("shop-capital"),n(a=function(e){Object(r["a"])(c,e);var t=Object(u["a"])(c);function c(){return Object(i["a"])(this,c),t.apply(this,arguments)}return c}(p["BaseService"]))||a);t["default"]=new o}}]);
			
--- a/ghs/dist/shop/js/chunk-399898c4.1a8c20fd.js
+++ b/ghs/dist/shop/js/chunk-399898c4.1a8c20fd.js
--- a/ghs/dist/shop/js/chunk-52dfc438.161b726c.js
+++ b/ghs/dist/shop/js/chunk-52dfc438.161b726c.js
--- a/ghs/dist/shop/js/chunk-52dfc438.212a89cb.js
+++ b/ghs/dist/shop/js/chunk-52dfc438.212a89cb.js
--- a/ghs/dist/shop/js/chunk-54201642.1989e922.js
+++ b/ghs/dist/shop/js/chunk-54201642.1989e922.js
--- a/ghs/dist/shop/js/chunk-5ef69cd8.91822bfd.js
+++ b/ghs/dist/shop/js/chunk-5ef69cd8.91822bfd.js
--- a/ghs/dist/shop/js/chunk-7b4c135e.799d2479.js
+++ b/ghs/dist/shop/js/chunk-7b4c135e.799d2479.js
--- a/ghs/dist/shop/js/chunk-7f4a453c.1d96f002.js
+++ b/ghs/dist/shop/js/chunk-7f4a453c.1d96f002.js
--- a/ghs/dist/shop/js/chunk-7f4a453c.efd786d7.js
+++ b/ghs/dist/shop/js/chunk-7f4a453c.efd786d7.js
--- a/ghs/dist/shop/js/chunk-a93480a2.7e056c5e.js
+++ b/ghs/dist/shop/js/chunk-a93480a2.7e056c5e.js
--- a/ghs/src/sass/shop/list.vue
+++ b/ghs/src/sass/shop/list.vue
@@ -318,7 +318,7 @@ export default {
 
				 			switch (plamPayType) {
			
 
				 				case 1: //微信
			
 
				 					var data = {
			
 
				-						merchantId: this.form.merchantId,
			
 
				+						sjId: this.form.sjId,
			
 
				 						wxPayMerchantId: this.form.wxPayMerchantId,
			
 
				 						wxPayKey: this.form.wxPayKey
			
 
				 					};
			
@@ -329,7 +329,7 @@ export default {
 
				 					break;
			
 
				 				case 2: //支付宝
			
 
				 					var data = {
			
 
				-						merchantId: this.form.merchantId,
			
 
				+						sjId: this.form.sjId,
			
 
				 						alipayPId: this.form.alipayPId,
			
 
				 						alipayKey: this.form.alipayKey,
			
 
				 						alipayPublicKey: this.form.alipayPublicKey
			
--- a/ghs/src/store/modules/user.js
+++ b/ghs/src/store/modules/user.js
@@ -57,7 +57,7 @@ export default {
 
				 			return host().then(res => {
			
 
				 				commit('SET_USERINFO', res);
			
 
				 				if (ProjectName == 'business') {
			
 
				-					localStorage.setItem('account', res.merchantId);
			
 
				+					localStorage.setItem('account', res.sjId);
			
 
				 				}
			
 
				 				return res;
			
 
				 			});
			
--- a/ghsApp/src/pagesShare/pay.vue
+++ b/ghsApp/src/pagesShare/pay.vue
@@ -185,13 +185,13 @@ export default {
 
				       //       title: "点我付款",
			
 
				       //       desc: "享随机优惠，最高20元",
			
 
				       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxSharePay.jpg`,
			
 
				-      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`,
			
 
				+      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`,
			
 
				       //       // #endif
			
 
				       //       // #ifndef H5
			
 
				       //       title: "",
			
 
				       //       desc: "享随机优惠，最高20元",
			
 
				       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxPay.png`,
			
 
				-      //       pagePath: `/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`
			
 
				+      //       pagePath: `/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`
			
 
				       //       // #endif
			
 
				       //     };
			
 
				       //     this.jweixinFn(shareParams);
			
--- a/hd/dist/shop/css/chunk-114b8f40.acc13efa.css
+++ b/hd/dist/shop/css/chunk-114b8f40.acc13efa.css
--- a/hd/dist/shop/css/chunk-18c12157.a11e9d3c.css
+++ b/hd/dist/shop/css/chunk-18c12157.a11e9d3c.css
--- a/hd/dist/shop/css/chunk-793a8f5e.350c9761.css
+++ b/hd/dist/shop/css/chunk-793a8f5e.350c9761.css
--- a/hd/dist/shop/css/chunk-7e3e8376.dc6c4ad0.css
+++ b/hd/dist/shop/css/chunk-7e3e8376.dc6c4ad0.css
--- a/hd/dist/shop/index.html
+++ b/hd/dist/shop/index.html
@@ -43,4 +43,4 @@
 
				 			.once .sub-title {
			
 
				 				color: #ababab;
			
 
				 				font-size: 12px;
			
 
				-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.72de0063.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.72de0063.js"></script></body></html>
			
 
				+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.108f0c8e.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.108f0c8e.js"></script></body></html>
			
--- a/hd/dist/shop/js/app.108f0c8e.js
+++ b/hd/dist/shop/js/app.108f0c8e.js
--- a/hd/dist/shop/js/app.72de0063.js
+++ b/hd/dist/shop/js/app.72de0063.js
--- a/hd/dist/shop/js/chunk-114b8f40.40205547.js
+++ b/hd/dist/shop/js/chunk-114b8f40.40205547.js
--- a/hd/dist/shop/js/chunk-16566f8a.34fff30f.js
+++ b/hd/dist/shop/js/chunk-16566f8a.34fff30f.js
--- a/hd/dist/shop/js/chunk-18c12157.09b8e45d.js
+++ b/hd/dist/shop/js/chunk-18c12157.09b8e45d.js
--- a/hd/dist/shop/js/chunk-2d0d70b6.86661c7b.js
+++ b/hd/dist/shop/js/chunk-2d0d70b6.86661c7b.js
@@ -1 +0,0 @@
 
				-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d70b6"],{"74ad":function(e,t,c){"use strict";c.r(t),c.d(t,"MerchantCapitalService",(function(){return o}));var n,a,r=c("303e"),i=c("e378"),u=c("a8e5"),p=c("c081"),o=(n=Object(p["Service"])("merchant-capital"),n(a=function(e){Object(i["a"])(c,e);var t=Object(u["a"])(c);function c(){return Object(r["a"])(this,c),t.apply(this,arguments)}return c}(p["BaseService"]))||a);t["default"]=new o}}]);
			
--- a/hd/dist/shop/js/chunk-2d0d70b6.b459e94c.js
+++ b/hd/dist/shop/js/chunk-2d0d70b6.b459e94c.js
@@ -0,0 +1 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d70b6"],{"74ad":function(e,t,c){"use strict";c.r(t),c.d(t,"MerchantCapitalService",(function(){return o}));var n,a,i=c("303e"),r=c("e378"),u=c("a8e5"),p=c("c081"),o=(n=Object(p["Service"])("shop-capital"),n(a=function(e){Object(r["a"])(c,e);var t=Object(u["a"])(c);function c(){return Object(i["a"])(this,c),t.apply(this,arguments)}return c}(p["BaseService"]))||a);t["default"]=new o}}]);
			
--- a/hd/dist/shop/js/chunk-52dfc438.03d357ee.js
+++ b/hd/dist/shop/js/chunk-52dfc438.03d357ee.js
--- a/hd/dist/shop/js/chunk-52dfc438.37aa3798.js
+++ b/hd/dist/shop/js/chunk-52dfc438.37aa3798.js
--- a/hd/dist/shop/js/chunk-5ef69cd8.355c758a.js
+++ b/hd/dist/shop/js/chunk-5ef69cd8.355c758a.js
--- a/hd/dist/shop/js/chunk-793a8f5e.01387867.js
+++ b/hd/dist/shop/js/chunk-793a8f5e.01387867.js
--- a/hd/dist/shop/js/chunk-7e3e8376.b9624ef8.js
+++ b/hd/dist/shop/js/chunk-7e3e8376.b9624ef8.js
--- a/hd/dist/shop/js/chunk-7f4a453c.8f9cba5d.js
+++ b/hd/dist/shop/js/chunk-7f4a453c.8f9cba5d.js
--- a/hd/dist/shop/js/chunk-7f4a453c.d3e9cb95.js
+++ b/hd/dist/shop/js/chunk-7f4a453c.d3e9cb95.js
--- a/hd/src/sass/shop/list.vue
+++ b/hd/src/sass/shop/list.vue
@@ -317,7 +317,7 @@ export default {
 
				 			switch (plamPayType) {
			
 
				 				case 1: //微信
			
 
				 					var data = {
			
 
				-						merchantId: this.form.merchantId,
			
 
				+						sjId: this.form.sjId,
			
 
				 						wxPayMerchantId: this.form.wxPayMerchantId,
			
 
				 						wxPayKey: this.form.wxPayKey
			
 
				 					};
			
@@ -328,7 +328,7 @@ export default {
 
				 					break;
			
 
				 				case 2: //支付宝
			
 
				 					var data = {
			
 
				-						merchantId: this.form.merchantId,
			
 
				+						sjId: this.form.sjId,
			
 
				 						alipayPId: this.form.alipayPId,
			
 
				 						alipayKey: this.form.alipayKey,
			
 
				 						alipayPublicKey: this.form.alipayPublicKey
			
--- a/hd/src/store/modules/user.js
+++ b/hd/src/store/modules/user.js
@@ -57,7 +57,7 @@ export default {
 
				 			return host().then(res => {
			
 
				 				commit('SET_USERINFO', res);
			
 
				 				if (ProjectName == 'business') {
			
 
				-					localStorage.setItem('account', res.merchantId);
			
 
				+					localStorage.setItem('account', res.sjId);
			
 
				 				}
			
 
				 				return res;
			
 
				 			});
			
--- a/hd/src/views/home.vue
+++ b/hd/src/views/home.vue
@@ -57,41 +57,11 @@
 
				         <span class="title_right">本月收入： {{ incomeData.month || 0 }}<span style="margin-right: 20px;"></span>上月收入： {{ incomeData.previousMonth || 0 }}</span>
			
 
				       </div>
			
 
				 			<div class="card-body">
			
 
				-				<!-- <div class="echart-left-wrap">
			
 
				-					<div>
			
 
				-						<div>本月收入</div>
			
 
				-						<div class="num">{{ incomeData.month || 0 }}</div>
			
 
				-					</div>
			
 
				-					<div>
			
 
				-						<div>上月收入</div>
			
 
				-						<div class="num">{{ incomeData.previousMonth || 0 }}</div>
			
 
				-					</div>
			
 
				-				</div> -->
			
 
				 				<div class="echart-wrap">
			
 
				 					<trend-echart ref="incomeEchart" :chartData="incomeData.list"></trend-echart>
			
 
				 				</div>
			
 
				 			</div>
			
 
				 		</div>
			
 
				-		<!-- visitor -->
			
 
				-		<!-- <div class="card card-visitor">
			
 
				-			<div class="card-title">访问统计</div>
			
 
				-			<div class="card-body">
			
 
				-				<div class="echart-left-wrap">
			
 
				-					<div>
			
 
				-						<div>本月收入</div>
			
 
				-						<div class="num">{{ visitorData.month || 0 }}</div>
			
 
				-					</div>
			
 
				-					<div>
			
 
				-						<div>本周收入</div>
			
 
				-						<div class="num">{{ visitorData.week || 0 }}</div>
			
 
				-					</div>
			
 
				-				</div>
			
 
				-				<div class="echart-wrap">
			
 
				-					<div class="echart-tit">最近七天访问</div>
			
 
				-					<trend-echart ref="visitorEchart" :chartData="visitorData.list"></trend-echart>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-		</div>-->
			
 
				 		<!-- allTotal -->
			
 
				 		<div class="card all-total-wrap">
			
 
				 			<div class="card-title">总览</div>
			
@@ -120,33 +90,28 @@ export default {
 
				 			// 总数
			
 
				 			totalData: [
			
 
				 				{
			
 
				-					name: '访问量',
			
 
				-					icon: 'el-icon-s-data',
			
 
				-					val: 0
			
 
				+					name: '收入',
			
 
				+					icon: 'el-icon-s-marketing',
			
 
				+					val: '￥0.00',
			
 
				+					url: '/assets/list'
			
 
				 				},
			
 
				 				{
			
 
				-					name: '新客户',
			
 
				+					name: '开单',
			
 
				+					icon: 'el-icon-s-order',
			
 
				+					val: 0,
			
 
				+					url: '/order/list?status=-1'
			
 
				+				},
			
 
				+				{
			
 
				+					name: '访客',
			
 
				 					icon: 'el-icon-s-custom',
			
 
				 					val: 0,
			
 
				 					url: '/member/list'
			
 
				 				},
			
 
				 				{
			
 
				-					name: '新粉丝',
			
 
				+					name: '新学员',
			
 
				 					icon: 'el-icon-user',
			
 
				 					val: 0,
			
 
				 					url: '/member/list?type=1'
			
 
				-				},
			
 
				-				{
			
 
				-					name: '收入',
			
 
				-					icon: 'el-icon-s-marketing',
			
 
				-					val: '￥0.00',
			
 
				-					url: '/assets/list'
			
 
				-				},
			
 
				-				{
			
 
				-					name: '订单',
			
 
				-					icon: 'el-icon-s-order',
			
 
				-					val: 0,
			
 
				-					url: '/order/list?status=-1'
			
 
				 				}
			
 
				 			],
			
 
				 			// 待处理
			
@@ -275,11 +240,10 @@ export default {
 
				 					this.initChart();
			
 
				 				});
			
 
				 				// total
			
 
				-				this.totalData[0].val = res.todayData.visit;
			
 
				-				this.totalData[1].val = res.todayData.user;
			
 
				-				this.totalData[2].val = res.todayData.fans;
			
 
				-				this.totalData[3].val = `￥${res.todayData.income}`;
			
 
				-				this.totalData[4].val = res.todayData.order;
			
 
				+				this.totalData[0].val = `￥${res.todayData.income}`;
			
 
				+				this.totalData[1].val = res.todayData.order;
			
 
				+				this.totalData[2].val = res.todayData.visit;
			
 
				+				this.totalData[3].val = res.todayData.newStudent;
			
 
				 				//待处理事务
			
 
				 				this.pendingData[0].val = res.asset.unPayOrder;
			
 
				 				this.pendingData[1].val = res.asset.sendingOrder;
			
@@ -345,7 +309,7 @@ export default {
 
				 	.card-statistics {
			
 
				 		@include disFlex(center, space-between);
			
 
				 		.block {
			
 
				-			width: calc(19% - 40px);
			
 
				+			width: calc(25% - 60px);
			
 
				 			background-color: #fff;
			
 
				 			// height: 100px;
			
 
				 			padding: 20px;
			
@@ -523,4 +487,4 @@ export default {
 
				 		}
			
 
				 	}
			
 
				 }
			
 
				-</style>
			
 
				+</style>
			
--- a/hdApp/src/admin/billing/affirmPxClass.vue
+++ b/hdApp/src/admin/billing/affirmPxClass.vue
@@ -115,10 +115,6 @@ export default {
 
				 		...mapActions(["initMerchantInfo"]),
			
 
				 		affirmFormSubmit() {
			
 
				 			let pattern = /^1\d{10}$/;  //验证以1开头11位数
			
 
				-			if (this.clientInfo == '') {
			
 
				-				uni.showToast({title: '请选择客户', icon: 'none'});
			
 
				-				return;
			
 
				-			}
			
 
				 			if (this.name == '') {
			
 
				 				uni.showToast({title: '请输入姓名', icon: 'none'});
			
 
				 				return;
			
--- a/hdApp/src/admin/home/newStudent.vue
+++ b/hdApp/src/admin/home/newStudent.vue
@@ -30,19 +30,19 @@
 
				             class="status_apply"
			
 
				             v-if="item.status === '1'"
			
 
				             style="color: #09bb07;"
			
 
				-          >已报名</text>
			
 
				+          >待付款</text>
			
 
				           <text
			
 
				             class="status_apply"
			
 
				             style="color: #333333;"
			
 
				             v-if="item.status === '2'"
			
 
				-          >待付款</text>
			
 
				+          >已报名</text>
			
 
				         </view>
			
 
				         <view class="item_main">
			
 
				           <image :src="item.classFullCover"></image>
			
 
				           <view class="student_text">
			
 
				             <view class="_class">{{item.className}}</view>
			
 
				-            <view class="class_odd">课程单号：{{item.orderSn}} </view>
			
 
				-            <view class="class_odd">下单日期：{{item.applyTime.length > 10 ? item.applyTime.substr(0, 10) : item.applyTime}}</view>
			
 
				+            <view class="class_odd">单号：{{item.orderSn}} </view>
			
 
				+            <view class="class_odd">日期：{{item.applyTime.length > 10 ? item.applyTime.substr(0, 10) : item.applyTime}}</view>
			
 
				           </view>
			
 
				           <view class="price">¥985.80</view>
			
 
				         </view>
			
--- a/hdApp/src/admin/home/workbench.vue
+++ b/hdApp/src/admin/home/workbench.vue
@@ -13,13 +13,13 @@
 
				         <navigator url="/admin/home/order" open-type="switchTab" class="info-list">
			
 
				           <div class="info-list-name">开单</div>
			
 
				           <div class="info-list-value">
			
 
				-            {{ $util.numberFormat(data.todayData.visit) || 0 }}
			
 
				+            {{ $util.numberFormat(data.todayData.order) || 0 }}
			
 
				           </div>
			
 
				         </navigator>
			
 
				         <div class="info-list">
			
 
				-          <div class="info-list-name">新客</div>
			
 
				+          <div class="info-list-name">访客</div>
			
 
				           <div class="info-list-value">
			
 
				-            {{ $util.numberFormat(data.todayData.user) || 0 }}
			
 
				+            {{ $util.numberFormat(data.todayData.visit) || 0 }}
			
 
				           </div>
			
 
				         </div>
			
 
				         <div
			
@@ -28,7 +28,7 @@
 
				         >
			
 
				           <div class="info-list-name">新学员</div>
			
 
				           <div class="info-list-value">
			
 
				-            {{ $util.numberFormat(data.todayData.expend) || 0 }}
			
 
				+            {{ $util.numberFormat(data.todayData.newStudent) || 0 }}
			
 
				           </div>
			
 
				         </div>
			
 
				       </div>
			
--- a/hdApp/src/pagesShare/pay.vue
+++ b/hdApp/src/pagesShare/pay.vue
@@ -185,13 +185,13 @@ export default {
 
				       //       title: "点我付款",
			
 
				       //       desc: "享随机优惠，最高20元",
			
 
				       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxSharePay.jpg`,
			
 
				-      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`,
			
 
				+      //       pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`,
			
 
				       //       // #endif
			
 
				       //       // #ifndef H5
			
 
				       //       title: "",
			
 
				       //       desc: "享随机优惠，最高20元",
			
 
				       //       imgUrl: `${this.$constant.imgUrl}/retail/pay/wxPay.png`,
			
 
				-      //       pagePath: `/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`
			
 
				+      //       pagePath: `/pages/pay/index?account=${res.sjId}&store=0&sourceType=3&fromType=2`
			
 
				       //       // #endif
			
 
				       //     };
			
 
				       //     this.jweixinFn(shareParams);
			
--- a/mallApp/dist/build/h5/static/js/pages-home-index.ccad0580.js
+++ b/mallApp/dist/build/h5/static/js/pages-home-index.ccad0580.js
--- a/mallApp/dist/build/h5/static/js/pages-home-shop.2661d2b4.js
+++ b/mallApp/dist/build/h5/static/js/pages-home-shop.2661d2b4.js
--- a/mallApp/dist/build/h5/static/js/pages-interest-invite.1bd94b08.js
+++ b/mallApp/dist/build/h5/static/js/pages-interest-invite.1bd94b08.js
--- a/mallApp/dist/build/h5/static/js/pages-pay-index.a5962d01.js
+++ b/mallApp/dist/build/h5/static/js/pages-pay-index.a5962d01.js
--- a/mallApp/dist/build/mp-weixin/pages/home/shop.js
+++ b/mallApp/dist/build/mp-weixin/pages/home/shop.js
--- a/mallApp/dist/build/mp-weixin/pages/interest/invite.js
+++ b/mallApp/dist/build/mp-weixin/pages/interest/invite.js
--- a/mallApp/src/pages/home/shop.vue
+++ b/mallApp/src/pages/home/shop.vue
@@ -126,10 +126,10 @@ export default {
 
				           desc: "这家店不错推荐给你", // 分享内容
			
 
				           imgUrl: "",
			
 
				           // #ifdef H5
			
 
				-          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`,
			
 
				+          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`,
			
 
				           // #endif
			
 
				           // #ifndef H5
			
 
				-          pagePath: `/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`
			
 
				+          pagePath: `/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`
			
 
				           // #endif
			
 
				         };
			
 
				         this.jweixinFn(shareParams);
			
--- a/mallApp/src/pages/interest/invite.vue
+++ b/mallApp/src/pages/interest/invite.vue
@@ -163,10 +163,10 @@ export default {
 
				           desc: "这家店不错推荐给你", // 分享内容
			
 
				           imgUrl: res.smallAvatarUrl,
			
 
				           // #ifdef H5
			
 
				-          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`,
			
 
				+          pagePath: `${window.location.protocol}//mall.${this.$constant.firstHost}.com/#/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`,
			
 
				           // #endif
			
 
				           // #ifndef H5
			
 
				-          pagePath: `/pages/home/shop?account=${res.merchantId}&introUserId=${res.id}`
			
 
				+          pagePath: `/pages/home/shop?account=${res.sjId}&introUserId=${res.id}`
			
 
				           // #endif
			
 
				         };
			
 
				         this.jweixinFn(shareParams);
			
--- a/pt/dist/web/css/chunk-081c1c88.22f3d955.css
+++ b/pt/dist/web/css/chunk-081c1c88.22f3d955.css
--- a/pt/dist/web/css/chunk-332920e1.7512ed7e.css
+++ b/pt/dist/web/css/chunk-332920e1.7512ed7e.css
--- a/pt/dist/web/css/chunk-5f5de4ab.31519b1c.css
+++ b/pt/dist/web/css/chunk-5f5de4ab.31519b1c.css
--- a/pt/dist/web/css/chunk-618a77aa.d7e62169.css
+++ b/pt/dist/web/css/chunk-618a77aa.d7e62169.css
--- a/pt/dist/web/css/chunk-62faa402.5824481a.css
+++ b/pt/dist/web/css/chunk-62faa402.5824481a.css
--- a/pt/dist/web/css/chunk-634772bc.955a85a9.css
+++ b/pt/dist/web/css/chunk-634772bc.955a85a9.css
--- a/pt/dist/web/css/chunk-950192a4.e18595ea.css
+++ b/pt/dist/web/css/chunk-950192a4.e18595ea.css
--- a/pt/dist/web/index.html
+++ b/pt/dist/web/index.html
@@ -43,4 +43,4 @@
 
				 			.once .sub-title {
			
 
				 				color: #ababab;
			
 
				 				font-size: 12px;
			
 
				-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.9e10f031.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.9e10f031.js"></script></body></html>
			
 
				+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.aec85a47.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.aec85a47.js"></script></body></html>
			
--- a/pt/dist/web/js/app.9e10f031.js
+++ b/pt/dist/web/js/app.9e10f031.js
--- a/pt/dist/web/js/app.aec85a47.js
+++ b/pt/dist/web/js/app.aec85a47.js
--- a/pt/dist/web/js/chunk-081c1c88.99201cc5.js
+++ b/pt/dist/web/js/chunk-081c1c88.99201cc5.js
--- a/pt/dist/web/js/chunk-205a2464.b63272d3.js
+++ b/pt/dist/web/js/chunk-205a2464.b63272d3.js
--- a/pt/dist/web/js/chunk-2d22502b.2512bd18.js
+++ b/pt/dist/web/js/chunk-2d22502b.2512bd18.js
--- a/pt/dist/web/js/chunk-332920e1.097a2456.js
+++ b/pt/dist/web/js/chunk-332920e1.097a2456.js
--- a/pt/dist/web/js/chunk-5f5de4ab.d85b1b81.js
+++ b/pt/dist/web/js/chunk-5f5de4ab.d85b1b81.js
--- a/pt/dist/web/js/chunk-618a77aa.ec92d994.js
+++ b/pt/dist/web/js/chunk-618a77aa.ec92d994.js
--- a/pt/dist/web/js/chunk-62faa402.a28e0f27.js
+++ b/pt/dist/web/js/chunk-62faa402.a28e0f27.js
--- a/pt/dist/web/js/chunk-634772bc.30caa5b5.js
+++ b/pt/dist/web/js/chunk-634772bc.30caa5b5.js
--- a/pt/dist/web/js/chunk-950192a4.93436cd4.js
+++ b/pt/dist/web/js/chunk-950192a4.93436cd4.js
--- a/pt/src/Home.vue
+++ b/pt/src/Home.vue
@@ -1,6 +1,5 @@
 
				 <template>
			
 
				 	<div class="home">
			
 
				-
			
 
				 		<el-row :gutter="20" class="card-statistics" >
			
 
				 			<div v-for='(res,i) in statisticsList' :key='i' @click='toPageFun(res)'>
			
 
				 				<el-col :md="12" :xl="6" >
			
@@ -8,8 +7,8 @@
 
				 						<div class="val">
			
 
				 							<div class="left">
			
 
				 								<i v-if='res.id==1' class="el-icon-s-goods"></i>
			
 
				-								<i v-if='res.id==2' class="el-icon-s-flag"></i>
			
 
				 								<i v-if='res.id==3' class="el-icon-s-marketing"></i>
			
 
				+								<i v-if='res.id==2' class="el-icon-s-flag"></i>
			
 
				 								<i v-if='res.id==4' class="el-icon-s-custom"></i>
			
 
				 							</div>
			
 
				 							<div class="right">
			
@@ -21,41 +20,6 @@
 
				 				</el-col>
			
 
				 			</div>
			
 
				 		</el-row>
			
 
				-		<!--<div class="card card-visitor">-->
			
 
				-			<!--<p class="card-title">用户访客</p>-->
			
 
				-
			
 
				-			<!--<div class="card-body">-->
			
 
				-				<!--<echart1></echart1>-->
			
 
				-			<!--</div>-->
			
 
				-		<!--</div>-->
			
 
				-
			
 
				-		<!-- <div class="card card-plan">
			
 
				-			<p class="card-title">计划</p>
			
 
				-
			
 
				-			<div class="card-body">
			
 
				-				<x-crud @load="onCrudLoad">
			
 
				-					<template #table-column-process="{scope}">
			
 
				-						<el-progress
			
 
				-							:show-text="false"
			
 
				-							:stroke-width="6"
			
 
				-							:percentage="scope.row.process"
			
 
				-						></el-progress>
			
 
				-					</template>
			
 
				-
			
 
				-					<template #table-column-price="{scope}">
			
 
				-						<span>￥{{ scope.row.price }}</span>
			
 
				-					</template>
			
 
				-
			
 
				-					<template #table-column-salesRate="{scope}">
			
 
				-						<div :class="scope.row.salesStatus == 1 ? 'sales-top' : 'sales-bottom'">
			
 
				-							<span>{{ scope.row.salesRate }}%</span>
			
 
				-							<i class="el-icon-bottom" v-if="scope.row.salesStatus"></i>
			
 
				-							<i class="el-icon-top" v-else></i>
			
 
				-						</div>
			
 
				-					</template>
			
 
				-				</x-crud>
			
 
				-			</div>
			
 
				-		</div> -->
			
 
				 	</div>
			
 
				 </template>
			
 
				 
			
@@ -131,9 +95,8 @@ export default {
 
				 			this.$router.push({ path: '/assets/ptYeChange', query: { type: item.id }})
			
 
				 		},
			
 
				 		toDocs() {
			
 
				-			window.open('https://docs.x-admin.com/#/');
			
 
				+			window.open('');
			
 
				 		},
			
 
				-
			
 
				 		onCrudLoad({ ctx, app }) {
			
 
				 			ctx({
			
 
				 				service: this.$service.test,
			
@@ -235,7 +198,7 @@ export default {
 
				 			background-color: #fff;
			
 
				 			/*height: 60px;*/
			
 
				 			padding: 20px;
			
 
				-
			
 
				+			cursor:pointer;
			
 
				 			.val {
			
 
				 				display: flex;
			
 
				 				justify-content: space-between;
			
--- a/pt/src/saas/shop/apply.vue
+++ b/pt/src/saas/shop/apply.vue
@@ -78,7 +78,7 @@ export default {
 
				 		applyFn() {
			
 
				 			this.$service.saasShop.applyCheck(this.form).then(res => {
			
 
				 				this.app.refresh();
			
 
				-				this.$message.success('审核成功！');
			
 
				+				this.$message.success('操作成功');
			
 
				 				this.resetForm();
			
 
				 			});
			
 
				 		},
			
--- a/pt/src/saas/shop/list.vue
+++ b/pt/src/saas/shop/list.vue
@@ -384,7 +384,7 @@ export default {
 
				       switch (plamPayType) {
			
 
				         case 1: //微信
			
 
				           var data = {
			
 
				-            merchantId: this.form.merchantId,
			
 
				+            sjId: this.form.sjId,
			
 
				             wxPayMerchantId: this.form.wxPayMerchantId,
			
 
				             wxPayKey: this.form.wxPayKey
			
 
				           };
			
@@ -395,7 +395,7 @@ export default {
 
				           break;
			
 
				         case 2: //支付宝
			
 
				           var data = {
			
 
				-            merchantId: this.form.merchantId,
			
 
				+            sjId: this.form.sjId,
			
 
				             alipayPId: this.form.alipayPId,
			
 
				             alipayKey: this.form.alipayKey,
			
 
				             alipayPublicKey: this.form.alipayPublicKey
			
--- a/pt/src/store/modules/user.js
+++ b/pt/src/store/modules/user.js
@@ -57,7 +57,7 @@ export default {
 
				 			return host().then(res => {
			
 
				 				commit('SET_USERINFO', res);
			
 
				 				if (ProjectName == 'business') {
			
 
				-					localStorage.setItem('account', res.merchantId);
			
 
				+					localStorage.setItem('account', res.sjId);
			
 
				 				}
			
 
				 				return res;
			
 
				 			});
			
--- a/pt/src/views/home.vue
+++ b/pt/src/views/home.vue
@@ -8,7 +8,7 @@
 
				 				:key="index"
			
 
				 				@click="$util.pageTo(item)"
			
 
				 			>
			
 
				-				<div class="val">
			
 
				+				<div class="val show-link">
			
 
				 					<div class="left">
			
 
				 						<i :class="item.icon"></i>
			
 
				 					</div>
			
@@ -76,26 +76,7 @@
 
				 				</div>
			
 
				 			</div>
			
 
				 		</div>
			
 
				-		<!-- visitor -->
			
 
				-		<!-- <div class="card card-visitor">
			
 
				-			<div class="card-title">访问统计</div>
			
 
				-			<div class="card-body">
			
 
				-				<div class="echart-left-wrap">
			
 
				-					<div>
			
 
				-						<div>本月收入</div>
			
 
				-						<div class="num">{{ visitorData.month || 0 }}</div>
			
 
				-					</div>
			
 
				-					<div>
			
 
				-						<div>本周收入</div>
			
 
				-						<div class="num">{{ visitorData.week || 0 }}</div>
			
 
				-					</div>
			
 
				-				</div>
			
 
				-				<div class="echart-wrap">
			
 
				-					<div class="echart-tit">最近七天访问</div>
			
 
				-					<trend-echart ref="visitorEchart" :chartData="visitorData.list"></trend-echart>
			
 
				-				</div>
			
 
				-			</div>
			
 
				-		</div> -->
			
 
				+
			
 
				 		<!-- allTotal -->
			
 
				 		<div class="card all-total-wrap">
			
 
				 			<div class="card-title">总览</div>
			
@@ -132,7 +113,6 @@ export default {
 
				 	components: {
			
 
				 		TrendEchart
			
 
				 	},
			
 
				-
			
 
				 	data() {
			
 
				 		return {
			
 
				 			// 总数
			
@@ -239,10 +219,6 @@ export default {
 
				 					icon: 'iconguanggao',
			
 
				 					url: 'ad/list'
			
 
				 				}
			
 
				-				// {
			
 
				-				// 	name: '拼团管理',
			
 
				-				// 	path: ''
			
 
				-				// }
			
 
				 			],
			
 
				 			// 总统计
			
 
				 			allTotalData: [
			
@@ -423,6 +399,9 @@ export default {
 
				 					}
			
 
				 				}
			
 
				 			}
			
 
				+			.show-link {
			
 
				+				cursor: pointer;
			
 
				+			}
			
 
				 		}
			
 
				 	}
			
 
				 
			
@@ -484,10 +463,6 @@ export default {
 
				 				text-align: center;
			
 
				 				margin-bottom: 10px;
			
 
				 				font-size:14px;
			
 
				-				// &:hover {
			
 
				-				// 	color: $mainColor;
			
 
				-				// 	cursor: pointer;
			
 
				-				// }
			
 
				 				.num {
			
 
				 					font-size: 24px;
			
 
				 					margin-bottom: 10px;
			
@@ -548,4 +523,4 @@ export default {
 
				 		}
			
 
				 	}
			
 
				 }
			
 
				-</style>
			
 
				+</style>