xc-mall.git - Gitblit

			@@ -28,14 +28,19 @@
			</div>
			</div>
			</div>
			<div class="layui-row layui-col-space10 layui-form-item">
			<div class="layui-form-item">
			<div class="layui-col-lg6">
			<label class="layui-form-label febs-form-item-require">商品分类：</label>
			<div class="layui-input-block">
			<!-- <select name="categoryId" class="categary-addPeoduct" >-->
			<!-- <option value="">请选择</option>-->
			<!-- </select>-->
			<div id="goods-category"></div>
			</div>
			</div>

			<div class="layui-col-lg6">
			<label class="layui-form-label">是否主推：</label>
			<div class="layui-input-block">
			<input type="radio" name="isHot" value="1" title="是" />
			<input type="radio" name="isHot" value="2" title="否" checked />
			</div>
			</div>
			</div>
			@@ -62,6 +67,22 @@
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-col-lg6">
			<label class="layui-form-label febs-form-item-require">排序：</label>
			<div class="layui-input-block">
			<input type="text" name="sortCnt" lay-verify="required\|integer" placeholder="" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">设置商品排序位置，想排列在前，设置的数字越小</div>
			</div>
			</div>
			<div class="layui-col-lg6">
			<label class="layui-form-label febs-form-item-require">抵扣现金(%)：</label>
			<div class="layui-input-block">
			<input type="text" name="scorePercent" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
			<div class="layui-word-aux">设置50，即商品价格1000，积分可抵扣的最大金额为1000*50%=500，填写整数，如【50】</div>
			</div>
			</div>
			</div>

			<div class="layui-form-item">
			<label class="layui-form-label">商品介绍：</label>
			@@ -72,7 +93,7 @@
			</div>
			</div>

			<blockquote class="layui-elem-quote blue-border">商品类型</blockquote>
			<blockquote class="layui-elem-quote blue-border">商品类型：</blockquote>
			<div class="layui-form-item">
			<label class="layui-form-label febs-form-item-require">商品类型</label>
			<div class="layui-input-block">
			@@ -84,20 +105,28 @@
			</div>

			<div class="layui-form-item febs-hide tc-set">
			<label class="layui-form-label">静态倍数</label>
			<label class="layui-form-label">贡献值：</label>
			<div class="layui-input-block">
			<input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>
			<input type="text" name="star" placeholder="请输入贡献值" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">支付后，用户获取对应的贡献值</div>
			</div>
			</div>

			<div class="layui-form-item febs-hide tc-set">
			<label class="layui-form-label">静态占比(%)</label>
			<div class="layui-input-block">
			<input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
			</div>
			</div>
			<!-- <div class="layui-form-item febs-hide tc-set">-->
			<!-- <label class="layui-form-label">静态倍数</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="staticMulti" placeholder="请输入静态倍数" autocomplete="off" class="layui-input">-->
			<!-- <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分</div>-->
			<!-- </div>-->
			<!-- </div>-->

			<!-- <div class="layui-form-item febs-hide tc-set">-->
			<!-- <label class="layui-form-label">静态占比(%)</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="staticProp" placeholder="请输入静态占比" autocomplete="off" class="layui-input">-->
			<!-- <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
			<!-- </div>-->
			<!-- </div>-->
			</div>

			<div class="layui-tab-item">
			@@ -142,12 +171,31 @@
			</div>

			<div class="layui-form-item">
			<label class="layui-form-label">商品参数：</label>
			<div class="layui-input-block">
			<label>
			<textarea name="goodsParameter" rows="5" autocomplete="off" class="layui-textarea" ></textarea>
			</label>
			</div>
			</div>

			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label febs-form-item-require">商品详情：</label>-->
			<!-- <div class="layui-input-block">-->
			<!--<!– <textarea id="goodsDetailEdit" lay-verify="goodsDetails" name = "goodsDetails" class="layui-textarea"></textarea>–>-->
			<!-- <div style="border: 1px solid #ccc;">-->
			<!-- <div id="toolbar-container" style="border-bottom: 1px solid #ccc;"></div>-->
			<!-- <div id="editor-container" style="height: 450px;"></div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->
			<div class="layui-form-item">
			<label class="layui-form-label febs-form-item-require">商品详情：</label>
			<div class="layui-input-block">
			<!-- <textarea id="goodsDetailEdit" lay-verify="goodsDetails" name = "goodsDetails" class="layui-textarea"></textarea>-->
			<!-- <textarea id="goodsDetailEditAdd" lay-verify="content" name = "goodsDetails" class="layui-textarea"></textarea>-->
			<div style="border: 1px solid #ccc;">
			<div id="toolbar-container" style="border-bottom: 1px solid #ccc;"></div>
			<div id="editor-container" style="height: 450px;"></div>
			<div id="toolbar-container" class="toolbar"></div>
			<div id="text-container" class="text" style="height: 450px;"></div>
			</div>
			</div>
			</div>
			@@ -283,27 +331,61 @@

			form.render();

			var E = window.wangEditor;
			const editorConfig = { MENU_CONF: {} };
			editorConfig.MENU_CONF['uploadImage'] = {
			server: '/admin/goods/uploadFileBase64',
			fieldName : "file",
			customInsert(res, insertFn) {
			insertFn(res.data.src, res.data.title, '')
			},
			}

			const editor = E.createEditor({
			selector: '#editor-container',
			config : editorConfig,
			mode: 'default'
			form.verify({
			integer: [
			/^[1-9]\d*$/
			, '只能输入正整数'
			]
			});

			const toolbar = E.createToolbar({
			editor,
			selector: '#toolbar-container',
			mode: 'default'
			});
			// var E = window.wangEditor;
			// const editorConfig = { MENU_CONF: {} };
			// editorConfig.MENU_CONF['uploadImage'] = {
			// server: '/admin/goods/uploadFileBase64',
			// fieldName : "file",
			// customInsert(res, insertFn) {
			// insertFn(res.data.src, res.data.title, '')
			// },
			// }
			//
			// const editor = E.createEditor({
			// selector: '#editor-container',
			// config : editorConfig,
			// mode: 'default'
			// });
			//
			// const toolbar = E.createToolbar({
			// editor,
			// selector: '#toolbar-container',
			// mode: 'default'
			// });
			const E = window.wangEditor;
			const editor = new E('#toolbar-container', '#text-container'); // 传入两个元素
			editor.config.showLinkImg = false;
			editor.config.uploadFileName = 'file';
			editor.config.customUploadImg = function (files, insertImgFn) {
			// files 是 input 中选中的文件列表
			// insertImgFn 是获取图片 url 后，插入到编辑器的方法
			// 上传图片，返回结果，将图片插入到编辑器中
			for (let i = 0; i < files.length; i++){
			var form = new FormData();
			form.append("file", files[0]);
			$.ajax({
			url:'/admin/goods/uploadFileBase64',
			type: "post",
			processData: false,
			contentType: false,
			data: form,
			dataType: 'json',
			success(res) {
			// 上传代码返回结果之后，将图片插入到编辑器中
			insertImgFn(res.data.src, res.data.title, '')
			}
			})
			}
			};
			editor.create();

			laydate.render({
			elem: '#febs-form-group-date'
			@@ -583,7 +665,8 @@
			data.field.goodsType = 1;
			data.field.addMallGoodsSkuDtos = tableSkuData;
			data.field.categoryId = category.getValue('valueStr');
			data.field.goodsDetails = editor.getHtml();
			// data.field.goodsDetails = editor.getHtml();
			data.field.goodsDetails = editor.txt.html();
			$.ajax({
			'url':ctx + 'admin/goods/addMallGoods',
			'type':'post',