shish 5 ani în urmă
părinte
comite
a9c778b7ed

+ 1 - 1
ghsApp/src/admin/home/apply.vue

@@ -37,7 +37,7 @@
                         title:'门店仓库',
                         list:[
                             {
-                            name: "花材管理",
+                            name: "花材",
                             img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
                             url: "/pagesStorehouse/flower/manage"
                             },

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/css/chunk-17999da5.d9d24d59.css


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/css/chunk-71ed03a5.e58f6d45.css


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/css/chunk-e812c850.29b72d0e.css


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

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/js/app.79984156.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/js/chunk-17999da5.03c49854.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/js/chunk-71ed03a5.f0278453.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/js/chunk-87f81c90.90d369cf.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
hd/dist/shop/js/chunk-e812c850.e4151f8f.js


+ 18 - 13
hd/src/views/goods/goods-add.vue

@@ -5,8 +5,8 @@
 				<el-form-item label="名称" prop="goodsName">
 					<el-input v-model="ruleForm.goodsName" placeholder="请填写商品名称"></el-input>
 				</el-form-item>
-				<el-form-item label="已售" prop="sold">
-					<el-input v-model="ruleForm.sold" placeholder="自定义已售数量,留空表示还没有售出"></el-input>
+				<el-form-item label="历史销量" prop="sold">
+					<el-input v-model="ruleForm.sold" placeholder="商城上的销量 = 历史销量 + 实际销量"></el-input>
 				</el-form-item>
 				<el-form-item label="库存" prop="stock">
 					<el-input v-model="ruleForm.stock" placeholder="请填写库存,留空表示库存充足"></el-input>
@@ -76,7 +76,7 @@
 				<el-form-item label="简介" prop="content">
 					<cl-editor-quill v-model="ruleForm.content" @load="editor"></cl-editor-quill>
 				</el-form-item>
-				<el-form-item label="涨价设置">
+				<el-form-item label="节日涨价">
 					<el-checkbox-group v-model="ruleForm.autoRise">
 						<el-checkbox label="1" name="autoRise" true-label="1" false-label="0">
 							<span>需要</span>
@@ -91,25 +91,30 @@
 						</el-popover>
 					</el-checkbox-group>
 				</el-form-item>
-				<el-form-item label="配送方式">
-					<el-checkbox-group v-model="ruleForm.needSend">
-						<el-checkbox label="1" name="type" true-label="1" false-label="0">
-							<span>到店自提</span>
-						</el-checkbox>
-					</el-checkbox-group>
+
+				<el-form-item label="自取商品">
+					<el-radio-group v-model="ruleForm.needSend">
+						<el-radio label="0">
+							<span>否</span>
+						</el-radio>
+
+						<el-radio label="1">
+							<span>是</span>
+						</el-radio>
+					</el-radio-group>
 				</el-form-item>
+
 				<el-form-item label="运费">
 					<el-radio-group v-model="ruleForm.freightType">
 						<el-radio label="0">
 							<span>按距离收费</span>
 						</el-radio>
 						<el-popover placement="top" width="100" trigger="hover" v-model="chargePopover">
-							<p>{{ shopInfo.extend.freeDistance }}公里内免运费,超过每加1公里运费加收{{shopInfo.extend.freight}}元</p>
+							<p>5公里内免运费,超过每加1公里运费加收2元</p>
 							<div style="text-align: right; margin-top: 10px">
 								<el-button size="mini" type="primary" @click="$util.pageTo({url: '/goods/freight'})">修改</el-button>
 							</div>
 							<el-button type="text" icon="el-icon-question" slot="reference" class="question-btn"></el-button>
-							<!-- <el-button slot="reference">删除</el-button> -->
 						</el-popover>
 						<el-radio label="1">
 							<span>免运费</span>
@@ -213,7 +218,7 @@ export default {
 				goodsName: [{ required: true, message: '请填写名称', trigger: 'blur' }],
 				categoryIdList: [{ required: true, message: '请选择分类', trigger: 'blur' }],
 				price: [{ required: true, message: '请填写价格', trigger: 'blur' }],
-				goodsStyle: [{ required: true, message: '请选择款式', trigger: 'blur' }],
+				goodsStyle: [{ required: false, message: '请选择款式', trigger: 'blur' }],
 				shopImg: [{ required: true, message: '请上传图片', trigger: 'blur' }]
 			},
 			// 图片展示
@@ -443,7 +448,7 @@ export default {
 			this.styleStoreData.push(form);
 		},
 		openStore() {
-			this.$message.success('即将启用...');
+			this.$message.success('即将开通');
 			return false;
 			this.imgStoreModal = true;
 		}

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff