From fa7bdcb3d9a65448de730f560fd2fd57ab4572a1 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Wed, 19 May 2021 18:00:52 +0800
Subject: [PATCH] 礼包详情

---
 packageA/pages/myGift/myGift.js                 |   7 +++----
 packageA/pages/myGift/myGift.wxml               |   8 ++++----
 packageA/pages/myGift/myGift.wxss               |   2 ++
 packageA/pages/myGiftDetails/myGiftDetails.js   | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 packageA/pages/myGiftDetails/myGiftDetails.json |   8 ++++++++
 packageA/pages/myGiftDetails/myGiftDetails.wxml |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 packageA/pages/myGiftDetails/myGiftDetails.wxss |  79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 248 insertions(+), 8 deletions(-)
 create mode 100644 packageA/pages/myGiftDetails/myGiftDetails.js
 create mode 100644 packageA/pages/myGiftDetails/myGiftDetails.json
 create mode 100644 packageA/pages/myGiftDetails/myGiftDetails.wxml
 create mode 100644 packageA/pages/myGiftDetails/myGiftDetails.wxss

diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index 03da9f1..c807cfe 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -32,9 +32,9 @@ Page({
 		});
 		
 		if(index == 0) {
-			url = '/api/weshop/libao/libaoFormvip/page';
-		} else if(index == 1) {
 			url = '/api/weshop/libao/libaoForm/page';
+		} else if(index == 1) {
+			url = '/api/weshop/libao/libaoFormvip/page';
 			data.user_id = app.globalData.user_id;
 		};
 		
@@ -72,9 +72,8 @@ Page({
 					isLogin: true,
 				});
 				
-				this.getData(true, '/api/weshop/libao/libaoFormvip/page', {
+				this.getData(true, '/api/weshop/libao/libaoForm/page', {
 					store_id: app.globalData.setting.stoid,
-					user_id: app.globalData.user_id,
 				});				
 			};
 		};
diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 24147ed..84d2d87 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -6,7 +6,7 @@
 	<view class="tab-content">
 		<block wx:if="{{currentIndex == 0}}">
 			<view class="tab-item" wx:for="{{list.pageData}}">
-				<view bindtap="goto" data-url="/packageA/pages/myGiftDetails/myGiftDetails">
+				<view bindtap="goto" data-url="{{'/packageA/pages/myGiftDetails/myGiftDetails?id=' + item.lbvipid}}">
 					<!-- 图片 -->
 					<view class="img-container"><image src="{{imghost + item.lburl}}" class="img" mode="widthFix"/></view>
 					<view class="desc-container">
@@ -21,7 +21,7 @@
 							<view class="fs24 c-a4">已售{{item.salenum}}件</view>
 						</view>
 						<!-- 时间 -->
-						<view class="date">活动截止日期{{filter.format_time(item.expdate)}}</view>
+						<view class="date">活动截止日期 {{filter.format_time(item.expdate)}}</view>
 						<!-- 按钮 -->
 					</view>
 				</view>
@@ -33,14 +33,14 @@
 		</block>
 		
 		<block wx:else>
-			<view class="tab-item flex pd20" wx:for="{{list.pageData}}" bindtap="goto" data-url="/packageA/pages/myGiftDetails/myGiftDetails">
+			<view class="tab-item flex pd20" wx:for="{{list.pageData}}" bindtap="goto" data-url="{{'/packageA/pages/myGiftDetails/myGiftDetails?id=' + item.lbvipid}}">
 				<view class="img-container2"><image src="{{imghost + item.lburl}}" class="img" mode="widthFix"/></view>
 				<view class="flex fdc jc_sb">
 					<view>
 						<!-- 标题 -->
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
 						<!-- 时间 -->
-						<view class="date pdb20">活动截止日期{{filter.format_time(item.endtime)}}</view>
+						<view class="date pdb20">活动截止日期 {{filter.format_time(item.endtime)}}</view>
 					</view>
 					<!-- 说明 -->
 					<view class="c-red fs24">*请到线下门店兑换</view>
diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss
index d0bd4ea..845e145 100644
--- a/packageA/pages/myGift/myGift.wxss
+++ b/packageA/pages/myGift/myGift.wxss
@@ -103,6 +103,8 @@ page {
 	background-color: #dedede;
 	margin-right: 20rpx;
 	flex-shrink: 0;
+	display: flex;
+	align-items: center;
 }
 
 .img {
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
new file mode 100644
index 0000000..d10457c
--- /dev/null
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -0,0 +1,100 @@
+// packageA//pages/myGiftDetails/myGiftDetails.js
+const app = getApp();
+let self = null;
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+		self = this;
+		this.data.id = options.id;
+		// console.log('options', options);
+		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
+			self.setData({
+				userInfo: data,
+			});
+		});
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+		if(app.globalData.userInfo) {
+			if(!this.data.isLogin) {
+				this.setData({
+					userInfo: app.globalData.userInfo,
+					imghost: app.globalData.setting.imghost,
+					isLogin: true,
+				});
+				
+				// 请求数据
+				app.request.promiseGet('/api/weshop/libao/libaoFormvip/page', {
+					data: {
+						store_id: app.globalData.setting.stoid,
+						user_id: app.globalData.user_id,
+						id: this.data.id,
+					},
+					isShowLoading: true,
+				}).then(function(res) {
+					console.log('res-->', res.data.data.pageData);
+					self.setData({
+						details: res.data.data.pageData[0],
+					});
+				});
+			
+			};
+		};
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.json b/packageA/pages/myGiftDetails/myGiftDetails.json
new file mode 100644
index 0000000..c41d9ba
--- /dev/null
+++ b/packageA/pages/myGiftDetails/myGiftDetails.json
@@ -0,0 +1,8 @@
+{
+	"navigationBarTitleText": "礼包详情",
+	"enablePullDownRefresh": false,
+	"usingComponents": {
+		"warn": "/components/long_warn/long_warn",
+		"nav_b": "/components/nav_b/nav_b"
+	}
+}
\ No newline at end of file
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
new file mode 100644
index 0000000..f0403a3
--- /dev/null
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -0,0 +1,52 @@
+<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+<view class="pdb80">
+	<!-- 图片 -->
+	<view><image src="{{imghost + details.lburl}}" class="img" mode="widthFix"/></view>
+	<!-- 描述-->
+	<view class="desc-container">
+		<!-- 标题 -->
+		<view class="mgb10 ellipsis-2 lh taj">{{details.lbtitle}}</view>
+		<!-- 价格 -->
+		<view class="flex jc_sb ai-center pdb10">
+			<view class="flex ai-center">
+				<view class="c-red fs36"><text class="rmb">{{details.lbprice}}</text>/{{details.lbintegral}}积分</view>
+				<view class="fs22 c-a4 line-through mgl10">零售价{{details.oldprice}}</view>
+			</view>
+			<view class="fs24 c-a4">已售{{details.salenum}}件</view>
+		</view>
+		<!-- 时间 -->
+		<view class="date">活动截止日期 {{filter.format_time(details.expdate)}}</view>
+	</view>
+	<!-- 单品 -->
+	<view class="goods-container">
+		<view class="pd20 bold bdb">可到线下门店兑换以下单品</view>
+		<view class="">
+			<view class="flex pd20 jc_sb">
+				<view>单品名称</view>
+				<view>数量</view>
+			</view>
+			<view class="flex pd20 jc_sb">
+				<view>DN53000039蒂诺间金</view>
+				<view class="c-a4">x1</view>
+			</view>
+			<view class="flex pd20 jc_sb">
+				<view>蒂诺间金</view>
+				<view class="c-a4">x1</view>
+			</view>
+			<view class="flex pd20 jc_sb">
+				<view>金</view>
+				<view class="c-a4">x1000</view>
+			</view>
+			<view class="flex pd20 jc_sb">
+				<view class="ellipsis-1 pdr80">蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂蒂</view>
+				<view class="c-a4">x199</view>
+			</view>
+		</view>
+	</view>
+	
+	<!-- 按钮 -->
+	<view class="btn-container">
+		<view class="btn exchange">立即兑换</view>
+		<view class="btn buy">马上购买</view>
+	</view>
+</view>
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss
new file mode 100644
index 0000000..096e475
--- /dev/null
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss
@@ -0,0 +1,79 @@
+@charset "utf-8";
+
+.c-a4 {
+	color: #a4a4a4;
+}
+
+.c-red {
+	color: #FF6768;
+}
+
+page {
+	background-color: #f0f0f0;
+}
+
+.pdb80 {
+	padding-bottom: 80rpx;
+}
+
+.img-container {
+	background-color: #dedede;
+}
+
+.img {
+	display: block;
+	width: 100%;
+}
+
+
+.desc-container {
+	padding: 20rpx;
+	background-color: white;
+}
+
+
+.rmb::before {
+	content: '￥';
+}
+
+
+.date {
+	color: #a4a4a4;
+	font-size: 24rpx;
+}
+
+
+.goods-container {
+	margin-top: 20rpx;
+	background-color: white;
+	font-size: 28rpx;
+}
+
+
+
+
+
+
+.btn-container {
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	display: flex;
+	font-size: 30rpx;
+}
+
+.btn {
+	padding: 20rpx;
+	flex: 1;
+	text-align: center;
+}
+
+.btn.exchange {
+	background-color: #FF6768;
+	color: white;
+}
+
+.btn.buy {
+	background-color: #FACAD6;
+	color: #FF6768;
+}
\ No newline at end of file
--
libgit2 0.21.4