diff --git a/app.json b/app.json
index e7cac33..55d5301 100644
--- a/app.json
+++ b/app.json
@@ -84,7 +84,6 @@
"pages/cart/cart2_inte/cart2_inte",
"pages/giftpack/festival/festival",
"pages/team/team_more/team_more",
-
"pages/user/deposit/deposit",
"pages/user/deposit/prepaid/msg/msg",
"pages/user/deposit/prepaid/prepaid",
@@ -136,6 +135,7 @@
"pages/my_service/tment_eval",
"pages/my_service/tment_order_list",
"pages/my_service/beauty_deta",
+ "pages/my_service2/appment_main",
"pages/profile/profile",
"pages/parseHtml/parseHtml",
"pages/myGift/myGift",
@@ -152,7 +152,8 @@
"pages/user/comment/comment",
"pages/user/view_comment/view_comment",
"pages/user/add_comment/add_comment",
- "pages/user/user_coupon/user_coupon"
+ "pages/user/user_coupon/user_coupon",
+ "pages/user/buyDetails/buyDetails"
]
}
diff --git a/app.wxss b/app.wxss
index 618ccdb..552eb48 100644
--- a/app.wxss
+++ b/app.wxss
@@ -141,6 +141,10 @@
background-color: #f0f0f0;
}
+.bg-f8 {
+ background-color: #f8f8f8;
+}
+
.pr {
position: relative;
}
diff --git a/packageB/pages/user/buyDetails/buyDetails.js b/packageB/pages/user/buyDetails/buyDetails.js
new file mode 100644
index 0000000..78ec393
--- /dev/null
+++ b/packageB/pages/user/buyDetails/buyDetails.js
@@ -0,0 +1,113 @@
+const app = getApp();
+let self = null;
+
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ tabArr: ['购买', '续费'],
+ currentIndex: 0,
+
+ list: null,
+ isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+ noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+ pageNum: 1, // 当前页数
+ },
+
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ self = this;
+ 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,
+ });
+
+ // this.getData(true, '/api/weshop/plus/vip/mem/listBuyRecord', {
+ // storeId: app.globalData.setting.stoid,
+ // userId: app.globalData.user_id,
+ // });
+
+
+ app.request.promiseGet('/api/weshop/plus/vip/mem/listBuyRecord', {
+ data: {
+ storeId: app.globalData.setting.stoid,
+ userId: app.globalData.user_id,
+ },
+ isShowLoading: true,
+ }).then(function(res) {
+ self.setData({
+ list: res.data.data,
+ });
+ });
+
+
+
+ };
+ };
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+ this.scrollToLower('/api/weshop/plus/vip/mem/listBuyRecord', {
+ store_id: app.globalData.setting.stoid,
+ user_id: app.globalData.user_id,
+ });
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+
+})
\ No newline at end of file
diff --git a/packageB/pages/user/buyDetails/buyDetails.json b/packageB/pages/user/buyDetails/buyDetails.json
new file mode 100644
index 0000000..e9e3b32
--- /dev/null
+++ b/packageB/pages/user/buyDetails/buyDetails.json
@@ -0,0 +1,7 @@
+{
+ "navigationBarTitleText": "购卡明细",
+ "enablePullDownRefresh": false,
+ "usingComponents": {
+ "nodata": "/components/nodata/nodata"
+ }
+}
\ No newline at end of file
diff --git a/packageB/pages/user/buyDetails/buyDetails.wxml b/packageB/pages/user/buyDetails/buyDetails.wxml
new file mode 100644
index 0000000..57d7f7d
--- /dev/null
+++ b/packageB/pages/user/buyDetails/buyDetails.wxml
@@ -0,0 +1,33 @@
+
+
+
+
+ 支付流水号 {{item.PayNo}}
+
+
+
+ PLUS卡名
+ {{item.CardName}}名名名名名名名名名名名名名名
+
+
+ 有效期
+ {{filter.show_default(item.EffectiveDate)}}
+
+
+ 提交时间
+ {{item.BillDate}}
+
+
+
+ 类型：{{item.Buytype == 1 ? '购买':'续费'}}
+ {{item.CardFee}}
+
+
+
+
+
+
+
+
+
+
diff --git a/packageB/pages/user/buyDetails/buyDetails.wxss b/packageB/pages/user/buyDetails/buyDetails.wxss
new file mode 100644
index 0000000..56e15a1
--- /dev/null
+++ b/packageB/pages/user/buyDetails/buyDetails.wxss
@@ -0,0 +1,98 @@
+@charset "utf-8";
+
+.noMore {
+ padding: 20rpx;
+ color: #bbb;
+ text-align: center;
+ font-size: 22rpx;
+}
+
+.c-a4 {
+ color: #a4a4a4;
+}
+
+.c-red {
+ color: #FF6768;
+}
+
+page {
+ background-color: #f0f0f0;
+}
+
+.tab-title {
+ display: flex;
+ position: sticky;
+ background-color: white;
+ top: 0;
+ font-size: 30rpx;
+ z-index: 999;
+}
+
+.tab-title::after {
+ position: absolute;
+ content: '';
+ width: 2rpx;
+ height: 40%;
+ background-color: #f0f0f0;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;
+}
+
+.tab-title-item {
+ flex: 1;
+ text-align: center;
+ padding-top: 20rpx;
+ padding-bottom: 20rpx;
+ position: relative;
+}
+
+.tab-title-item.active {
+ color: #FF6768;
+ font-weight: bold;
+
+}
+
+.tab-title-item::after {
+ position: absolute;
+ content: '';
+ left: 100%;
+ bottom: 0;
+ width: 0;
+ border-bottom: 2rpx solid #FF6768;
+ /* height: 3rpx; */
+ transition: 0.2s all linear;
+}
+
+.tab-title-item.active::after {
+ /* left: 100%; */
+ width: 100%;
+ left: 0;
+ /* background-color: #FF6768; */
+ /* transition-delay: 0.1s; */
+}
+
+.tab-title-item.active ~ .tab-title-item::after {
+ /* width: 100%; */
+ left: 0;
+}
+
+.list {
+ padding: 20rpx 20rpx 0 20rpx;
+}
+
+.item {
+ background-color: white;
+ border-radius: 8rpx;
+ overflow: hidden;
+}
+
+.item ~ .item {
+ margin-top: 20rpx;
+}
+
+.rmb::before {
+ content: '￥';
+}
\ No newline at end of file
diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index cc49576..34da177 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -876,7 +876,21 @@ Page({
//显示弹出框
show_change:function () { this.setData({is_show_change_pop:1}); },
//关闭弹出框
- close_card_change_pop:function () { this.setData({is_show_change_pop:0}); }
+ close_card_change_pop:function () { this.setData({is_show_change_pop:0}); },
+
+
+ /**
+ * 点击跳转
+ */
+ goto(e) {
+ let url = '';
+ if(e.target.dataset.url) {
+ url = e.target.dataset.url;
+ } else {
+ url = e.currentTarget.dataset.url;
+ }
+ t.goto(url);
+ },
diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml
index e21972f..bbdb261 100644
--- a/pages/user/cardinfo/cardinfo.wxml
+++ b/pages/user/cardinfo/cardinfo.wxml
@@ -28,6 +28,7 @@
卡类升级
+ 购卡明细