6 лет назад · f13bd682ec
--- a/mall/src/pages/pay/index.vue
+++ b/mall/src/pages/pay/index.vue
@@ -201,13 +201,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`,
														
 
															+            pagePath: `${this.$constant.formal}/#/pages/pay/index?account=${res.merchantId}&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`
														
 
															+            pagePath: `/pages/pay/index?account=${res.merchantId}&store=0&sourceType=3&fromType=2`
														
 
															             // #endif
														
 
															           };
														
 
															           this.jweixinFn(shareParams);
														
--- a/shop/dist/shop/cdn/Mock.js/1.0.1-beta3/mock-min.js
+++ b/shop/dist/shop/cdn/Mock.js/1.0.1-beta3/mock-min.js
--- a/shop/dist/shop/cdn/axios/0.19.0-beta.1/axios.min.js
+++ b/shop/dist/shop/cdn/axios/0.19.0-beta.1/axios.min.js
--- a/shop/dist/shop/cdn/clipboard.js/2.0.4/clipboard.min.js
+++ b/shop/dist/shop/cdn/clipboard.js/2.0.4/clipboard.min.js
--- a/shop/dist/shop/cdn/echarts/4.4.0-rc.1/echarts.min.js
+++ b/shop/dist/shop/cdn/echarts/4.4.0-rc.1/echarts.min.js
--- a/shop/dist/shop/cdn/element-ui/2.13.0/index.js
+++ b/shop/dist/shop/cdn/element-ui/2.13.0/index.js
--- a/shop/dist/shop/cdn/element-ui/2.13.0/theme-chalk/fonts/element-icons.ttf
+++ b/shop/dist/shop/cdn/element-ui/2.13.0/theme-chalk/fonts/element-icons.ttf
--- a/shop/dist/shop/cdn/element-ui/2.13.0/theme-chalk/fonts/element-icons.woff
+++ b/shop/dist/shop/cdn/element-ui/2.13.0/theme-chalk/fonts/element-icons.woff
--- a/shop/dist/shop/cdn/element-ui/2.13.0/theme-chalk/index.css
+++ b/shop/dist/shop/cdn/element-ui/2.13.0/theme-chalk/index.css
--- a/shop/dist/shop/cdn/npm/vue-echarts@4.0.2.js
+++ b/shop/dist/shop/cdn/npm/vue-echarts@4.0.2.js
--- a/shop/dist/shop/cdn/nprogress/0.2.0/nprogress.min.css
+++ b/shop/dist/shop/cdn/nprogress/0.2.0/nprogress.min.css
@@ -1 +0,0 @@
 
															-#nprogress{pointer-events:none}#nprogress .bar{background:#29d;position:fixed;z-index:1031;top:0;left:0;width:100%;height:2px}#nprogress .peg{display:block;position:absolute;right:0;width:100px;height:100%;box-shadow:0 0 10px #29d,0 0 5px #29d;opacity:1;-webkit-transform:rotate(3deg) translate(0,-4px);-ms-transform:rotate(3deg) translate(0,-4px);transform:rotate(3deg) translate(0,-4px)}#nprogress .spinner{display:block;position:fixed;z-index:1031;top:15px;right:15px}#nprogress .spinner-icon{width:18px;height:18px;box-sizing:border-box;border:2px solid transparent;border-top-color:#29d;border-left-color:#29d;border-radius:50%;-webkit-animation:nprogress-spinner 400ms linear infinite;animation:nprogress-spinner 400ms linear infinite}.nprogress-custom-parent{overflow:hidden;position:relative}.nprogress-custom-parent #nprogress .bar,.nprogress-custom-parent #nprogress .spinner{position:absolute}@-webkit-keyframes nprogress-spinner{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg)}}@keyframes nprogress-spinner{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}
														
