From 860962ec4d8c6e9b414cc5b5295668e5a8b54d5f Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@live.com>
Date: Wed, 6 Dec 2023 16:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=90=8E=E5=8F=B0=E6=9C=8D=E5=8A=A1=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ServiceGoods/CoreCmsServicesController.cs | 23 ++++++++-
 .../views/good/goodscomment/details.html      |  4 +-
 .../views/good/servicegoods/details.html      | 50 ++++++++++++-------
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs
index cfab60c1..f72b9172 100644
--- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsServicesController.cs
@@ -593,7 +593,28 @@ namespace CoreCms.Net.Web.Admin.Controllers
                 return jm;
             }
             jm.code = 0;
-            jm.data = model;
+
+            model.consumableStore = CommonHelper.GetCaptureInterceptedText(model.consumableStore, ",");
+            model.allowedMembership = CommonHelper.GetCaptureInterceptedText(model.allowedMembership, ",");
+
+            //服务核销有效期类型
+            var types = EnumHelper.EnumToList<GlobalEnumVars.ServicesValidityType>();
+            //服务状态列表
+            var status = EnumHelper.EnumToList<GlobalEnumVars.ServicesStatus>();
+            //用户级别列表
+            var userGrade = await _coreCmsUserGradeServices.QueryAsync();
+            //门店列表
+            var stores = await _storeServices.QueryListByClauseAsync(p => p.id > 0, p => p.isDefault, OrderByType.Desc);
+            jm.code = 0;
+
+            jm.data = new
+            {
+                types,
+                status,
+                userGrade,
+                model,
+                stores
+            };
 
             return jm;
         }
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/details.html
index 86eb16e0..e57d306b 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscomment/details.html
@@ -20,7 +20,7 @@
                     <label for="commentId">评价用户</label>
                 </td>
                 <td>
-                    <a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{ d.params.data.avatarImage || setter.noImagePicUrl }}')"><image style="max-width:60px;max-height:60px;border-radius: 30px;" src="{{d.params.data.avatarImage || setter.noImagePicUrl }}" /></a>   {{ d.params.data.nickName || '' }}  【{{ d.params.data.mobile || '' }}】
+                    <a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{ d.params.data.avatarImage || layui.setter.noImagePicUrl }}')"><image style="max-width:60px;max-height:60px;border-radius: 30px;" src="{{d.params.data.avatarImage || layui.setter.noImagePicUrl }}" /></a>   {{ d.params.data.nickName || '' }}  【{{ d.params.data.mobile || '' }}】
 
                 </td>
             </tr>
@@ -116,7 +116,7 @@
         //开启调试情况下获取接口赋值数据
         if (debug) { console.log(d.params.data); }
 
