Inicio Explorar Axuda
Rexistro Iniciar sesión
zhh
/
front-end
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge branch 'master' of http://git.huaml.com/zhh/front-end

jf %!s(int64=5) %!d(string=hai) anos
pai
55be8239ca 629e49aae6
achega
40d13b3837
Modificáronse 91 ficheiros con 262 adicións e 267 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 0 0
      ghs/dist/shop/css/chunk-54201642.0a1b2e89.css
  2. 0 0
      ghs/dist/shop/css/chunk-a93480a2.8e6572e9.css
  3. 1 1
      ghs/dist/shop/index.html
  4. 0 0
      ghs/dist/shop/js/app.27c8fb55.js
  5. 0 0
      ghs/dist/shop/js/app.faadb6c5.js
  6. 0 0
      ghs/dist/shop/js/chunk-0a424188.f9753792.js
  7. 0 0
      ghs/dist/shop/js/chunk-1c00496a.592ac58d.js
  8. 0 1
      ghs/dist/shop/js/chunk-2d0d70b6.31e86770.js
  9. 1 0
      ghs/dist/shop/js/chunk-2d0d70b6.ee714380.js
  10. 0 0
      ghs/dist/shop/js/chunk-399898c4.1a8c20fd.js
  11. 0 0
      ghs/dist/shop/js/chunk-52dfc438.161b726c.js
  12. 0 0
      ghs/dist/shop/js/chunk-52dfc438.212a89cb.js
  13. 0 0
      ghs/dist/shop/js/chunk-54201642.1989e922.js
  14. 0 0
      ghs/dist/shop/js/chunk-5ef69cd8.91822bfd.js
  15. 0 0
      ghs/dist/shop/js/chunk-7b4c135e.799d2479.js
  16. 0 0
      ghs/dist/shop/js/chunk-7f4a453c.1d96f002.js
  17. 0 0
      ghs/dist/shop/js/chunk-7f4a453c.efd786d7.js
  18. 0 0
      ghs/dist/shop/js/chunk-a93480a2.7e056c5e.js
  19. 2 2
      ghs/src/sass/shop/list.vue
  20. 1 1
      ghs/src/store/modules/user.js
  21. 11 6
      ghs/src/views/order/list.vue
  22. 1 1
      ghsApp/src/admin/ghs/shop.vue
  23. 2 2
      ghsApp/src/pagesShare/pay.vue
  24. 0 1
      ghsApp/src/pagesStorehouse/allot/addExDetails.vue
  25. 0 0
      hd/dist/shop/css/chunk-114b8f40.acc13efa.css
  26. 0 0
      hd/dist/shop/css/chunk-18c12157.a11e9d3c.css
  27. 0 0
      hd/dist/shop/css/chunk-793a8f5e.350c9761.css
  28. 0 0
      hd/dist/shop/css/chunk-7e3e8376.dc6c4ad0.css
  29. 1 1
      hd/dist/shop/index.html
  30. 0 0
      hd/dist/shop/js/app.108f0c8e.js
  31. 0 0
      hd/dist/shop/js/app.72de0063.js
  32. 0 0
      hd/dist/shop/js/chunk-114b8f40.40205547.js
  33. 0 0
      hd/dist/shop/js/chunk-16566f8a.34fff30f.js
  34. 0 0
      hd/dist/shop/js/chunk-18c12157.09b8e45d.js
  35. 0 1
      hd/dist/shop/js/chunk-2d0d70b6.86661c7b.js
  36. 1 0
      hd/dist/shop/js/chunk-2d0d70b6.b459e94c.js
  37. 0 0
      hd/dist/shop/js/chunk-52dfc438.03d357ee.js
  38. 0 0
      hd/dist/shop/js/chunk-52dfc438.37aa3798.js
  39. 0 0
      hd/dist/shop/js/chunk-5ef69cd8.355c758a.js
  40. 0 0
      hd/dist/shop/js/chunk-793a8f5e.01387867.js
  41. 0 0
      hd/dist/shop/js/chunk-7e3e8376.b9624ef8.js
  42. 0 0
      hd/dist/shop/js/chunk-7f4a453c.8f9cba5d.js
  43. 0 0
      hd/dist/shop/js/chunk-7f4a453c.d3e9cb95.js
  44. 2 2
      hd/src/sass/shop/list.vue
  45. 1 1
      hd/src/store/modules/user.js
  46. 18 54
      hd/src/views/home.vue
  47. 12 7
      hd/src/views/order/list.vue
  48. 0 4
      hdApp/src/admin/billing/affirmPxClass.vue
  49. 4 4
      hdApp/src/admin/home/newStudent.vue
  50. 4 4
      hdApp/src/admin/home/workbench.vue
  51. 2 2
      hdApp/src/pagesShare/pay.vue
  52. 0 0
      mallApp/dist/build/h5/static/js/pages-home-index.ccad0580.js
  53. 0 0
      mallApp/dist/build/h5/static/js/pages-home-shop.2661d2b4.js
  54. 0 0
      mallApp/dist/build/h5/static/js/pages-interest-invite.1bd94b08.js
  55. 0 0
      mallApp/dist/build/h5/static/js/pages-pay-index.a5962d01.js
  56. 0 0
      mallApp/dist/build/mp-weixin/pages/home/shop.js
  57. 0 0
      mallApp/dist/build/mp-weixin/pages/interest/invite.js
  58. 2 2
      mallApp/src/pages/home/shop.vue
  59. 2 2
      mallApp/src/pages/interest/invite.vue
  60. 0 0
      pt/dist/web/css/chunk-081c1c88.22f3d955.css
  61. 0 0
      pt/dist/web/css/chunk-133a8271.5824481a.css
  62. 0 0
      pt/dist/web/css/chunk-332920e1.7512ed7e.css
  63. 0 0
      pt/dist/web/css/chunk-5f5de4ab.31519b1c.css
  64. 0 0
      pt/dist/web/css/chunk-618a77aa.d7e62169.css
  65. 0 0
      pt/dist/web/css/chunk-634772bc.955a85a9.css
  66. 0 0
      pt/dist/web/css/chunk-6e128072.50137708.css
  67. 1 1
      pt/dist/web/index.html
  68. 0 0
      pt/dist/web/js/app.7710cbaa.js
  69. 0 0
      pt/dist/web/js/app.aec85a47.js
  70. 0 0
      pt/dist/web/js/chunk-081c1c88.99201cc5.js
  71. 0 0
      pt/dist/web/js/chunk-133a8271.c6917b8b.js
  72. 0 0
      pt/dist/web/js/chunk-205a2464.b63272d3.js
  73. 0 0
      pt/dist/web/js/chunk-22bc7a56.7248e7ca.js
  74. 0 0
      pt/dist/web/js/chunk-22bc7a56.d0811fd2.js
  75. 0 0
      pt/dist/web/js/chunk-2d0b3109.19b71dd4.js
  76. 0 0
      pt/dist/web/js/chunk-2d0bd94e.f19acd83.js
  77. 0 0
      pt/dist/web/js/chunk-2d216797.f644b580.js
  78. 0 0
      pt/dist/web/js/chunk-2d22502b.2512bd18.js
  79. 0 0
      pt/dist/web/js/chunk-2d2385e5.d01b9e28.js
  80. 0 0
      pt/dist/web/js/chunk-332920e1.097a2456.js
  81. 0 0
      pt/dist/web/js/chunk-5f5de4ab.d85b1b81.js
  82. 0 0
      pt/dist/web/js/chunk-618a77aa.ec92d994.js
  83. 0 0
      pt/dist/web/js/chunk-634772bc.30caa5b5.js
  84. 0 0
      pt/dist/web/js/chunk-6e128072.9c11e4f8.js
  85. 3 40
      pt/src/Home.vue
  86. 1 1
      pt/src/saas/shop/apply.vue
  87. 2 2
      pt/src/saas/shop/list.vue
  88. 91 11
      pt/src/saas/shop/shop.vue
  89. 89 81
      pt/src/service/saas/shop/index.js
  90. 1 1
      pt/src/store/modules/user.js
  91. 6 31
      pt/src/views/home.vue

