瀏覽代碼

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

jf 5 年之前
父節點
當前提交
6f4aab86b8

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-3bc85ddc.851b15e0.css


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-44831b5a.3c6ad5f2.css


+ 1 - 1
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.70be425c.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.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.70be425c.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.e5950f1f.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.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.e5950f1f.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.e5950f1f.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-24ae043d.a9234ff7.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-3bc85ddc.17cccaa3.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-44831b5a.77bec33c.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-77ef1033.3e4f79b6.js


+ 1 - 1
ghs/src/views/item/list.vue

@@ -100,7 +100,7 @@
 
 
       <template #slot-add-goods-btn>
-        <el-button type="primary" size="mini" @click="addFn()">添加</el-button>
+        <el-button type="primary" size="mini" @click="addFn()">从平台导入</el-button>
       </template>
 		<template #slot-addNew-goods-btn>
         <el-button type="primary" size="mini" @click="replaceBtnFn(0)">新增</el-button>

+ 1 - 1
ghsApp/src/pagesPurchase/details.vue

@@ -47,7 +47,7 @@
 							<view class="describe-view">
 								共{{ selectList.length }}种,
 								<!-- 共16扎9支, -->
-								合计 {{`${selectAllRealityWeight}kg`}}¥<text class="price">{{ selectAllPrice }}</text>
+								合计 {{`${selectAllRealityWeight}kg`}} ¥{{ selectAllPrice }}
 							</view>
 						</view>
 					</view>

Some files were not shown because too many files changed in this diff