-        layui.use(['admin', 'form', 'coreHelper'], function () {
+        layui.use(['admin', 'form', 'coreHelper','setter'], function () {
             var $ = layui.$
                 , setter = layui.setter
                 , admin = layui.admin
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/details.html
index 415b360e..efe124b4 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/details.html
@@ -11,7 +11,7 @@
                     <label for="id">序列</label>
                 </td>
                 <td>
-                    {{ d.params.data.id || '' }}
+                    {{ d.params.data.model.id || '' }}
                 </td>
             </tr>
 
@@ -20,7 +20,7 @@
                     <label for="title">项目名称</label>
                 </td>
                 <td>
-                    {{ d.params.data.title || '' }}
+                    {{ d.params.data.model.title || '' }}
                 </td>
             </tr>
 
@@ -29,7 +29,7 @@
                     <label for="thumbnail">项目缩略图</label>
                 </td>
                 <td>
-                    {{ d.params.data.thumbnail || '' }}
+                    <a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("{{ d.params.data.model.thumbnail || '' }}")><image style="max-width: 100px; max-height: 100px;" src="{{ d.params.data.model.thumbnail || '' }}" /></a>
                 </td>
             </tr>
 
@@ -38,7 +38,7 @@
                     <label for="description">项目概述</label>
                 </td>
                 <td>
-                    {{ d.params.data.description || '' }}
+                    {{ d.params.data.model.description || '' }}
                 </td>
             </tr>
 
@@ -47,7 +47,7 @@
                     <label for="contentBody">项目详细说明</label>
                 </td>
                 <td>
-                    {{ d.params.data.contentBody || '' }}
+                    {{-d.params.data.model.contentBody }}
                 </td>
             </tr>
 
@@ -56,16 +56,32 @@
                     <label for="allowedMembership">允许购买会员级别</label>
                 </td>
                 <td>
-                    {{ d.params.data.allowedMembership || '' }}
+                    {{#  layui.each(d.params.data.userGrade, function(index, item){ }}
+                    {{#  if(d.params.data.model.allowedMembership.includes(item.id)){ }}
+                    【{{item.title}}】
+                    {{#  } }}
+                    {{#  }); }}
                 </td>
             </tr>
 
+            <tr>
+                <td>
+                    <label for="allowedMembership">核销门店</label>
+                </td>
+                <td>
+                    {{#  layui.each(d.params.data.stores, function(index, item){ }}
+                    {{#  if(d.params.data.model.consumableStore.includes(item.id)){ }}
+                    【{{item.storeName}}】
+                    {{#  } }}
+                    {{#  }); }}
+                </td>
+            </tr>
             <tr>
                 <td>
                     <label for="status">项目状态</label>
                 </td>
                 <td>
-                    {{ d.params.data.status || '' }}
+                    {{ d.params.data.model.status || '' }}
                 </td>
             </tr>
 
@@ -74,7 +90,7 @@
                     <label for="maxBuyNumber">项目重复购买次数</label>
                 </td>
                 <td>
-                    {{ d.params.data.maxBuyNumber || '' }}
+                    {{ d.params.data.model.maxBuyNumber || '' }}
                 </td>
             </tr>
 
@@ -83,7 +99,7 @@
                     <label for="amount">项目可销售数量</label>
                 </td>
                 <td>
-                    {{ d.params.data.amount || '' }}
+                    {{ d.params.data.model.amount || '' }}
                 </td>
             </tr>
 
@@ -92,7 +108,7 @@
                     <label for="startTime">项目开始时间</label>
                 </td>
                 <td>
-                    {{ d.params.data.startTime || '' }}
+                    {{ d.params.data.model.startTime || '' }}
                 </td>
             </tr>
 
@@ -101,7 +117,7 @@
                     <label for="endTime">项目截止时间</label>
                 </td>
                 <td>
-                    {{ d.params.data.endTime || '' }}
+                    {{ d.params.data.model.endTime || '' }}
                 </td>
             </tr>
 
@@ -110,7 +126,7 @@
                     <label for="validityType">核销有效期类型</label>
                 </td>
                 <td>
-                    {{ d.params.data.validityType || '' }}
+                    {{ d.params.data.model.validityType || '' }}
                 </td>
             </tr>
 
@@ -119,7 +135,7 @@
                     <label for="validityStartTime">核销开始时间</label>
                 </td>
                 <td>
-                    {{ d.params.data.validityStartTime || '' }}
+                    {{ d.params.data.model.validityStartTime || '' }}
                 </td>
             </tr>
 
@@ -128,7 +144,7 @@
                     <label for="validityEndTime">核销结束时间</label>
                 </td>
                 <td>
-                    {{ d.params.data.validityEndTime || '' }}
+                    {{ d.params.data.model.validityEndTime || '' }}
                 </td>
             </tr>
 
@@ -137,7 +153,7 @@
                     <label for="ticketNumber">核销服务券数量</label>
                 </td>
                 <td>
-                    {{ d.params.data.ticketNumber || '' }}
+                    {{ d.params.data.model.ticketNumber || '' }}
                 </td>
             </tr>
 
@@ -146,7 +162,7 @@
                     <label for="createTime">项目创建时间</label>
                 </td>
                 <td>
-                    {{ d.params.data.createTime || '' }}
+                    {{ d.params.data.model.createTime || '' }}
                 </td>
             </tr>
 
@@ -155,7 +171,7 @@
                     <label for="updateTime">项目更新时间</label>
                 </td>
                 <td>
-                    {{ d.params.data.updateTime || '' }}
+                    {{ d.params.data.model.updateTime || '' }}
                 </td>
             </tr>
         </tbody>