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

admin-update/src/components/common/elx-upload.vue

@@ -1,106 +1,108 @@
 <template>
-    <div>
-        <el-upload
-                :action=action
-                list-type="picture-card"
-                :http-request="httpRequest"
-                :limit="limit"
-                :file-list="fileList"
-                :on-exceed="exceed"
-                :on-success="success"
-                :headers="{token: token}"
-                :multiple="multiple"
-                :on-preview="handlePictureCardPreview"
-                :on-remove="handleRemove">
-            <i class="el-icon-plus"></i>
-        </el-upload>
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
-        </el-dialog>
-    </div>
+	<div>
+		<el-upload
+			:action="action"
+			list-type="picture-card"
+			:http-request="httpRequest"
+			:limit="limit"
+			:file-list="fileList"
+			:disabled="disabled"
+			:on-exceed="exceed"
+			:on-success="success"
+			:headers="{ token: token }"
+			:multiple="multiple"
+			:on-preview="handlePictureCardPreview"
+			:on-remove="handleRemove"
+			:before-upload="beforeUpload"
+		>
+			<i class="el-icon-plus"></i>
+		</el-upload>
+		<el-dialog :visible.sync="dialogVisible">
+			<img width="100%" :src="dialogImageUrl" alt="" />
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-    import {mapGetters} from 'vuex';
+import { mapGetters } from 'vuex';
 
