收费和续费

package-basic-data/pages/activity/activity.wxml

@@ -37,19 +37,25 @@
 	</view>
 
 	<!--活动（标准版）-->
-	<view class="func" wx:if="{{gradeCode == 'STD'}}">
+	<!--合计（标准版）-->
+	<view class="summary-class-std" wx:if="{{gradeCode == 'STD'}}">
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;font-size: 20px;">额外购买授权
+		</view>
 		<view style="display:flex;flex-wrap: wrap;">
 			<view class="func-card-std" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}">
-				<!-- 标题 -->
-				<view class="card-title-std">{{item.activityItemName}}
-				</view>
-				<!-- 价格-->
-				<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
 				<!-- 授权-->
 				<view class="card-desc-std">
-					<view style="font-size: 13px;">{{$t['userAuthorize']}}</view>
-					<view style="text-align: right;"><van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="0" bind:change="changeUserSTD" /></view>
-					
+					<view style="font-size: 13px;margin-left: -15px;">
+						<!-- 价格-->
+						<dk-cell fontSize="21" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
+					</view>
+					<view style="font-size: 11px;width: 80px;">/年/授权</view>
+					<view style="text-align: right;">
+						<van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="1" bind:change="changeUserSTD" />
+					</view>
+				</view>
+				<!-- 订单总价： -->
+				<view style="display: flex;font-size: 12px;margin-left: 20rpx;color: #000000;padding-left: 10rpx;padding-right: 10rpx;"><view style="color:#000;font-size: 11px;">订单总价：{{summaryInfo.amountInfo}}</view>
 				</view>
 			</view>
 
@@ -65,6 +71,12 @@
 				</view>
 			</view>
 		</view>
+
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;">截止日期：<view style="color:#E4002B">{{userEndDate}}</view>
+		</view>
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;justify-content:space-between;align-items: center;">包含当前账号可配置{{summaryInfo.wxMaxNum+1}}个授权
+			<dk-cell fontSize="21" center="center" contentFontWeight="600" contentColor="#FF7B1A" content="{{summaryInfo.amount }}"></dk-cell>
+		</view> 
 	</view>
 
 	<!--用户数-->
@@ -111,16 +123,6 @@
 			折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
 	</view>
 
-	<!--合计（标准版）-->
-	<view class="summary-class" wx:if="{{gradeCode == 'STD'}}">
-		<view class="summary-item-class">订单详情：</view>
-		<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
-		<view class="summary-item-class" style="display: flex;">截止日期：<view style="color:#FF7B1A">{{userEndDate}}</view>
-		</view>
-		<view class="summary-item-class" style="display: flex;justify-content: flex-end;" wx:if="{{buyUser && summaryInfo.wxMaxNum}}">
-			折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
-	</view>
-
 	<!--注册须知 240704 去除 用功能模块代替-->
 	<!-- <view class="notice-class" wx:if="{{gradeCode != 'STD'}}">
 		<view class="notice-item-class" style="font-size: 16px;font-weight: bold;">{{noticeInfo.title}}</view>
@@ -138,15 +140,13 @@
 	<view class="notice-class" wx:if="{{upgradeFlag}}" catch:tap="funcClick">
 		<view class="notice-item-class" style="color: #FF7B1ACC; font-size: 16px;font-weight: bold;text-align: center;">{{noticeInfo.proTitle}}</view>
 		<view style="display: flex;flex-wrap: wrap;padding: 10rpx 0 20rpx 0;">
-			<view class="app-item" style="width:25%;text-align: center;margin-top: 15rpx;margin-bottom: 15rpx;" wx:for="{{funcMenu}}" wx:for-item="item"  wx:key="i">				 
+			<view class="app-item" style="width:25%;text-align: center;margin-top: 15rpx;margin-bottom: 15rpx;" wx:for="{{funcMenu}}" wx:for-item="item" wx:key="i">
 				<image src="{{imageUrl + item.icon }}" style="height: 85rpx;width:85rpx;"></image>
 				<view class="index-grid-item-text-class" style="font-size: 12px;">{{item.title}}</view>
 			</view>
 		</view>
 	</view>
 