+ 0 - 0
ghs/dist/shop/css/chunk-7b4c135e.0a1b2e89.css → ghs/dist/shop/css/chunk-54201642.0a1b2e89.css
Ver ficheiro


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/css/chunk-a93480a2.8e6572e9.css


+ 1 - 1
ghs/dist/shop/index.html
Ver ficheiro 

@@ -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 diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/app.27c8fb55.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/app.faadb6c5.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-0a424188.f9753792.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-1c00496a.592ac58d.js


+ 0 - 1
ghs/dist/shop/js/chunk-2d0d70b6.31e86770.js
Ver ficheiro 

@@ -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}}]);

+ 1 - 0
ghs/dist/shop/js/chunk-2d0d70b6.ee714380.js
Ver ficheiro 

@@ -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 diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-399898c4.1a8c20fd.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-52dfc438.161b726c.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-52dfc438.212a89cb.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-54201642.1989e922.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-5ef69cd8.91822bfd.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-7b4c135e.799d2479.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-7f4a453c.1d96f002.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-7f4a453c.efd786d7.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ghs/dist/shop/js/chunk-a93480a2.7e056c5e.js


+ 2 - 2
ghs/src/sass/shop/list.vue
Ver ficheiro 

@@ -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

+ 1 - 1
ghs/src/store/modules/user.js
Ver ficheiro 

