xc-mall.git - Gitblit

			@@ -28,7 +28,7 @@
			<label class="layui-form-label febs-form-item-require">商品编号：</label>
			<div class="layui-input-block">
			<input type="text" name="goodsNo" lay-verify="required"
			placeholder="" autoComplete="off" class="layui-input">
			placeholder="" autoComplete="off" class="layui-input" readonly>
			</div>
			</div>
			</div>
			@@ -112,21 +112,21 @@
			</div>
			</div>

			<div class="layui-form-item">
			<label class="layui-form-label">推销员返积分比例(%)</label>
			<div class="layui-input-block">
			<input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">
			</div>
			</div>
			<!-- <div class="layui-form-item">-->
			<!-- <label class="layui-form-label">推销员返积分比例(%)</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">-->
			<!-- </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="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">
			@@ -267,12 +267,12 @@
			<div class="layui-form-item">
			<label class="layui-form-label">运费：</label>
			<div class="layui-input-block">
			<input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" />
			<input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>
			<input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" checked/>
			<!-- <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>-->
			</div>
			</div>

			<div class="layui-form-item carriage-input febs-hide">
			<div class="layui-form-item carriage-input">
			<div class="layui-col-lg6">
			<label class="layui-form-label">固定运费：</label>
			<div class="layui-input-block">
			@@ -282,24 +282,24 @@
			</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>
			<!-- <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>-->

			<blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>
			<div class="layui-form-item coupon-rule">
			<div class="layui-col-lg6">
			<label class="layui-form-label">优惠卷：</label>
			<div class="layui-input-block">
			<div id="coupon-rule"></div>
			</div>
			</div>
			</div>
			<!-- <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>-->
			<!-- <div class="layui-form-item coupon-rule">-->
			<!-- <div class="layui-col-lg6">-->
			<!-- <label class="layui-form-label">优惠卷：</label>-->
			<!-- <div class="layui-input-block">-->
			<!-- <div id="coupon-rule"></div>-->
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->

			<blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
			<div class="layui-col-lg6">
			@@ -854,23 +854,8 @@
			arr.push(goodsInfo.categoryId)
			category.setValue(arr);

			var arrCarriageRule = [];
			arrCarriageRule.push(goodsInfo.carriageRuleId)
			carriageRule.setValue(arrCarriageRule);

			couponRule.setValue(goodsInfo.couponIds);

			if (goodsInfo.isNormal == 2) {
			$(".tc-set").show();
			}

			if (goodsInfo.carriageType == 2) {
			$('.carriage-input').hide();
			$('.carriage-rule').show();
			} else {
			$('.carriage-input').show();
			$('.carriage-rule').hide();
			document.getElementById('carriageAmountDefault').value = goodsInfo.carriageAmount;
			}

			if (goodsInfo.isSku == 1) {
			@@ -915,20 +900,10 @@
			}

			form.on('submit(goods-update-form-submit)', function (data) {
			let couponRuleList = couponRule.getValue();
			if (couponRuleList.length > 0) {
			var couponIds = [];
			layui.each(couponRuleList, function (key, item) {
			couponIds.push(item.id)
			});
			data.field.couponIds=couponIds;
			}
			data.field.goodsType=1;
			data.field.mailGoodsSkuDto = tableSkuData;
			data.field.delSkuId=delSku;
			data.field.categoryId = category.getValue('valueStr');
			data.field.carriageRuleId = carriageRule.getValue('valueStr');
			// data.field.goodsDetails = editor.getHtml();
			data.field.goodsDetails = editor.txt.html();
			$.ajax({
			'url': ctx + 'admin/goods/updateMallGoods',