-    export default {
-        name: "elx-upload",
-        props: {
-            limit: null,
-            multiple: {
-                type: Boolean,
-                default: true
-            },
-            fileList: {
-                type: Array,
-                default: []
-            },
-            value: [Array, String]
-        },
+export default {
+	name: 'elx-upload',
+	props: {
+		limit: null,
+		multiple: {
+			type: Boolean,
+			default: true
+		},
+		fileList: {
+			type: Array,
+			default: []
+		},
+		value: [Array, String],
+		beforeUpload: Function,
+		disabled: Boolean
+	},
 
-        data() {
-            const upload = this.$service.common.upload();
+	data() {
+		const upload = this.$service.common.upload();
 
-            return {
-                action: upload.url,
-                list: [],
-                index: 0,
-                // 图片展示
-                dialogImageUrl: '',
-                dialogVisible: false,
-            };
-        },
-        computed: {
-            ...mapGetters(['token'])
-        },
-        mounted() {
-            this.init();
-        },
-        methods: {
-            init() {
-            },
-            httpRequest(params) {
-                const file = params.file
-                this.getBase64(file).then(res => {
-                    this.$service.common.uploadImg({content: res}).then(subRes => {
-                        params.onSuccess(subRes)
-                    });
-                });
-            },
-            handleRemove(file, fileList) {
-                this.$emit('handleRemove', {file, fileList})
-            },
-            handlePictureCardPreview(file) {
-                this.dialogImageUrl =file.showBBGG|| file.url;
-                this.dialogVisible = true;
-            },
-            exceed() {
-                this.$message(`不能超过${this.limit}`)
-            },
-            success(response, file, fileList) {
-                this.$emit('update:fileList', fileList)
-                this.$emit('success', {response, file, fileList})
-            },
-            getBase64(file) {
-                return new Promise(function (resolve, reject) {
-                    let reader = new FileReader();
-                    let imgResult = '';
-                    reader.readAsDataURL(file);
-                    reader.onload = function () {
-                        imgResult = reader.result;
-                    };
-                    reader.onerror = function (error) {
-                        reject(error);
-                    };
-                    reader.onloadend = function () {
-                        resolve(imgResult);
-                    };
-                });
-            }
-        },
-    }
+		return {
+			action: upload.url,
+			list: [],
+			index: 0,
+			// 图片展示
+			dialogImageUrl: '',
+			dialogVisible: false
+		};
+	},
+	computed: {
+		...mapGetters(['token'])
+	},
+	mounted() {
+		this.init();
+	},
+	methods: {
+		init() {},
+		httpRequest(params) {
+			const file = params.file;
+			this.getBase64(file).then(res => {
+				this.$service.common.uploadImg({ content: res }).then(subRes => {
+					params.onSuccess(subRes);
+				});
+			});
+		},
+		handleRemove(file, fileList) {
+			this.$emit('handleRemove', { file, fileList });
+		},
+		handlePictureCardPreview(file) {
+			this.dialogImageUrl = file.showBBGG || file.url;
+			this.dialogVisible = true;
+		},
+		exceed() {
+			this.$message.warning(`最多只能上传${this.limit}张图片`);
+		},
+		success(response, file, fileList) {
+			this.$emit('update:fileList', fileList);
+			this.$emit('success', { response, file, fileList });
+		},
+		getBase64(file) {
+			return new Promise(function(resolve, reject) {
+				let reader = new FileReader();
+				let imgResult = '';
+				reader.readAsDataURL(file);
+				reader.onload = function() {
+					imgResult = reader.result;
+				};
+				reader.onerror = function(error) {
+					reject(error);
+				};
+				reader.onloadend = function() {
+					resolve(imgResult);
+				};
+			});
+		}
+	}
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

admin-update/src/pages/login/index.js

@@ -1,84 +1,82 @@
 // import Captcha from '@/components/common/captcha';
 
 export default {
-    // components: {
-    // 	Captcha
-    // },
+	// components: {
+	// 	Captcha
+	// },
 
-    data() {
-        return {
-            form: {
-                mobile: null,
-                password: null,
-                // captchaId: '',
-                verifyCode: ''
-            },
-            saving: false,
-            loading: true
-        };
-    },
-    mounted() {
-        this.loading = false;
-        if (process.env.NODE_ENV === "development") {
-            this.form.mobile = '15280215347'
-            this.form.password = '123456'
-        }
-    },
+	data() {
+		return {
+			form: {
+				mobile: null,
+				password: null,
+				// captchaId: '',
+				verifyCode: ''
+			},
+			saving: false,
+			loading: true
+		};
+	},
+	mounted() {
+		this.loading = false;
+		if (process.env.NODE_ENV === 'development') {
+			this.form.mobile = '15280215347';
+			this.form.password = '123456';
+		}
+	},
 
-    methods: {
-        captchaChange() {
-            this.form.verifyCode = '';
-        },
+	methods: {
+		captchaChange() {
+			this.form.verifyCode = '';
+		},
 
-        async next() {
-            const {mobile, password} = this.form;
+		async next() {
+			const { mobile, password } = this.form;
 
-            if (!mobile) {
-                return this.$message.warning('用户名不能为空');
-            }
+			if (!mobile) {
+				return this.$message.warning('用户名不能为空');
+			}
 
-            if (!password) {
-                return this.$message.warning('密码不能为空');
-            }
+			if (!password) {
+				return this.$message.warning('密码不能为空');
+			}
 
-            this.saving = true;
+			this.saving = true;
 
-            try {
-                // 登录
-                await this.$store.dispatch('userLogin', this.form);
+			try {
+				// 登录
+				await this.$store.dispatch('userLogin', this.form);
 
-                if (this.$projectName == 'business') {
-                    // 用户信息
-                    await this.$store.dispatch('userInfo');
-                    // 商户信息
-                    await this.$store.dispatch('shopInfo');
-                } else {
-                    // 后台信息
-                    await this.$store.dispatch('adminInfo');
-                }
+				if (this.$projectName == 'business') {
+					// 用户信息
+					await this.$store.dispatch('userInfo');
+					// 商户信息
+					await this.$store.dispatch('shopInfo');
+				} else {
+					// 后台信息
+					await this.$store.dispatch('adminInfo');
+				}
 
-                // 权限菜单
-                const [first] = await this.$store.dispatch('permMenu');
+				// 权限菜单
+				const [first] = await this.$store.dispatch('permMenu');
 
-                this.saving = false;
+				this.saving = false;
 
-                if (!first) {
-                    this.$message.error('该账号没有权限');
-                } else {
-                    this.$nextTick(() => {
-                        if (this.$projectName == 'business') {
-                            this.$router.push('/');
-                        } else {
-                            this.$router.push('/');
-                        }
-                    });
-                }
-            } catch (err) {
-                // this.$refs.captcha.refresh();
-                this.saving = false;
-
-                this.$message.error(err);
-            }
-        }
-    }
+				if (!first) {
+					this.$message.error('该账号没有权限');
+				} else {
+					this.$nextTick(() => {
+						if (this.$projectName == 'business') {
+							this.$router.push('/');
+						} else {
+							this.$router.push('/');
+						}
+					});
+				}
+			} catch (err) {
+				// this.$refs.captcha.refresh();
+				this.saving = false;
+			}
+		}
+	}
 };

admin-update/src/store/modules/config.js

@@ -22,7 +22,10 @@ export default {
 		// 分类
 		getCategory({ commit }) {
 			return this.$service.category.list().then(res => {
-				commit('SET_CATEGORY', res);
+				commit(
+					'SET_CATEGORY',
+					res.filter(e => e.status != '0')
+				);
 				return res;
 			});
 		},

admin-update/src/views/goods/goods-add.vue

@@ -88,12 +88,16 @@
 						<elxUpload
 							:limit="4"
 							:fileList.sync="fileList_show"
+							:disabled="ruleForm.categoryIdList.length == 0"
 							@success="fromToData"
 							@handleRemove="fromToData"
 						></elxUpload>
+						<p style="color: red" v-show="ruleForm.categoryIdList.length == 0">
+							请先选择分类
+						</p>
 					</div>
 					<div>
-						<el-button type="primary" size="small" @click="imgStoreModal = true"
+						<el-button type="primary" size="small" @click="openStore"
 							>从图库选择</el-button
 						>
 					</div>
@@ -435,10 +439,18 @@ export default {
 		},
 		checkImage() {
 			this.imgStoreModal = false;
+
+			this.fileList_show = this.fileList_show.concat(
+				this.imgStoreArr.map(e => {
+					return {
+						url: e,
+						status: 'success'
+					};
+				})
+			);
 		},
 		setCheckImg(val) {
 			this.$set(this.ruleForm, 'shopImg', this.ruleForm.shopImg.concat(val));
-			console.log(this.ruleForm.shopImg, val);
 		},
 
 		// 编辑器
@@ -466,13 +478,13 @@ export default {
 		},
 		// 款式选择弹窗
 		styleDelFn(index) {
-			this.actionOption = false;
 			let num = this.getStyleNum();
 			console.log('num', num);
 			if (num == 1) {
 				this.$message.error('最少保留一个款式！');
 				return false;
 			}
+			this.actionOption = false;
 			if (this.styleStoreData[index].action == 'update') {
 				// this.styleStoreData[index].action = 'delete';
 				this.$set(this.styleStoreData[index], 'action', 'delete');
@@ -490,6 +502,12 @@ export default {
 			}
 			let form = JSON.parse(JSON.stringify(this.styleForm));
 			this.styleStoreData.push(form);
+		},
+		openStore() {
+			if (this.ruleForm.categoryIdList.length == 0) {
+				return this.$message.error('请先选择分类');
+			}
+			this.imgStoreModal = true;
 		}
 	}
 };

admin-update/src/views/member/list.vue

@@ -105,11 +105,12 @@
 						class="demo-form"
 					>
 						<el-form-item label="充值金额">
-							<el-input
+							<el-input-number
 								v-model="rechargeForm.rechargeAmount"
 								placeholder="充值金额"
 								size="small"
-							></el-input>
+								:min="0"
+							></el-input-number>
 						</el-form-item>
 						<el-form-item label="确认密码">
 							<el-input
@@ -390,10 +391,21 @@ export default {
 									placeholder: '请填写手机号码'
 								}
 							},