--- a/shop/dist/shop/cdn/nprogress/0.2.0/nprogress.min.js
+++ b/shop/dist/shop/cdn/nprogress/0.2.0/nprogress.min.js
--- a/shop/dist/shop/cdn/quill/2.0.0-dev.3/quill.core.min.css
+++ b/shop/dist/shop/cdn/quill/2.0.0-dev.3/quill.core.min.css
--- a/shop/dist/shop/cdn/quill/2.0.0-dev.3/quill.min.js
+++ b/shop/dist/shop/cdn/quill/2.0.0-dev.3/quill.min.js
--- a/shop/dist/shop/cdn/viewerjs/1.3.7/viewer.min.css
+++ b/shop/dist/shop/cdn/viewerjs/1.3.7/viewer.min.css
--- a/shop/dist/shop/cdn/viewerjs/1.3.7/viewer.min.js
+++ b/shop/dist/shop/cdn/viewerjs/1.3.7/viewer.min.js
--- a/shop/dist/shop/cdn/vue-router/3.1.3/vue-router.min.js
+++ b/shop/dist/shop/cdn/vue-router/3.1.3/vue-router.min.js
--- a/shop/dist/shop/cdn/vue/2.6.10/vue.min.js
+++ b/shop/dist/shop/cdn/vue/2.6.10/vue.min.js
--- a/shop/dist/shop/cdn/vuex/3.1.1/vuex.min.js
+++ b/shop/dist/shop/cdn/vuex/3.1.1/vuex.min.js
--- a/shop/dist/shop/css/chunk-3780d46e.6912c1ce.css
+++ b/shop/dist/shop/css/chunk-3780d46e.6912c1ce.css
--- a/shop/dist/shop/css/chunk-54cd5a7b.4c4a6b1b.css
+++ b/shop/dist/shop/css/chunk-54cd5a7b.4c4a6b1b.css
--- a/shop/dist/shop/css/chunk-662af648.f698d4a9.css
+++ b/shop/dist/shop/css/chunk-662af648.f698d4a9.css
--- a/shop/dist/shop/css/chunk-7e20008b.35d27d0f.css
+++ b/shop/dist/shop/css/chunk-7e20008b.35d27d0f.css
--- a/shop/dist/shop/css/chunk-dec7a10c.bb536363.css
+++ b/shop/dist/shop/css/chunk-dec7a10c.bb536363.css
--- a/shop/dist/shop/favicon.ico
+++ b/shop/dist/shop/favicon.ico
--- a/shop/dist/shop/index.html
+++ b/shop/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.14efb97a.css rel=preload as=style><link href=/js/app.e6841387.js rel=preload as=script><link href=/js/chunk-libs.6cdd4aee.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.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=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.6cdd4aee.js></script><script src=/js/app.e6841387.js></script></body></html>
														
 
															+			}</style><link href=/css/app.6f07e55a.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.24a349e1.js rel=preload as=script><link href=/js/chunk-libs.3aaf2719.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.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=/cdn/vue/2.6.10/vue.min.js></script><script src=/cdn/vue-router/3.1.3/vue-router.min.js></script><script src=/cdn/vuex/3.1.1/vuex.min.js></script><script src=/cdn/clipboard.js/2.0.4/clipboard.min.js></script><script src=/cdn/axios/0.19.0-beta.1/axios.min.js></script><script src=/cdn/nprogress/0.2.0/nprogress.min.js></script><script src=/cdn/Mock.js/1.0.1-beta3/mock-min.js></script><script src=/cdn/quill/2.0.0-dev.3/quill.min.js></script><script src=/cdn/element-ui/2.13.0/index.js></script><script src=/cdn/viewerjs/1.3.7/viewer.min.js></script><script src=/cdn/echarts/4.4.0-rc.1/echarts.min.js></script><script src=/cdn/npm/vue-echarts@4.0.2.js></script><script src=/js/chunk-libs.3aaf2719.js></script><script src=/js/app.24a349e1.js></script></body></html>
														
