6 лет назад · d20ad34c65
--- a/admin-update/src/views/goods/goods-add.vue
+++ b/admin-update/src/views/goods/goods-add.vue
@@ -157,7 +157,11 @@
 
				 							trigger="hover"
			
 
				 							v-model="chargePopover"
			
 
				 						>
			
 
				-							<p>5公里内免运费，超过每增加1公里运费增加2元</p>
			
 
				+							<p>
			
 
				+								{{ shopInfo.extend.freightFirst }}公里内免运费，超过每增加{{
			
 
				+									shopInfo.extend.freightAdd
			
 
				+								}}公里运费增加2元
			
 
				+							</p>
			
 
				 							<div style="text-align: right; margin-top: 10px">
			
 
				 								<el-button size="mini" type="primary" @click="chargePopover = false"
			
 
				 									>修改</el-button
			
@@ -321,7 +325,7 @@ export default {
 
				 	},
			
 
				 	computed: {
			
 
				 		...mapGetters({ categoryData: 'category' }),
			
 
				-		...mapGetters(['token'])
			
 
				+		...mapGetters(['token', 'shopInfo'])
			
 
				 	},
			
 
				 	created() {
			
 
				 		this.init();
			
--- a/huadian/css/chunk-07bde2df.e8ff0b67.css
+++ b/huadian/css/chunk-07bde2df.e8ff0b67.css
--- a/huadian/css/chunk-4af42d67.331a0861.css
+++ b/huadian/css/chunk-4af42d67.331a0861.css
--- a/huadian/css/chunk-681938ec.c31a7cfb.css
+++ b/huadian/css/chunk-681938ec.c31a7cfb.css
--- a/huadian/index.html
+++ b/huadian/index.html
@@ -43,4 +43,4 @@
 
				 			.once .sub-title {
			
 
				 				color: #ababab;
			
 
				 				font-size: 12px;
			
 
				-			}</style><link href=/css/app.6c7c3c55.css rel=preload as=style><link href=/css/chunk-libs.6d5f97e5.css rel=preload as=style><link href=/js/app.f1eeb122.js rel=preload as=script><link href=/js/chunk-libs.fba3356a.js rel=preload as=script><link href=/css/chunk-libs.6d5f97e5.css rel=stylesheet><link href=/css/app.6c7c3c55.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.fba3356a.js></script><script src=/js/app.f1eeb122.js></script></body></html>
			
 
				+			}</style><link href=/css/app.6c7c3c55.css rel=preload as=style><link href=/css/chunk-libs.6d5f97e5.css rel=preload as=style><link href=/js/app.37037950.js rel=preload as=script><link href=/js/chunk-libs.fba3356a.js rel=preload as=script><link href=/css/chunk-libs.6d5f97e5.css rel=stylesheet><link href=/css/app.6c7c3c55.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.fba3356a.js></script><script src=/js/app.37037950.js></script></body></html>
			
--- a/huadian/js/app.37037950.js
+++ b/huadian/js/app.37037950.js
--- a/huadian/js/chunk-07bde2df.79cdcb46.js
+++ b/huadian/js/chunk-07bde2df.79cdcb46.js
--- a/huadian/js/chunk-4a16829c.b5fadfca.js
+++ b/huadian/js/chunk-4a16829c.b5fadfca.js
--- a/huadian/js/chunk-4af42d67.a42c4a72.js
+++ b/huadian/js/chunk-4af42d67.a42c4a72.js
--- a/huadian/js/chunk-681938ec.4bbf21ae.js
+++ b/huadian/js/chunk-681938ec.4bbf21ae.js