-							rules: {
-								required: true,
-								message: '请填写手机号码'
-							}
+							rules: [
+								{
+									required: true,
+									message: '请填写手机号码'
+								},
+								{
+									validator: (rule, value, callback) => {
+										if (!/^(?:(?:\+|00)86)?1[3-9]\d{9}$/.test(value)) {
+											return callback(new Error('手机号码不正确'));
+										}
+
+										callback();
+									}
+								}
+							]
 						},
 						{
 							prop: 'confirmMobile',
@@ -405,17 +417,32 @@ export default {
 									placeholder: '请填写确认手机号码'
 								}
 							},
-							rules: {
-								required: true,
-								message: '请填写确认手机号码'
-							}
+							rules: [
+								{
+									required: true,
+									message: '请填写确认手机号码'
+								},
+								{
+									validator: (rule, value, callback) => {
+										if (app.getForm('mobile') != value) {
+											return callback(new Error('两次输入密码不一致'));
+										}
+
+										callback();
+									}
+								}
+							]
 						},
 						{
 							prop: 'balance',
 							label: '余额',
 							span: 24,
 							component: {
-								name: 'el-input',
+								name: 'el-input-number',
+								props: {
+									min: 0,
+									max: 10000000
+								},
 								attrs: {
 									placeholder: '请填写余额'
 								}

admin-update/src/views/order/components/sel-order.vue

@@ -378,37 +378,51 @@
 		<div class="print-html">
 			<table border="1" width="780" style="border:solid 1px black;border-collapse:collapse">
 				<tr>
-					<td>配送时间：</td>
-					<td colspan="2">{{ deliver.data.reachDate }}</td>
-					<td>订单号：</td>
-					<td colspan="2">{{ deliver.data.orderSn }}</td>
+					<td style="padding: 10px;width: 100px;">配送时间：</td>
+					<td style="padding-left: 10px;" colspan="2">{{ deliver.data.reachDate }}</td>
+					<td style="padding-left: 10px;width: 100px;">订单号：</td>
+					<td style="padding-left: 10px;" colspan="2">{{ deliver.data.orderSn }}</td>
 				</tr>
 				<tr>
-					<td>收花人姓名：</td>
-					<td>{{ deliver.data.receiveUserName }}</td>
-					<td>收花人电话：</td>
-					<td>{{ deliver.data.receiveMobile }}</td>
-					<td colspan="2" rowspan="4">
-						<img class="cover" src="" alt="" />
+					<td style="padding-left: 10px;width: 100px;">收花人姓名：</td>
+					<td style="padding-left: 10px;width: 130px;">
+						{{ deliver.data.receiveUserName }}
+					</td>
+					<td style="padding-left: 10px;width: 100px;">收花人电话：</td>
+					<td style="padding-left: 10px;width: 130px;">
+						{{ deliver.data.receiveMobile }}
+					</td>
+					<td style="padding-left: 10px;" colspan="2" rowspan="4">
+						<div style="text-align: center;padding-top: 1px">
+							<p>情人节 33朵</p>
+							<img
+								style="width: 100px;height: 100px;margin-bottom: 20px"
+								class="cover"
+								:src="deliver.data.img"
+								alt=""
+							/>
+						</div>
 					</td>
 				</tr>
 				<tr>
-					<td>收花人地址：</td>
-					<td colspan="3">{{ deliver.data.receiveFullAddress }}</td>
+					<td style="padding-left: 10px;width: 100px;">收花人地址：</td>
+					<td style="padding-left: 10px" colspan="3">
+						{{ deliver.data.receiveFullAddress }}
+					</td>
 				</tr>
 				<tr>
-					<td>祝福语：</td>
-					<td colspan="3">{{ deliver.data.cardInfo }}</td>
+					<td style="padding-left: 10px;width: 100px;">祝福语：</td>
+					<td style="padding-left: 10px" colspan="3">{{ deliver.data.cardInfo }}</td>
 				</tr>
 				<tr>
-					<td>订花人姓名：</td>
-					<td>{{ deliver.data.bookName }}</td>
-					<td>订花人电话：</td>
-					<td>{{ deliver.data.bookMobile }}</td>
+					<td style="padding-left: 10px;width: 100px;">订花人姓名：</td>
+					<td style="padding-left: 10px;width: 130px;">{{ deliver.data.bookName }}</td>
+					<td style="padding-left: 10px;width: 100px;">订花人电话：</td>
+					<td style="padding-left: 10px;width: 130px;">{{ deliver.data.bookMobile }}</td>
 				</tr>
 				<tr>
-					<td>备注说明：</td>
-					<td colspan="5">{{ deliver.data.remark }}</td>
+					<td style="padding: 10px;width: 100px;">备注说明：</td>
+					<td style="padding-left: 10px" colspan="5">{{ deliver.data.remark }}</td>
 				</tr>
 			</table>
 		</div>
@@ -671,15 +685,21 @@ export default {
 				let LODOP = getLodop();
 				LODOP.PRINT_INIT('配送单');
 				LODOP.SET_PRINT_STYLE('FontSize', 12);
-				LODOP.ADD_PRINT_TEXT(350, 10, 350, 200, `店铺地址：${this.shopInfo.address}`);
-				LODOP.ADD_PRINT_TEXT(350, 400, 350, 600, `电话：13255022022`);
-				LODOP.ADD_PRINT_TEXT(350, 580, 350, 600, `制单时间：2019-10-31 21:12`);
+				LODOP.ADD_PRINT_TEXT(470, 10, 350, 200, `店铺地址：${this.shopInfo.address}`);
+				LODOP.ADD_PRINT_TEXT(470, 400, 350, 600, `电话：${this.deliver.data.telephone}`);
+				LODOP.ADD_PRINT_TEXT(
+					470,
+					590,
+					470,
+					600,
+					`制单时间：${this.deliver.data.printTime}`
+				);
 				LODOP.SET_PRINT_STYLE('FontSize', 20);
 				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.merchantName}`);
+				LODOP.ADD_PRINT_TEXT(150, 10, 790, 30, `${this.shopInfo.merchantName}配送单`);
 				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
 				LODOP.SET_PRINT_STYLE('FontSize', 12);
-				LODOP.ADD_PRINT_TEXT(160, 460, 100, 20, `No ${this.deliver.data.sendNum}`);
+				LODOP.ADD_PRINT_TEXT(160, 500, 100, 20, `No ${this.deliver.data.sendNum}`);
 				LODOP.SET_PRINT_STYLEA(0, 'Alignment', 2);
 
 				LODOP.ADD_PRINT_HTM(
@@ -778,25 +798,7 @@ export default {
 
 .print-html {
 	position: absolute;
-	left: 5000px;
-	top: 0;
-
-	td {
-		height: 40px;
-		width: 130px;
-		padding: 0 10px;
-		box-sizing: border-box;
-	}
-
-	.h2 {
-		height: 80px;
-	}
-
-	.cover {
-		display: block;
-		height: 90%;
-		width: 100%;
-		background-color: #eee;
-	}
+	left: 0;
+	top: -5000px;
 }
 </style>

huadian/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href=/css/app.48715b57.css rel=preload as=style><link href=/css/chunk-libs.14efb97a.css rel=preload as=style><link href=/js/app.da014eab.js rel=preload as=script><link href=/js/chunk-libs.4b1df4c7.js rel=preload as=script><link href=/css/chunk-libs.14efb97a.css rel=stylesheet><link href=/css/app.48715b57.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.4b1df4c7.js></script><script src=/js/app.da014eab.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.fbe19e83.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.fbe19e83.js></script></body></html>