@@ -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;
 
 			});

+ 11 - 6
ghs/src/views/order/list.vue
Ver ficheiro 

@@ -17,7 +17,6 @@
 
       <template #table-column-orderSn="{scope}">
 
         <el-link
 
             :underline="true"
 
-            @click="detailShowFn(scope.row)"
 
             style="font-size:12px;display:inline-block;"
 
         >{{ scope.row.orderSn }}</el-link>
 
       </template>
 
@@ -57,20 +56,20 @@
 
               <el-button v-if="res.type=='item'&&res.show==1&&res.disable==0" size="small">该花材</el-button>
 
               <el-button v-if="res.type=='item'&&res.show==1&&res.disable==1" size="small" disabled>该花材</el-button>
 
 
-              <el-button v-if="res.type=='send'&&res.show==1&&res.disable==0" @click="shipDrawFn(scope.row)" size="mini" type="primary" plain >发货</el-button>
 
+              <el-button v-if="res.type=='send'&&res.show==1&&res.disable==0" @click.stop="shipDrawFn(scope.row)" size="mini" type="primary" plain >发货</el-button>
 
               <el-button v-if="res.type=='send'&&res.show==1&&res.disable==1" disabled size="mini" type="primary" plain >发货</el-button>
 
 
               <el-popover v-if="res.type=='selfGet'&&res.show==1&&res.disable==0" style="margin-left:14px;" placement="top" width="160" :ref="'popover-' + scope.row.id">
 
                 <p>确认已自取？</p>
 
                 <div style="text-align: right; margin: 0">
 
-                  <el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>
 
-                  <el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>
 
+                  <el-button size="mini" type="text" @click.stop="selfGetCancel(scope.row.id)">取消</el-button>
 
+                  <el-button type="primary" size="mini" @click.stop="noSendShipFn(scope.row)">确定</el-button>
 
                 </div>
 
-                <el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
 
+                <el-button slot="reference" size="mini" type="primary" plain @click.stop="">自取</el-button>
 
               </el-popover>
 
               <el-button v-if="res.type=='selfGet'&&res.show==1&&res.disable==1" style="margin-left:14px;" size="small" disabled>自取</el-button>
 
 
-              <el-button v-if="res.type=='print'&&res.show==1&&res.disable==0" @click="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
 
+              <el-button v-if="res.type=='print'&&res.show==1&&res.disable==0" @click.stop="printOrder(scope.row)" size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
 
               <el-button v-if="res.type=='print'&&res.show==1&&res.disable==1" disabled size="mini" type="primary" plain style="margin-left:14px;">打印</el-button>
 
             </div>
 
           </div>
 
@@ -340,6 +339,12 @@ export default {
 
               }
 
             ],
 
 
+            on: {
 
+              'row-click': (row, column) => {
 
+                this.detailShowFn(row)
 
+              }
 
+            },
 