-
-
 	<view style="height: 200rpx;"></view>
 </view>
 

package-basic-data/pages/activity/activity.wxss

@@ -116,12 +116,11 @@ page {
 }
 
 .func-card-std {
-	margin: 15rpx 22rpx;
-	width: 95%;
-	height: 215rpx;
+	margin: 15rpx 15rpx;
+	width: 97%;
+	height: 205rpx;
 	background: #FCF0DD;
-	border-radius: 19rpx;
-	border: 3rpx solid #CE9965;
+	border-radius: 19rpx; 
 }
 
 .func-card-vip-std-selected {
@@ -186,11 +185,12 @@ page {
 }
 
 .card-desc-std { 
-	margin: 10rpx 20rpx;
+	margin: 30rpx 20rpx;
+	padding: 10rpx;
 	display: flex;
-	height: 55rpx;
+	height: 50rpx;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: flex-start;
 	color: #1B365D;
 	font-weight: bold;
 	font-size: 14px;
@@ -216,6 +216,17 @@ page {
 	font-size: 14px;
 }
 
+
+.summary-class-std {
+	margin: 0 30rpx;
+	margin-top: 30rpx;
+	padding: 10rpx 5rpx;
+	border-radius: 16rpx;
+	background: #ffffff;
+	color: #CE9965;
+	font-size: 14px;
+}
+
 .notice-class {
 	margin: 0 30rpx;
 	margin-top: 30rpx;

package-basic-data/pages/activity/renew/renew.wxml

@@ -37,19 +37,24 @@
 	</view>
 
 	<!--活动（标准版）-->
-	<view class="func" wx:if="{{gradeCode == 'STD'}}">
+	<!--合计（标准版）-->
+	<view class="summary-class-std" wx:if="{{gradeCode == 'STD'}}">
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;font-size: 20px;">额外购买授权
+		</view>
 		<view style="display:flex;flex-wrap: wrap;">
 			<view class="func-card-std" wx:for="{{activityTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}">
 				<!-- 标题 -->
 				<view class="card-title-std">{{item.activityItemName}}
 				</view>
 				<!-- 价格-->
-				<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
+				<dk-cell fontSize="21" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
 				<!-- 授权-->
 				<view class="card-desc-std">
-					<view style="font-size: 13px;">{{$t['userAuthorize']}}</view>
-					<view style="text-align: right;"><van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="0" bind:change="changeUserSTD" /></view>
-					
+					<view style="font-size: 13px;width: 100px;">{{$t['userAuthorize']}}</view>
+					<view style="text-align: right;">
+						<van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="0" bind:change="changeUserSTD" />
+					</view>
+
 				</view>
 			</view>
 
@@ -64,6 +69,18 @@
 				<view class="card-desc">{{item.activityItemDescribe}}
 				</view>
 			</view>
+
+
+		</view>
+
+		<!-- 订单总价： -->
+		<view  class="summary-item-class" style="display: flex;  color: #000000;padding: 20rpx; "><view style="color:#000;">订单总价：{{summaryInfo.amountInfo}}</view>
+		</view>
+
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;">截止日期：<view style="color:#E4002B">{{userEndDate}}</view>
+		</view>
+		<view class="summary-item-class" style="display: flex;padding-left: 20rpx;color: #000000;justify-content:space-between;align-items: center;">包含当前账号可配置{{summaryInfo.wxMaxNum+1}}个授权
+			<dk-cell fontSize="21" center="center" contentFontWeight="600" contentColor="#FF7B1A" content="{{summaryInfo.amount }}"></dk-cell>
 		</view>
 	</view>
 
@@ -111,16 +128,6 @@
 			折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
 	</view>
 
-	<!--合计（标准版）-->
-	<view class="summary-class" wx:if="{{gradeCode == 'STD'}}">
-		<view class="summary-item-class">订单详情：</view>
-		<view class="summary-item-class">{{summaryInfo.amountInfo}}</view>
-		<view class="summary-item-class" style="display: flex;">截止日期：<view style="color:#FF7B1A">{{userEndDate}}</view>
-		</view>
-		<view class="summary-item-class" style="display: flex;justify-content: flex-end;" wx:if="{{buyUser && summaryInfo.wxMaxNum}}">
-			折合<dk-cell fontSize="14" left="5rpx" fontWeight="bold" height="45rpx" contentColor="#FF7B1A" content="{{summaryInfo.priceInfo}}"></dk-cell>/天/授权</view>
-	</view>
-
 	<!--注册须知 240704 去除 用功能模块代替-->
 	<!-- <view class="notice-class" wx:if="{{gradeCode != 'STD'}}">
 		<view class="notice-item-class" style="font-size: 16px;font-weight: bold;">{{noticeInfo.title}}</view>
@@ -138,15 +145,13 @@
 	<view class="notice-class" wx:if="{{upgradeFlag}}" catch:tap="funcClick">
 		<view class="notice-item-class" style="color: #FF7B1ACC; font-size: 16px;font-weight: bold;text-align: center;">{{noticeInfo.proTitle}}</view>
 		<view style="display: flex;flex-wrap: wrap;padding: 10rpx 0 20rpx 0;">
-			<view class="app-item" style="width:25%;text-align: center;margin-top: 15rpx;margin-bottom: 15rpx;" wx:for="{{funcMenu}}" wx:for-item="item"  wx:key="i">				 
+			<view class="app-item" style="width:25%;text-align: center;margin-top: 15rpx;margin-bottom: 15rpx;" wx:for="{{funcMenu}}" wx:for-item="item" wx:key="i">
 				<image src="{{imageUrl + item.icon }}" style="height: 85rpx;width:85rpx;"></image>
 				<view class="index-grid-item-text-class" style="font-size: 12px;">{{item.title}}</view>
 			</view>
 		</view>
 	</view>
 
-
-
 	<view style="height: 200rpx;"></view>
 </view>
 

package-basic-data/pages/activity/renew/renew.wxss

@@ -116,26 +116,24 @@ page {
 }
 
 .func-card-std {
-	margin: 15rpx 22rpx;
-	width: 95%;
-	height: 215rpx;
+	margin: 15rpx 15rpx;
+	width: 97%;
+	height: 255rpx;
 	background: #FCF0DD;
-	border-radius: 19rpx;
-	border: 3rpx solid #CE9965;
+	border-radius: 19rpx; 
 }
 
 .func-card-vip-std-selected {
-	margin: 15rpx 0rpx 15rpx 22rpx;
-	width: 29%;
+	margin: 15rpx 0rpx 15rpx 10rpx;
+	width: 30.8%;
 	height: 215rpx;
 	background: #FCF0DD;
-	border-radius: 19rpx;
-	border: 3rpx solid #CE9965;
+	border-radius: 19rpx; 
 }
 
 .func-card-vip-std {
-	margin: 15rpx 0rpx 15rpx 22rpx;
-	width: 29%;
+	margin: 15rpx 0rpx 15rpx 10rpx;
+	width: 30.8%;
 	height: 215rpx;
 	background: #ffffff;
 	border-radius: 19rpx;
@@ -186,11 +184,12 @@ page {
 }
 
 .card-desc-std { 
-	margin: 10rpx 20rpx;
+	margin: 30rpx 20rpx;
+	padding: 10rpx;
 	display: flex;
-	height: 55rpx;
+	height: 50rpx;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: flex-start;
 	color: #1B365D;
 	font-weight: bold;
 	font-size: 14px;
@@ -216,6 +215,17 @@ page {
 	font-size: 14px;
 }
 
+
+.summary-class-std {
+	margin: 0 30rpx;
+	margin-top: 30rpx;
+	padding: 10rpx 5rpx;
+	border-radius: 16rpx;
+	background: #ffffff;
+	color: #CE9965;
+	font-size: 14px;
+}
+
 .notice-class {
 	margin: 0 30rpx;
 	margin-top: 30rpx;