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>
			@@ -45,6 +50,12 @@
			<label class="layui-form-label febs-form-item-require">单位：</label>
			<div class="layui-input-block">
			<input type="text" name="unit" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
			</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="goodsWeight" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			@@ -78,7 +89,7 @@
			<div class="layui-input-block">
			<select name="isNormal" class="goods-type" lay-filter="goods-type-select">
			<option value="1">普通商品区</option>
			<option value="2">套餐区</option>
			<!-- <option value="2">套餐区</option>-->
			</select>
			</div>
			</div>
			@@ -185,19 +196,31 @@
			<input type="text" name="costPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
			</div>
			</div>

			<blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
			<div class="layui-form-item">
			<label class="layui-form-label">设置运费：</label>
			<label class="layui-form-label">运费：</label>
			<div class="layui-input-block">
			<input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />
			<input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />
			<input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" />
			<input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>
			</div>
			</div>

			<div class="layui-form-item carriage-input febs-hide">
			<label class="layui-form-label">运费：</label>
			<div class="layui-input-block">
			<input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input">
			<div class="layui-form-item carriage-input febs-hide">
			<div class="layui-col-lg6">
			<label class="layui-form-label">固定运费：</label>
			<div class="layui-input-block">
			<input id="carriageAmountDefault" type="text" name="carriageAmount" placeholder="" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">远费设置为0元，前台商品将显示为免运费。</div>
			</div>
			</div>
			</div>

			<div class="layui-form-item carriage-rule">
			<div class="layui-col-lg6">
			<label class="layui-form-label febs-form-item-require">邮费模板：</label>
			<div class="layui-input-block">
			<div id="carriage-rule"></div>
			</div>
			</div>
			</div>

			@@ -217,8 +240,17 @@
			<input type="text" name="addMallGoodsSkuDtos" autocomplete="off" class="layui-input" id="attrName">
			</div>
			</div>
			<div class="layui-col-lg6">
			<button type="button" class="layui-btn layui-btn-normal layui-btn" id="test3" >添加</button>
			<div class="layui-col-lg1">
			<button type="button"
			class="layui-btn layui-btn-normal layui-btn" id="test3">
			添加
			</button>
			</div>
			<div class="layui-col-lg1">
			<button type="button"
			class="layui-btn layui-btn-normal layui-btn" id="test4">
			新增样品
			</button>
			</div>
			</div>

			@@ -347,6 +379,33 @@
			});
			})

			var carriageRule = xmSelect.render({
			el: '#carriage-rule',
			language: 'zn',
			prop : {
			value : 'id',
			children : 'child'
			},
			iconfont: {
			parent: 'hidden',
			},
			radio: true,
			clickClose: true,
			tree: {
			show: true,
			//非严格模式
			strict: false,
			},
			data: []
			})

			febs.get(ctx + 'admin/goods/carriageRuleTree', null, function(res) {
			carriageRule.update({
			data : res.data,
			autoRow: true,
			});
			})

			var tableSkuData=[];
			var tableIns = table.render({
			elem: '#multiSku'
			@@ -356,14 +415,16 @@
			,cols: [[ //表头
			{type: 'checkbox'}
			,{field: 'index', title: '序号', width:70}
			,{field: 'styleName', title: '样式', edit:'text'}
			,{field: 'skuName', title: '规格', edit:'text'}
			,{field: 'presentPrice', title: '现价', edit:'text'}
			,{field: 'originalPrice', title: '原价', edit:'text'}
			,{field: 'costPrice', title: '成本价', edit:'text'}
			,{field: 'styleName', title: '样式', edit:'text', width:200}
			,{field: 'skuName', title: '规格', edit:'text', width:200}
			,{field: 'sample', title:'样品', width:100}
			,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
			,{field: 'presentPrice', title: '现价', edit:'text', width:100}
			,{field: 'originalPrice', title: '原价', edit:'text', width:100}
			,{field: 'costPrice', title: '成本价', edit:'text', width:100}
			,{templet: '#tableImgUpload', title: '缩略图', width:150}
			,{field: 'stock', title: '库存', edit:'text'}
			,{field: 'skuVolume', title: '销量', edit:'text'}
			,{field: 'stock', title: '库存', edit:'text', width:100}
			,{field: 'skuVolume', title: '销量', edit:'text', width:100}
			,{field: 'skuImage', title: '缩略图地址', hide:true}
			]]
			,data: []
			@@ -411,8 +472,12 @@
			form.on('radio(hasCarriage)', function(data){
			if (data.value == 2) {
			$('.carriage-input').hide();
			$('.carriage-rule').show();
			// document.getElementById('carriageAmountDefault').value = 0;
			} else {
			$('.carriage-input').show();
			$('.carriage-rule').hide();
			// document.getElementById('carriageAmountDefault').value = 0;
			}
			});

			@@ -461,6 +526,12 @@

			var data = {};
			data.styleName = attrNameVal;
			addTableDate(data);
			});

			$('#test4').on('click', function () {
			var data = {};
			data.sample = "样品";
			addTableDate(data);
			});

			@@ -592,6 +663,7 @@
			data.field.goodsType = 1;
			data.field.addMallGoodsSkuDtos = tableSkuData;
			data.field.categoryId = category.getValue('valueStr');
			data.field.carriageRuleId = carriageRule.getValue('valueStr');
			data.field.goodsDetails = editor.getHtml();
			$.ajax({
			'url':ctx + 'admin/goods/addMallGoods',