+
 
             props: {
 
               'default-sort': {
 
                 prop: 'createTime',

+ 1 - 1
ghsApp/src/admin/ghs/shop.vue
Ver ficheiro 

@@ -6,7 +6,7 @@
 
 						<image :src="item.avatar"></image>
 
 					<view class="list-msg">
 
 							<view>{{item.name}}</view>
 
-							<text>累计采购 {{item.expendAmount}}</text>
 
+							<text>已采购 {{item.expendAmount}}</text>
 
 					</view>
 
 				</view>
 
 			</view>

+ 2 - 2
ghsApp/src/pagesShare/pay.vue
Ver ficheiro 

@@ -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);

+ 0 - 1
ghsApp/src/pagesStorehouse/allot/addExDetails.vue
Ver ficheiro 

@@ -84,7 +84,6 @@
 
 				</button>
 
 			</view>
 
 		</view>
 
-    <kd-entrance></kd-entrance>
 
 	</view>
 
 </template>
 
 <script>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/css/chunk-114b8f40.acc13efa.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/css/chunk-18c12157.a11e9d3c.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/css/chunk-793a8f5e.350c9761.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/css/chunk-7e3e8376.dc6c4ad0.css


+ 1 - 1
hd/dist/shop/index.html
Ver ficheiro 

@@ -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 diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/app.108f0c8e.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/app.72de0063.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-114b8f40.40205547.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-16566f8a.34fff30f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-18c12157.09b8e45d.js


+ 0 - 1
hd/dist/shop/js/chunk-2d0d70b6.86661c7b.js
Ver ficheiro 

@@ -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}}]);

+ 1 - 0
hd/dist/shop/js/chunk-2d0d70b6.b459e94c.js
Ver ficheiro 

@@ -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 diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-52dfc438.03d357ee.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-52dfc438.37aa3798.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-5ef69cd8.355c758a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-793a8f5e.01387867.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-7e3e8376.b9624ef8.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-7f4a453c.8f9cba5d.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
hd/dist/shop/js/chunk-7f4a453c.d3e9cb95.js


+ 2 - 2
hd/src/sass/shop/list.vue
Ver ficheiro 

@@ -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

+ 1 - 1
hd/src/store/modules/user.js
Ver ficheiro 

@@ -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;
 
 			});

+ 18 - 54
hd/src/views/home.vue
Ver ficheiro 

@@ -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>

+ 12 - 7
hd/src/views/order/list.vue
Ver ficheiro 

@@ -17,7 +17,6 @@
 
 			<template #table-column-orderSn="{scope}">
 
 				<el-link
 
 					:underline="true"
 
-					@click="detailShowFn(scope.row)"
 
 					style="font-size:12px;display:inline-block;"
 
 				>{{ scope.row.orderSn }}</el-link>
 
 			</template>
 
@@ -59,7 +58,7 @@
 
 
 			<!-- 进度 -->
 
 			<template #table-column-currentFlow="{scope}">
 
-				<div class="steps-wrap" @click="shipDrawFn(scope.row)" style="cursor:pointer;">
 
+				<div class="steps-wrap" @click.stop="shipDrawFn(scope.row)" style="cursor:pointer;">
 
 					<el-steps
 
 						:space="200"
 
 						:active="parseInt(scope.row.currentFlow)"
 
@@ -101,14 +100,14 @@
 
 						<el-popover placement="top" width="160" :ref="'popover-' + scope.row.id">
 
 							<p>确认已自取？</p>
 
 							<div style="text-align: right; margin: 0">
 
-								<el-button size="mini" type="text" @click="selfGetCancel(scope.row.id)">取消</el-button>
 
-								<el-button type="primary" size="mini" @click="noSendShipFn(scope.row)">确定</el-button>
 
+								<el-button size="mini" type="text" @click.stop="selfGetCancel(scope.row.id)">取消</el-button>
 
+								<el-button type="primary" size="mini" @click.stop="noSendShipFn(scope.row)">确定</el-button>
 
 							</div>
 
-							<el-button slot="reference" size="mini" type="primary" plain>自取</el-button>
 
+							<el-button slot="reference" size="mini" type="primary" plain @click.stop="">自取</el-button>
 
 						</el-popover>
 
 
 						<el-button
 
-							@click="shipDrawFn(scope.row)"
 
+							@click.stop="shipDrawFn(scope.row)"
 
 							size="mini"
 
 							type="primary"
 
 							plain
 
@@ -116,7 +115,7 @@
 
 						>发货</el-button>
 
 					</template>
 
 					<template v-else>
 
-						<el-button size="mini" type="primary" plain @click="shipDrawFn(scope.row)">发货</el-button>
 
+						<el-button size="mini" type="primary" plain @click.stop="shipDrawFn(scope.row)">发货</el-button>
 
 					</template>
 
 				</template>
 
 			</template>
 