--- a/shop/dist/shop/js/app.24a349e1.js
+++ b/shop/dist/shop/js/app.24a349e1.js
--- a/shop/dist/shop/js/chunk-036c4844.7bf2f67b.js
+++ b/shop/dist/shop/js/chunk-036c4844.7bf2f67b.js
--- a/shop/dist/shop/js/chunk-037b87e6.ca115d24.js
+++ b/shop/dist/shop/js/chunk-037b87e6.ca115d24.js
--- a/shop/dist/shop/js/chunk-03ee9ed0.d16bb385.js
+++ b/shop/dist/shop/js/chunk-03ee9ed0.d16bb385.js
--- a/shop/dist/shop/js/chunk-040fef5b.87017ff8.js
+++ b/shop/dist/shop/js/chunk-040fef5b.87017ff8.js
--- a/shop/dist/shop/js/chunk-0ac20a2a.e61ada7e.js
+++ b/shop/dist/shop/js/chunk-0ac20a2a.e61ada7e.js
--- a/shop/dist/shop/js/chunk-0d9ae1c7.1cb233ea.js
+++ b/shop/dist/shop/js/chunk-0d9ae1c7.1cb233ea.js
--- a/shop/dist/shop/js/chunk-10e9a039.1e91e755.js
+++ b/shop/dist/shop/js/chunk-10e9a039.1e91e755.js
--- a/shop/dist/shop/js/chunk-133d4bd4.e8c193c9.js
+++ b/shop/dist/shop/js/chunk-133d4bd4.e8c193c9.js
--- a/shop/dist/shop/js/chunk-19352a22.73310510.js
+++ b/shop/dist/shop/js/chunk-19352a22.73310510.js
--- a/shop/dist/shop/js/chunk-1c437f76.ab493e15.js
+++ b/shop/dist/shop/js/chunk-1c437f76.ab493e15.js
--- a/shop/dist/shop/js/chunk-1ca1a330.85fa615f.js
+++ b/shop/dist/shop/js/chunk-1ca1a330.85fa615f.js
--- a/shop/dist/shop/js/chunk-1cc51bc8.52f079de.js
+++ b/shop/dist/shop/js/chunk-1cc51bc8.52f079de.js
--- a/shop/dist/shop/js/chunk-20713222.6b2947aa.js
+++ b/shop/dist/shop/js/chunk-20713222.6b2947aa.js
--- a/shop/dist/shop/js/chunk-20bda528.7c1677c7.js
+++ b/shop/dist/shop/js/chunk-20bda528.7c1677c7.js
--- a/shop/dist/shop/js/chunk-26e88b1e.feb7cf5a.js
+++ b/shop/dist/shop/js/chunk-26e88b1e.feb7cf5a.js
--- a/shop/dist/shop/js/chunk-27c0cb06.3cc6c54d.js
+++ b/shop/dist/shop/js/chunk-27c0cb06.3cc6c54d.js
--- a/shop/dist/shop/js/chunk-2979fabb.5a271847.js
+++ b/shop/dist/shop/js/chunk-2979fabb.5a271847.js
--- a/shop/dist/shop/js/chunk-2a5681eb.a8baf992.js
+++ b/shop/dist/shop/js/chunk-2a5681eb.a8baf992.js
--- a/shop/dist/shop/js/chunk-2be725cf.b4066ee6.js
+++ b/shop/dist/shop/js/chunk-2be725cf.b4066ee6.js
--- a/shop/dist/shop/js/chunk-2d0a54f0.18cff936.js
+++ b/shop/dist/shop/js/chunk-2d0a54f0.18cff936.js
--- a/shop/dist/shop/js/chunk-2d0aec8f.9742728f.js
+++ b/shop/dist/shop/js/chunk-2d0aec8f.9742728f.js
--- a/shop/dist/shop/js/chunk-2d0aed1a.8f69cff7.js
+++ b/shop/dist/shop/js/chunk-2d0aed1a.8f69cff7.js
--- a/shop/dist/shop/js/chunk-2d0af06a.a70ebdd3.js
+++ b/shop/dist/shop/js/chunk-2d0af06a.a70ebdd3.js
--- a/shop/dist/shop/js/chunk-2d0bb21e.daefba29.js
+++ b/shop/dist/shop/js/chunk-2d0bb21e.daefba29.js
--- a/shop/dist/shop/js/chunk-2d0bd265.a46f518a.js
+++ b/shop/dist/shop/js/chunk-2d0bd265.a46f518a.js
--- a/shop/dist/shop/js/chunk-2d0bdf39.07944e3f.js
+++ b/shop/dist/shop/js/chunk-2d0bdf39.07944e3f.js
--- a/shop/dist/shop/js/chunk-2d0c0c02.dad7e5ac.js
+++ b/shop/dist/shop/js/chunk-2d0c0c02.dad7e5ac.js
--- a/shop/dist/shop/js/chunk-2d0c1f57.fc0a499e.js
+++ b/shop/dist/shop/js/chunk-2d0c1f57.fc0a499e.js
--- a/shop/dist/shop/js/chunk-2d0c8bc6.e460156e.js
+++ b/shop/dist/shop/js/chunk-2d0c8bc6.e460156e.js
--- a/shop/dist/shop/js/chunk-2d0cc684.d131888d.js
+++ b/shop/dist/shop/js/chunk-2d0cc684.d131888d.js
--- a/shop/dist/shop/js/chunk-2d0cf541.cee0b1dd.js
+++ b/shop/dist/shop/js/chunk-2d0cf541.cee0b1dd.js
--- a/shop/dist/shop/js/chunk-2d0d3ea4.129c3024.js
+++ b/shop/dist/shop/js/chunk-2d0d3ea4.129c3024.js
--- a/shop/dist/shop/js/chunk-2d0d5c2a.4772cec1.js
+++ b/shop/dist/shop/js/chunk-2d0d5c2a.4772cec1.js
--- a/shop/dist/shop/js/chunk-2d0d622c.902b505b.js
+++ b/shop/dist/shop/js/chunk-2d0d622c.902b505b.js
--- a/shop/dist/shop/js/chunk-2d0d7bed.d6ca4b97.js
+++ b/shop/dist/shop/js/chunk-2d0d7bed.d6ca4b97.js
--- a/shop/dist/shop/js/chunk-2d0dd61c.c0c6fcfe.js
+++ b/shop/dist/shop/js/chunk-2d0dd61c.c0c6fcfe.js
--- a/shop/dist/shop/js/chunk-2d0e4c8a.44aab94c.js
+++ b/shop/dist/shop/js/chunk-2d0e4c8a.44aab94c.js
--- a/shop/dist/shop/js/chunk-2d0e9763.bf1c7769.js
+++ b/shop/dist/shop/js/chunk-2d0e9763.bf1c7769.js
--- a/shop/dist/shop/js/chunk-2d2077f4.c02bd3e8.js
+++ b/shop/dist/shop/js/chunk-2d2077f4.c02bd3e8.js
--- a/shop/dist/shop/js/chunk-2d2080d9.3581fe6e.js
+++ b/shop/dist/shop/js/chunk-2d2080d9.3581fe6e.js
--- a/shop/dist/shop/js/chunk-2d20edf3.156db9d1.js
+++ b/shop/dist/shop/js/chunk-2d20edf3.156db9d1.js
--- a/shop/dist/shop/js/chunk-2d213755.ebd622ca.js
+++ b/shop/dist/shop/js/chunk-2d213755.ebd622ca.js
--- a/shop/dist/shop/js/chunk-2d2160d1.bfa59821.js
+++ b/shop/dist/shop/js/chunk-2d2160d1.bfa59821.js
--- a/shop/dist/shop/js/chunk-2d216596.3e7c0996.js
+++ b/shop/dist/shop/js/chunk-2d216596.3e7c0996.js
--- a/shop/dist/shop/js/chunk-2d21d104.565fcc2c.js
+++ b/shop/dist/shop/js/chunk-2d21d104.565fcc2c.js
--- a/shop/dist/shop/js/chunk-2d21e453.06fb7223.js
+++ b/shop/dist/shop/js/chunk-2d21e453.06fb7223.js
--- a/shop/dist/shop/js/chunk-2d21e5d6.2e77da4f.js
+++ b/shop/dist/shop/js/chunk-2d21e5d6.2e77da4f.js
--- a/shop/dist/shop/js/chunk-2d22271a.6a90f9ec.js
+++ b/shop/dist/shop/js/chunk-2d22271a.6a90f9ec.js
--- a/shop/dist/shop/js/chunk-2d2228c7.18065e81.js
+++ b/shop/dist/shop/js/chunk-2d2228c7.18065e81.js
--- a/shop/dist/shop/js/chunk-2d224c63.0c3af176.js
+++ b/shop/dist/shop/js/chunk-2d224c63.0c3af176.js
--- a/shop/dist/shop/js/chunk-2d225482.1a5fbd94.js
+++ b/shop/dist/shop/js/chunk-2d225482.1a5fbd94.js
--- a/shop/dist/shop/js/chunk-2d225ba5.3c6ce967.js
+++ b/shop/dist/shop/js/chunk-2d225ba5.3c6ce967.js
--- a/shop/dist/shop/js/chunk-2d2288b5.490d00f7.js
+++ b/shop/dist/shop/js/chunk-2d2288b5.490d00f7.js
--- a/shop/dist/shop/js/chunk-2d22891e.c733addd.js
+++ b/shop/dist/shop/js/chunk-2d22891e.c733addd.js
--- a/shop/dist/shop/js/chunk-2d22ce36.ee36db5a.js
+++ b/shop/dist/shop/js/chunk-2d22ce36.ee36db5a.js
--- a/shop/dist/shop/js/chunk-2d22d462.57d2a3ad.js
+++ b/shop/dist/shop/js/chunk-2d22d462.57d2a3ad.js
--- a/shop/dist/shop/js/chunk-2d22db4d.969ecb72.js
+++ b/shop/dist/shop/js/chunk-2d22db4d.969ecb72.js
--- a/shop/dist/shop/js/chunk-2d22e146.64eb88b4.js
+++ b/shop/dist/shop/js/chunk-2d22e146.64eb88b4.js
--- a/shop/dist/shop/js/chunk-2d2307dd.b69f5711.js
+++ b/shop/dist/shop/js/chunk-2d2307dd.b69f5711.js
--- a/shop/dist/shop/js/chunk-2d230c38.b6319cf2.js
+++ b/shop/dist/shop/js/chunk-2d230c38.b6319cf2.js
--- a/shop/dist/shop/js/chunk-2d8795d4.84227a62.js
+++ b/shop/dist/shop/js/chunk-2d8795d4.84227a62.js
--- a/shop/dist/shop/js/chunk-2e7334ee.c2ed5702.js
+++ b/shop/dist/shop/js/chunk-2e7334ee.c2ed5702.js
--- a/shop/dist/shop/js/chunk-30077cb9.1987bbff.js
+++ b/shop/dist/shop/js/chunk-30077cb9.1987bbff.js
--- a/shop/dist/shop/js/chunk-300ef9ef.6ffdfded.js
+++ b/shop/dist/shop/js/chunk-300ef9ef.6ffdfded.js
--- a/shop/dist/shop/js/chunk-32261cc0.18eacf8b.js
+++ b/shop/dist/shop/js/chunk-32261cc0.18eacf8b.js
--- a/shop/dist/shop/js/chunk-334374da.62a68ce2.js
+++ b/shop/dist/shop/js/chunk-334374da.62a68ce2.js
--- a/shop/dist/shop/js/chunk-346511ea.1a19d838.js
+++ b/shop/dist/shop/js/chunk-346511ea.1a19d838.js
--- a/shop/dist/shop/js/chunk-34ec081e.c550711e.js
+++ b/shop/dist/shop/js/chunk-34ec081e.c550711e.js
--- a/shop/dist/shop/js/chunk-3780d46e.da3b90d3.js
+++ b/shop/dist/shop/js/chunk-3780d46e.da3b90d3.js
--- a/shop/dist/shop/js/chunk-38aaa144.265c8e66.js
+++ b/shop/dist/shop/js/chunk-38aaa144.265c8e66.js
--- a/shop/dist/shop/js/chunk-39ac4097.aa1d63ba.js
+++ b/shop/dist/shop/js/chunk-39ac4097.aa1d63ba.js
--- a/shop/dist/shop/js/chunk-41dc78fb.765e3541.js
+++ b/shop/dist/shop/js/chunk-41dc78fb.765e3541.js
--- a/shop/dist/shop/js/chunk-44545194.a46b713c.js
+++ b/shop/dist/shop/js/chunk-44545194.a46b713c.js