From 382794b20c47d0f74317b2ac5bb7b6849986166f Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 19 Mar 2021 13:36:40 +0800
Subject: [PATCH] 积分商城7

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html |   80 +++++++++++++---------------------------
 1 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
index e6b0421..8c49a16 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html
@@ -144,42 +144,7 @@
                                 </div>
                             </div>
 
-                            <div class="form-group">
 
-                                <label class="col-sm-2 control-label">是否为服务项目
-                                </label>
-                                <div class="col-sm-4">
-                                    <select th:field="${obj.isService}" class="form-control " size="1"
-                                            name="isService"
-                                            id="isService" style="width: 100%">
-                                        <option value="2" th:selected="${obj.isService == '2'}">否</option>
-                                        <option value="1" th:selected="${obj.isService == '1'}">是</option>
-                                        </option>
-
-                                    </select>
-                                </div>
-
-                                <label class="col-sm-2 control-label">服务时长
-                                </label>
-                                <div class="col-sm-4">
-                                    <input autocomplete="off"   type="text" class="form-control" name="serviceTime"
-                                           maxLength="50"
-                                           th:value="${obj.serviceTime}" >
-                                </div>
-
-
-                            </div>
-
-                            <!--<div class="form-group">
-
-                                <label class="col-sm-2 control-label">真实销量
-                                </label>
-                                <div class="col-sm-4">
-                                    <input autocomplete="off"   type="text" class="form-control" name="rsVolume"
-
-                                           th:value="${obj.rsVolume}" errormsg="请填写数字">
-                                </div>
-                            </div>-->
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">属性设置 </label>
                                 <input autocomplete="off"     name="attrs" id="attrs" type="hidden" >
@@ -258,6 +223,7 @@
                                     <th>排序</th>
                                     <th>推广提成</th>
                                     <th>邀请提成</th>
+                                    <th>兑换所需金额</th>
                                     <th>兑换所需积分</th>
                                     <th>操作</th>
                                 </tr>
@@ -387,6 +353,8 @@
         <input autocomplete="off"   type="hidden" class="form-control" name="erpGoodsCode">
     </div></td>
     <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
+        <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
+        <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
         <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
         <td><input autocomplete="off"   type="text" class="form-control" name=""></td>
     <td><i class="fa fa-trash form-control-static" onclick="delThis('trId')"></i></td>
@@ -573,6 +541,10 @@
             if (scorePrice == null || typeof scorePrice == 'undefined') {
                 scorePrice = "";
             }
+ var scoreCount = shopSkus[c].scoreCount;
+            if (scoreCount == null || typeof scoreCount == 'undefined') {
+                scoreCount = "";
+            }
 
 
             var html=
@@ -590,6 +562,7 @@
                 +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+sealesPrice+'" name=""></td>'
                 +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+invitationPrice+'" name=""></td>'
                 +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+scorePrice+'" name=""></td>'
+                +'<td><input autocomplete="off"   type="text" class="form-control"  value="'+scoreCount+'" name=""></td>'
                 +'<td><i class="fa fa-trash form-control-static"	onclick="delThis(\''+trId+'\')"></i></td>'
                 +'</tr>';
             $("#skutable").find("tbody").append(html);
@@ -653,10 +626,6 @@
                     layer.msg(result.info, {
                         icon : 2,
                         time : 1000,
-                        end:function(){
-                            parent.myGrid.serchData();
-                            MTools.closeForm()
-                        }
                     });
                     return null;
                 }
@@ -776,72 +745,75 @@
             if (i != 0) {
                 var tds = $(this).find("td");
                 var length = tds.length - 1;
-                var id = tds.eq(length - 11).find("input").val();
+                var id = tds.eq(length - 12).find("input").val();
                 if(id == null){
                     id ="";
                 }
                 sku.id = id;
 
                 //规格名称
-                var name = tds.eq(length - 10).find("input").val();
+                var name = tds.eq(length - 11).find("input").val();
                 if(name == null){
                     name = "";
                 }
                 sku.name = name;
 
                 //图片地址
-                var path = tds.eq(length - 9).find("img").attr("src");
+                var path = tds.eq(length - 10).find("img").attr("src");
                 if(path == null){
                     path = "";
                 }
                 sku.imgPath = path;
 
                 //库存
-                var stock = tds.eq(length - 8).find("input").val();
+                var stock = tds.eq(length - 9).find("input").val();
                 if(stock == ""){
                     stock = 0;
                 }
                 sku.stock = stock;
 
                 //价格
-                var price = tds.eq(length -7).find("input").val();
+                var price = tds.eq(length -8).find("input").val();
                 if(price == ""){
                     price =0;
                 }
                 sku.price = price;
 
                 //积分
-                var score = tds.eq(length - 6).find("input").val();
+                var score = tds.eq(length - 7).find("input").val();
                 if(score == ""){
                     score = 0;
                 }
                 sku.score = score;
 
                 //品种编码
-                var stockCode = tds.eq(length - 5).find("input").val();
+                var stockCode = tds.eq(length - 6).find("input").val();
                 if(stockCode == null || typeof stockCode == 'undefined'){
                     stockCode = '';
                 }
                 sku.stockCode = stockCode;
 
                 //排序
-                var sort = tds.eq(length - 4).find("input").val();
+                var sort = tds.eq(length - 5).find("input").val();
                 if(sort == ""){
                     sort = 0;
                 }
                 sku.sort = sort;
 
                 //推广提成
-                var sealesPrice = tds.eq(length - 3).find("input").val();
+                var sealesPrice = tds.eq(length - 4).find("input").val();
                 sku.sealesPrice = sealesPrice;
 
                 //邀请提成
-                var invitationPrice = tds.eq(length - 2).find("input").val();
+                var invitationPrice = tds.eq(length - 3).find("input").val();
                 sku.invitationPrice = invitationPrice;
 
-                //兑换所需积分
-                var scorePrice = tds.eq(length - 1).find("input").val();
+                //兑换所需金额
+                var scorePrice = tds.eq(length - 2).find("input").val();
                 sku.scorePrice = scorePrice;
+                //兑换所需积分
+                var scoreCount = tds.eq(length - 1).find("input").val();
+                sku.scoreCount = scoreCount;
 
                 skus.push(sku);
             }
@@ -860,7 +832,7 @@
             if (i != 0) {
                 var tds = $(this).find("td");
                 var length = tds.length - 1;
-                var name = tds.eq(length - 10).find("input").val();
+                var name = tds.eq(length - 11).find("input").val();
                 if(name == ""){
                     layer.msg("请填写规格名称",{
                         icon : 2,
@@ -878,7 +850,7 @@
                     return false;
                 }
 
-                var stock = tds.eq(length -8).find("input").val();
+                var stock = tds.eq(length -9).find("input").val();
                 if(stock == ""){
                     layer.msg("请填写库存",{
                         icon : 2,
@@ -887,7 +859,7 @@
                     flag = true;
                     return false;
                 }
-                var price = tds.eq(length - 7 ).find("input").val();
+                var price = tds.eq(length - 8 ).find("input").val();
                 if(price == ""){
                     layer.msg("请填写价格",{
                         icon : 2,

--
Gitblit v1.9.1