@@ -305,6 +304,12 @@ export default {
 
 						}
 
 					],
 
 
+          on: {
 
+						'row-click': (row, column) => {
 
+							this.detailShowFn(row)
 
+						}
 
+					},
 
+
 
 					props: {
 
 						'default-sort': {
 
 							prop: 'createTime',

+ 0 - 4
hdApp/src/admin/billing/affirmPxClass.vue
Ver ficheiro 

@@ -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;

+ 4 - 4
hdApp/src/admin/home/newStudent.vue
Ver ficheiro 

@@ -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>

+ 4 - 4
hdApp/src/admin/home/workbench.vue
Ver ficheiro 

@@ -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>

+ 2 - 2
hdApp/src/pagesShare/pay.vue
Ver ficheiro 

@@ -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 diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
mallApp/dist/build/h5/static/js/pages-home-index.ccad0580.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
mallApp/dist/build/h5/static/js/pages-home-shop.2661d2b4.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
mallApp/dist/build/h5/static/js/pages-interest-invite.1bd94b08.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
mallApp/dist/build/h5/static/js/pages-pay-index.a5962d01.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
mallApp/dist/build/mp-weixin/pages/home/shop.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
mallApp/dist/build/mp-weixin/pages/interest/invite.js


+ 2 - 2
mallApp/src/pages/home/shop.vue
Ver ficheiro 

@@ -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);

+ 2 - 2
mallApp/src/pages/interest/invite.vue
Ver ficheiro 

@@ -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 diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/css/chunk-081c1c88.22f3d955.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/css/chunk-133a8271.5824481a.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/css/chunk-332920e1.7512ed7e.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/css/chunk-5f5de4ab.31519b1c.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/css/chunk-618a77aa.d7e62169.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/css/chunk-634772bc.955a85a9.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/css/chunk-6e128072.50137708.css


+ 1 - 1
pt/dist/web/index.html
Ver ficheiro 

@@ -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.7710cbaa.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.7710cbaa.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 diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/app.7710cbaa.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/app.aec85a47.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-081c1c88.99201cc5.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-133a8271.c6917b8b.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-205a2464.b63272d3.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-22bc7a56.7248e7ca.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-22bc7a56.d0811fd2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-2d0b3109.19b71dd4.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-2d0bd94e.f19acd83.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-2d216797.f644b580.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-2d22502b.2512bd18.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-2d2385e5.d01b9e28.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-332920e1.097a2456.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-5f5de4ab.d85b1b81.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-618a77aa.ec92d994.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-634772bc.30caa5b5.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pt/dist/web/js/chunk-6e128072.9c11e4f8.js


+ 3 - 40
pt/src/Home.vue
Ver ficheiro 

@@ -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;

+ 1 - 1
pt/src/saas/shop/apply.vue
Ver ficheiro 

@@ -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();
 
 			});
 
 		},

+ 2 - 2
pt/src/saas/shop/list.vue
Ver ficheiro 

@@ -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

+ 91 - 11
pt/src/saas/shop/shop.vue
Ver ficheiro 

@@ -17,10 +17,56 @@
 
             <template #table-column-gatheringCode="{scope}">
 
                 <el-button type="text" @click="gotoPage(1,scope.row)">查看</el-button>
 
             </template>
 
+            <!-- 充值 -->
 
+            <template #slot-apply="{scope}">
 
+              <el-button type="text" @click="topUp(scope.row.shopName, scope.row.id)">充值</el-button>
 
+            </template>
 
         </x-crud>
 
         <!-- 用户详情 -->
 
         <balance-detail v-if='showBalanceDetail' @closeFn='showBalanceDetail = false' ref="balanceDetail" :orderOperate="optionData" />
 
         <amount-detail v-if='showAmountDetail' @closeFn='showAmountDetail = false' ref="amountDetail" :orderOperate="optionData" />
 
+        <el-dialog :visible.sync="wxPayDialog" :close-on-click-modal="false" width="500px" >
 
+        <el-form
 
+          :model="topForm"
 
+          :rules="ruleForm"
 
+          ref="adForm"
 
+          label-width="80px"
 
+          class="demo-form"
 
+        >
 
+        <el-form-item
 
+            label="充值门店"
 
+            style="text-align: left;"
 
+          >
 
+            <span>{{dialogTitle}}</span>
 
