xc-mall.git - Gitblit

			@@ -107,26 +107,43 @@
			<select name="isNormal" class="goods-type"
			lay-filter="goods-type-select">
			<option value="1">普通商品区</option>
			<option value="3">微信小店</option>
			<!-- <option value="2">套餐区</option>-->
			</select>
			</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>

			<blockquote class="layui-elem-quote blue-border febs-hide tc-set">微信小店设置</blockquote>
			<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 class="layui-col-lg6">
			<label class="layui-form-label">APP_ID:</label>
			<div class="layui-input-block">
			<input type="text" name="storeAppId" placeholder="请输入" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-col-lg6">
			<label class="layui-form-label">商品ID:</label>
			<div class="layui-input-block">
			<input type="text" name="storeGoodsId" placeholder="请输入" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">不填写商品ID，则跳转到微信小店首页。</div>
			</div>
			</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>

			<div class="layui-tab-item">
			@@ -238,6 +255,16 @@
			<input type="text" name="costPrice" 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="staticProp" lay-verify="required" placeholder="请输入积分折扣" lay-reqText="请输入积分折扣" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">折扣积分=售价积分折扣（%）积分换算比例</div>
			<div class="layui-form-mid layui-word-aux">不允许使用积分设置成：0%</div>
			<div class="layui-form-mid layui-word-aux">全部使用积分设置成：大于等于100%</div>
			</div>
			</div>
			</div>
			<!-- <blockquote class="layui-elem-quote blue-border">代理价格</blockquote>-->
			<!-- <div class="layui-row layui-col-space10 layui-form-item">-->
			@@ -262,7 +289,17 @@
			<!-- </div>-->
			<!-- </div>-->
			<!-- </div>-->

			<blockquote class="layui-elem-quote blue-border">佣金设置</blockquote>
			<div class="layui-row layui-col-space10 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="levelOnePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
			<div class="layui-form-mid layui-word-aux">佣金要小于成本价,实际佣金等于每个分销级别的比例乘以佣金。</div>
			<div class="layui-form-mid layui-word-aux">没有佣金设置成：0</div>
			</div>
			</div>
			</div>
			<blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
			<div class="layui-form-item">
			<label class="layui-form-label">运费：</label>
			@@ -326,12 +363,12 @@
			添加
			</button>
			</div>
			<div class="layui-col-lg3">
			<button type="button"
			class="layui-btn layui-btn-normal layui-btn" id="test4">
			新增样品
			</button>
			</div>
			<!-- <div class="layui-col-lg3">-->
			<!-- <button type="button"-->
			<!-- class="layui-btn layui-btn-normal layui-btn" id="test4">-->
			<!-- 新增样品-->
			<!-- </button>-->
			<!-- </div>-->
			</div>

			<div class="layui-form-item">
			@@ -529,7 +566,10 @@
			autoRow: true,
			});

			initValue();

			setTimeout(() => {
			initValue();
			}, 500);
			})

			var carriageRule = xmSelect.render({
			@@ -574,7 +614,7 @@
			,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
			,{field: 'originalPrice', title: '原价', edit:'text', width:100}
			,{field: 'presentPrice', title: '现价', edit:'text', width:100}
			// ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100}
			,{field: 'levelOnePrice', title: '佣金', edit:'text', width:100}
			// ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100}
			// ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100}
			,{field: 'costPrice', title: '成本价', edit:'text', width:100}
			@@ -826,6 +866,8 @@
			var thumbs = images.join(",");
			form.val("goods-update-form", {
			"id": goodsInfo.id,
			"storeAppId": goodsInfo.storeAppId,
			"storeGoodsId": goodsInfo.storeGoodsId,
			"goodsName": goodsInfo.goodsName,
			"goodsNo": goodsInfo.goodsNo,
			"unit": goodsInfo.unit,
			@@ -863,7 +905,7 @@

			couponRule.setValue(goodsInfo.couponIds);

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

			@@ -958,7 +1000,7 @@

			form.on('select(goods-type-select)', function (data) {
			$('.tc-set').each(function () {
			if (data.value == 2) {
			if (data.value == 3) {
			$(this).show();
			} else {
			$(this).hide();