Merge branch 'master' of http://192.168.40.220/dmc/jz_applet into master

subpackage/orders/interestsList.vue

@@ -1,6 +1,24 @@
 <template>
 	<view class="content">
-		<view class="item" v-for="(item,index) in state.list" :key='index'>
+		<view @click="addInterestsList(item)" class="ul-item" v-for="(item, index) in state.list" :key="index">
+			<image style="width: 100%; height: 170rpx; border-radius: 20rpx"
+				:src="`${$imgUrl}applyCard/product-bg.png`"></image>
+			<view class="item-value">
+				<image class="icon-tip"
+					:src="state.sysType === 'WECHAT'?`${$imgUrl}applyCard/wechat.png` : `${$imgUrl}applyCard/alibaba.png`">
+				</image>
+				<view class="content">
+					<view class="title">
+						{{ item.productName }}
+					</view>
+				</view>
+				<view class="money">
+					￥：{{ item.discountPrice * 0.01 }}
+				</view>
+			</view>
+		</view>
+
+		<!-- <view class="item" v-for="(item,index) in state.list" :key='index'>
 			<view class="title" @click="addInterestsList(item)">
 				<view>
 					<view v-if='item.children' style="display: inline-block;">
@@ -11,10 +29,11 @@
 				</view>
 			</view>
 			<view v-if="item.isShow" class="children" v-for="(itemChild,index) in item.children" :key='index'>
-				<view><text>{{itemChild.productName}}</text>&nbsp;&nbsp;<text>{{itemChild.discountPrice * 0.01}}</text>
+				<view>
+					<text>{{itemChild.productName}}</text>&nbsp;&nbsp;<text>{{itemChild.discountPrice * 0.01}}</text>
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -59,10 +78,17 @@
 		totalAmount: 0,  //产品+权益产品金额
 		changeCardType: "",//储值卡转记账卡选权益产品
 		applyId: "",
-		orderId: ""
+		orderId: "",
+		sysType: ""
 	})
 
 	onLoad((option : any) => {
+		// #ifdef MP-ALIPAY
+		state.sysType = 'ALI';
+		// #endif
+		// #ifdef MP-WEIXIN
+		state.sysType = 'WECHAT';
+		// #endif
 		console.log("promoteId", option)
 		state.clientFee = option.clientFee;
 		state.userType = option.userType;
@@ -145,8 +171,6 @@
 			const openidData = stringToJson(result.data);
 			state.openid = openidData.openid;
 			setItem("QYorder", state);
-			// setItem("QYorder", result.data);
-			// state.openid = result.data.openid
 		});
 		// #endif
 	}
@@ -174,11 +198,6 @@
 </script>
 
 <style scoped lang="scss">
-	.content {
-		width: 100%;
-		height: 100vh;
-	}
-
 	.button {
 		height: 80rpx;
 		background: linear-gradient(-90deg, #43a1e0 0%, #13e7c1 100%);
@@ -225,10 +244,6 @@
 		align-items: center;
 	}
 
-	.title>checkbox-group {
-		// float: right;
-	}
-
 	.children {
 		margin-left: 50rpx;
 		margin-top: 16rpx;
@@ -250,4 +265,50 @@
 	checkbox {
 		transform: scale(0.8);
 	}
+
+	.ul-item {
+		padding: 5px 20rpx;
+		display: flex;
+		align-items: center;
+
+		.item-value {
+			padding: 20rpx;
+			position: absolute;
+			display: flex;
+			align-items: center;
+			width: 80%;
+
+			.content {
+				width: 51%;
+
+				.title {
+					font-size: 32rpx;
+					font-family: Microsoft YaHei;
+					font-weight: 400;
+					color: #ffffff;
+
+				}
+
+				.tip {
+					font-size: 24rpx;
+					font-family: Microsoft YaHei;
+					font-weight: 400;
+					color: #ffffff;
+				}
+			}
+		}
+
+		.icon-tip {
+			width: 100rpx;
+			height: 100rpx;
+		}
+
+		.content {
+			margin-left: 40rpx;
+		}
+	}
+
+	.money {
+		color: white;
+	}
 </style>