+          </el-form-item>
 
+          <el-form-item
 
+            label="充值金额"
 
+            prop="amount"
 
+            style="text-align: left;"
 
+          >
 
+            <el-input
 
+              placeholder="请输入充值金额"
 
+              size="small"
 
+              v-model="topForm.amount"
 
+            ></el-input>
 
+          </el-form-item>
 
+          <el-form-item
 
+            label="登录密码"
 
+            prop="password"
 
+            style="text-align: left;"
 
+          >
 
+            <el-input
 
+              placeholder="请输入登录密码"
 
+              size="small"
 
+              v-model="topForm.password"
 
+            ></el-input>
 
+          </el-form-item>
 
+        </el-form>
 
+          <div slot="footer" class="dialog-footer">
 
+            <el-button size="small" @click="resetForm">取 消</el-button>
 
+            <el-button type="primary" size="small" @click="submitForm">确认</el-button>
 
+          </div>
 
+        </el-dialog>
 
     </div>
 
 </template>
 
 
@@ -36,6 +82,17 @@
 
                 showBalanceDetail: false,
 
                 showAmountDetail: false,
 
                 optionData: {},
 
+                wxPayDialog: false,
 
+                dialogTitle: '',
 
+                topForm: {
 
+                  shopId: '',
 
+                  amount: '',
 
+                  password: '',
 
+                },
 
