From 2b24132455262a5a5bc04ad8bb69c604806d49b8 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Fri, 4 Mar 2022 11:39:00 +0800
Subject: [PATCH] 卡项详情页修改

---
 packageA/pages/goodsInfo/goodsInfo.wxml | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 8ac3c0f..1212320 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -263,7 +263,7 @@
 				<!-- 图文详情 -->
 				<view class="t_g_info bdt16">
 				  <view class="red_shu"></view>
-				  <view class="fs30 bold">商品详情</view>
+				  <view class="fs30 bold">卡项详情</view>
 				</view>
 				<view class="pdh20">
 					
@@ -348,7 +348,7 @@
 			
 			<view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
 				<view class="pd20">
-					<view class="table_s" wx:if="{{service_list}}">
+					<!-- <view class="table_s" wx:if="{{service_list}}">
 				  <view class="tb_item tb-l">
 				    <view class="item_left f1">
 				      <text>项目名称</text>
@@ -371,7 +371,42 @@
 						  <text>{{item.frequency}}</text>
 						</view>
 				  </view>
-				</view>
+				</view> -->
+				
+				<block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
+					<view class="card fs28" wx:for="{{listServiceItem}}">
+						<view class="flex ai_c jc_sb" style="height: 88rpx;">
+							<view class="ellipsis-2 f1">{{item.projectName}}（{{item.frequency}}次）</view>
+							<view class="pdl30 t-r">
+									<view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+									<view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
+							</view>
+						</view>
+						<view class="flex ai_c jc_sb fs24 c-6">
+							<view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+							<!-- 指定开始日期和结束日期 -->
+							<view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item, data.validDays)}}</view>
+						</view>
+					</view>
+				</block>
+				
+				<block wx:if="{{enableMeiye}}">
+					<block wx:if="{{taoheList && taoheList.length > 0}}">
+						<view class="taohe fs28" wx:for="{{taoheList}}">
+							<view class="flex ai_c jc_sb" style="height: 88rpx;">
+								<view class="ellipsis-2 f1">{{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个)</view>
+								<view class="pdl30 t-r">
+										<view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
+										<view class="fs22 c-9 del">零售价：￥{{item.show_price}}</view>
+								</view>
+							</view>
+							<view class="flex ai_c jc_sb fs24 c-6 pdt10">
+								<view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+								<view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item,data.validDays)}}</view>
+							</view>
+						</view>
+					</block>
+				</block>
 				
 					<view class="wxParse">
 						<template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
--
libgit2 0.21.4