+                ruleForm: {
 
+                  amount: [{ required: true, message: '请输入充值金额', trigger: 'blur' }],
 
+                  password: [{ required: true, message: '请输入登录密码', trigger: 'blur' }],
 
+                }
 
             };
 
         },
 
         mounted() {
 
@@ -124,16 +181,16 @@
 
                         ],
 
                         // 操作列
 
                         op: {
 
-                            visible: true, // 是否显示
 
-                            // 同 element-ui Table-column Attributes
 
-                            props: {
 
-                                width: 150,
 
-                                align: 'center',
 
-                                fixed: 'right',
 
-                                label: '操作'
 
-                            },
 
-                            // 布局，请移步 `layout`
 
-                            layout: []
 
+                          visible: true, // 是否显示
 
+                          // 同 element-ui Table-column Attributes
 
+                          props: {
 
+                            width: 100,
 
+                            align: 'center',
 
+                            fixed: 'right',
 
+                            label: '操作'
 
+                          },
 
+                          // 布局，请移步 `layout`
 
+                          layout: ['slot-apply']
 
                         }
 
                     })
 
                     .set('layout', [
 
@@ -145,7 +202,30 @@
 
                     .done();
 
                 app.refresh();
 
             },
 
-
 
+            // 充值
 
+            topUp(name, id) {
 
+              this.dialogTitle = name
 
+              this.topForm.shopId = id
 
+              this.wxPayDialog = true
 
+            },
 
+             resetForm () {
 
+              this.$refs['adForm'].resetFields();
 
+              this.wxPayDialog = false;
 
+            },
 
+            submitForm () {
 
+              this.$refs['adForm'].validate(valid => {
 
+                if (valid) {
 
+                  this.$service.saasShop.rechargeBalance(this.topForm).then(res => {
 
+                    this.$message.success('操作成功')
 
+                    this.wxPayDialog = false
 
+                    this.app.refresh()
 
+                  })
 
+                } else {
 
+                  console.log('error submit!!');
 
+                  return false;
 
+                }
 
+              });
 
+            },
 
             detailShowFn(item){
 
                 this.optionData = item;
 
                 this.showBalanceDetail = true;

+ 89 - 81
pt/src/service/saas/shop/index.js
Ver ficheiro 

@@ -1,96 +1,104 @@
 
 import { BaseService, Service } from '@/cool';
 
 
 export class ShopService extends BaseService {
 
-	// 商家列表 s
 
-	merchantList(data) {
 
-		return this.request({
 
-			url: '/merchant/list',
 
-			params: data
 
-		});
 
-	}
 
+    // 商家列表 s
 
+    merchantList(data) {
 
+        return this.request({
 
+            url: '/merchant/list',
 
+            params: data
 
+        });
 
+    }
 
 
-	// 注销商家
 
-	merchantCancel(data) {
 
-		return this.request({
 
-			url: '/merchant/cancel',
 
-			params: data
 
-		});
 
-	}
 
+    // 注销商家
 
+    merchantCancel(data) {
 
+        return this.request({
 
+            url: '/merchant/cancel',
 
+            params: data
 
+        });
 
+    }
 
 
-	// 商家申请记录 s
 
-	applyList(data) {
 
-		return this.request({
 
-			url: '/apply/list',
 
-			params: data
 
-		});
 
-	}
 
+    // 商家申请记录 s
 
+    applyList(data) {
 
+        return this.request({
 
+            url: '/apply/list',
 
+            params: data
 
+        });
 
+    }
 
 
-	// 商家申请审核 s
 
-	applyCheck(data) {
 
-		return this.request({
 
-			url: '/apply/check',
 
-			method: 'POST',
 
-			data: data
 
-		});
 
-	}
 
+    // 商家申请审核 s
 
+    applyCheck(data) {
 
+        return this.request({
 
+            url: '/apply/check',
 
+            method: 'POST',
 
+            data: data
 
+        });
 
+    }
 
 
-	// 门店列表 b
 
-	shopList(data) {
 
-		return this.request({
 
-			url: '/shop/list',
 
-			params: data
 
-		});
 
-	}
 
+    // 门店列表 b
 
+    shopList(data) {
 
+        return this.request({
 
+            url: '/shop/list',
 
+            params: data
 
+        });
 
+    }
 
 
-	// 购买列表 b
 
-	buyList(data) {
 
-		return this.request({
 
-			url: '/renew/list',
 
-			params: data
 
-		});
 
-	}
 
+    // 购买列表 b
 
+    buyList(data) {
 
+        return this.request({
 
+            url: '/renew/list',
 
+            params: data
 
+        });
 
+    }
 
 
-	// 小程序升级记录 s
 
-	upgradeList(data) {
 
-		return this.request({
 
-			url: '/mini-upgrade/list',
 
-			params: data
 
-		});
 
-	}
 
+    // 小程序升级记录 s
 
+    upgradeList(data) {
 
+        return this.request({
 
+            url: '/mini-upgrade/list',
 
+            params: data
 
+        });
 
+    }
 
 
-	// 小程序更新版本 s
 
-	upgradeUpdate(data) {
 
-		return this.request({
 
-			url: '/mini-upgrade/update',
 
-			params: data
 
-		});
 
-	}
 
+    // 小程序更新版本 s
 
+    upgradeUpdate(data) {
 
+        return this.request({
 
+            url: '/mini-upgrade/update',
 
+            params: data
 
+        });
 
+    }
 
 
-	//商家拓展信息 s
 
-	merchantExtend(data) {
 
-		return this.request({
 
-			url: '/merchant-extend/detail',
 
-			params: data
 
-		});
 
-	}
 
+    //商家拓展信息 s
 
+    merchantExtend(data) {
 
+        return this.request({
 
+            url: '/merchant-extend/detail',
 
+            params: data
 
+        });
 
+    }
 
 
-	// 微信支付设置 s
 
-	setWxPay(data) {
 
-		return this.request({
 
-			url: '/merchant-extend/set-wx-pay',
 
-			data,
 
-			method: 'POST'
 
-		});
 
-	}
 
+    // 微信支付设置 s
 
+    setWxPay(data) {
 
+        return this.request({
 
+            url: '/merchant-extend/set-wx-pay',
 
+            data,
 
+            method: 'POST'
 
+        });
 
+    }
 
 
-	// 支付宝支付设置 s
 
-	setAlipa(data) {
 
-		return this.request({
 
-			url: '/merchant-extend/set-alipay',
 
-			data,
 
-			method: 'POST'
 
-		});
 
-	}
 
+    // 支付宝支付设置 s
 
+    setAlipa(data) {
 
+        return this.request({
 
+            url: '/merchant-extend/set-alipay',
 
+            data,
 
+            method: 'POST'
 
+        });
 
+    }
 
+
 
+    // 门店充值 w
 
+    rechargeBalance(data) {
 
+        return this.request({
 
+            url: '/recharge/balance',
 
+            params: data,
 
+        });
 
+    }
 
 }
 
 
-export default new ShopService();
 
+export default new ShopService();

+ 1 - 1
pt/src/store/modules/user.js
Ver ficheiro 

@@ -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;
 
 			});

+ 6 - 31
pt/src/views/home.vue
Ver ficheiro 

@@ -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>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio