From de9c17d73b6b446f7491a1392644ebb32c6f6e81 Mon Sep 17 00:00:00 2001
From: batman <328485682@qq.com>
Date: Tue, 14 Aug 2018 15:36:37 +0800
Subject: [PATCH] gxx
---
app.json | 6 +-
pages/coupons/index/index.js | 113 +++++++++++++++----------------
pages/coupons/index/index.json | 12 ++--
pages/coupons/index/index.wxml | 42 +++++++++++-
pages/coupons/index/index.wxss | 83 +++++++++++++++++++++++
pages/market/index.wxml | 56 +++++++++++-----
pages/market/index.wxss | 117 ++++++++++++++++++++++++++++-----
pages/user/index.wxml | 2 +-
8 files changed, 326 insertions(+), 105 deletions(-)
diff --git a/app.json b/app.json
index add5736..9dfc231 100644
--- a/app.json
+++ b/app.json
@@ -1,10 +1,10 @@
{
"pages": [
+ "pages/coupons/index/index",
+ "pages/user/index",
"pages/index/index",
- "pages/login/index",
"pages/market/index",
- "pages/user/index",
- "pages/coupons/index/index",
+ "pages/login/index",
"pages/coupons/details/index",
"pages/order/index/index",
"pages/order/details/index",
diff --git a/pages/coupons/index/index.js b/pages/coupons/index/index.js
index daae2ca..8f85bf8 100644
--- a/pages/coupons/index/index.js
+++ b/pages/coupons/index/index.js
@@ -1,65 +1,56 @@
Page({
-
- /**
- * 页面的初始数据
- */
data: {
-
+ tabs: [{
+ key: 1,
+ name: "未使用"
+ },
+ {
+ key: 2,
+ name: "已使用"
+ },
+ {
+ key: 3,
+ name: "已过期"
+ },
+ {
+ key: 4,
+ name: "已退款"
+ }
+ ],
+ list: [{
+ key: '1',
+ data: [{
+ name: '111'
+ }]
+ },
+ {
+ key: '2',
+ data: [{
+ name: '222'
+ }]
+ },
+ {
+ key: '3',
+ data: [{
+ name: '333'
+ }]
+ }
+ ],
+ current: '',
+ current_scroll: '1'
+ },
+ handleChange({
+ detail
+ }) {
+ this.setData({
+ current: detail.key
+ });
+ },
+ handleChangeScroll({
+ detail
+ }) {
+ this.setData({
+ current_scroll: detail.key
+ });
},
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
})
\ No newline at end of file
diff --git a/pages/coupons/index/index.json b/pages/coupons/index/index.json
index 9d95912..656da8f 100644
--- a/pages/coupons/index/index.json
+++ b/pages/coupons/index/index.json
@@ -1,6 +1,8 @@
{
- "usingComponents": {
-
- },
- "navigationBarTitleText": "我的优惠劵"
- }
\ No newline at end of file
+ "usingComponents": {
+ "i-tab": "../../../dist/tab/index",
+ "i-tabs": "../../../dist/tabs/index",
+ "c-coupons": "../../../components/coupons/index"
+ },
+ "navigationBarTitleText": "我的优惠劵"
+}
\ No newline at end of file
diff --git a/pages/coupons/index/index.wxml b/pages/coupons/index/index.wxml
index 55f9155..49f19bd 100644
--- a/pages/coupons/index/index.wxml
+++ b/pages/coupons/index/index.wxml
@@ -1 +1,41 @@
-pages/t/index.wxml
+
+
+
+
+
+
+
+
+
+
+
+ 黑椒牛排
+
+
+ 有效期至:2018-07-10 11:30
+
+
+ 立即使用
+
+
+
+
+
+
+
+
+
+
+
+ 黑椒牛排
+
+
+ 有效期至:2018-07-10 11:30
+
+
+ 立即使用
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/coupons/index/index.wxss b/pages/coupons/index/index.wxss
index e69de29..fcd6471 100644
--- a/pages/coupons/index/index.wxss
+++ b/pages/coupons/index/index.wxss
@@ -0,0 +1,83 @@
+.market {
+ width: 100%;
+ height: 100%;
+}
+
+.tabs {
+ width: 100% !important;
+ height: 88rpx;
+ text-align: center;
+}
+
+.i-tab {
+ width: 25% !important;
+ display: inline-block;
+}
+
+.section {
+ margin-top: 2%;
+}
+
+.detail_msg {
+ width: 92%;
+ height: 220rpx !important;
+ background: #fff;
+ display: flex;
+ padding: 0 4%;
+ margin-top: 2%;
+ border-bottom: 1px solid #ededed;
+}
+
+.logo {
+ width: 248rpx;
+ height: 184rpx;
+ border-radius: 30rpx;
+}
+
+.logo image {
+ width: 100%;
+ height: 100%;
+}
+
+.info view:nth-child(1) {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 4%;
+}
+
+.info {
+ width: 100%;
+}
+
+.info view:nth-child(1) text {
+ font-size: 30rpx;
+}
+
+.info view:nth-child(2) {
+ color: #ff3434;
+ font-size: 24rpx;
+ padding-left: 4%;
+ margin-top: 1%;
+}
+
+.info view:nth-child(2) text {
+ font-size: 22rpx;
+ color: #b8b8b8;
+}
+
+.info view:nth-child(3) {
+ display: flex;
+ justify-content: space-between;
+}
+
+.info view:nth-child(3) text:nth-child(2) {
+ width: 170rpx;
+ height: 50rpx;
+ color: #fff;
+ line-height: 50rpx;
+ text-align: center;
+ background: #00c0ff;
+ border-radius: 10px;
+ font-size: 28rpx;
+ margin-top: 40rpx;
+}
diff --git a/pages/market/index.wxml b/pages/market/index.wxml
index e629c3d..db5bbc1 100644
--- a/pages/market/index.wxml
+++ b/pages/market/index.wxml
@@ -4,30 +4,54 @@
-
+
+
+
+
-
+ 黑椒牛排
+ 等待付款
-
- 黑椒牛排
- 等待付款
-
-
- 购买数量:1件
-
-
- 下单时间:2018-07-10 11:30
-
+ 购买数量:1件
+
+ 下单时间:2018-07-10 11:30
+
+
+
+
+ ¥1.00
+ ¥59.00
+
+
+ 支付
+
+
+
+
+
+
+
+
+
+
+ 黑椒牛排
+ 等待付款
+
+ 购买数量:1件
+
+ 下单时间:2018-07-10 11:30
+
+
+
+
+ ¥1.00
+ ¥59.00
- ¥1.00 ¥59.90
支付
-
\ No newline at end of file
diff --git a/pages/market/index.wxss b/pages/market/index.wxss
index 3025252..03a0eea 100644
--- a/pages/market/index.wxss
+++ b/pages/market/index.wxss
@@ -1,33 +1,114 @@
-.market{
+.market {
width: 100%;
+ height: 100%;
}
-.tabs{
- width: 100%!important;
+
+.tabs {
+ width: 100% !important;
height: 88rpx;
text-align: center;
}
-.i-tab{
- width: 30%!important;
+
+.i-tab {
+ width: 30% !important;
display: inline-block;
}
-.detail_msg{
- width: 100%;
- height: 416rpx!important;
- background: #fff;
+.section {
margin-top: 2%;
+}
+.detail_msg {
+ width: 92%;
+ height: 220rpx !important;
+ background: #fff;
display: flex;
- flex-direction: column;
+ margin: 0 4%;
+ margin-top: 2%;
+ border-bottom: 1px solid #ededed;
}
-.detail_msg>view:nth-child(1) {
- width: 100%;
- height: 244rpx;
-}
-.detail_msg>view:nth-child(1) view:nth-child(1) {
+
+.logo {
width: 248rpx;
height: 184rpx;
+ border-radius: 30rpx;
}
-.detail_msg>view:nth-child(1)>view:nth-child(1) image{
+
+.logo image {
width: 100%;
height: 100%;
- margin: 13.2% 0 0 13%;
-}
\ No newline at end of file
+}
+
+.info view:nth-child(1) {
+ display: flex;
+ justify-content: space-between;
+ padding: 0 4%;
+}
+
+.info {
+ width: 100%;
+}
+
+.info view:nth-child(1) {
+ margin-bottom: 72rpx;
+}
+
+.info view:nth-child(1) text {
+ font-size: 30rpx;
+}
+
+.info view:nth-child(1) text:nth-child(2) {
+ color: #ffae00;
+ font-size: 24rpx;
+}
+
+.info view:nth-child(2), .info view:nth-child(3) {
+ color: #ff3434;
+ font-size: 24rpx;
+ padding-left: 4%;
+}
+
+.info view:nth-child(2) text, .info view:nth-child(3) text {
+ font-size: 22rpx;
+ color: #b8b8b8;
+}
+
+.info view:nth-child(3) {
+ margin-top: 5rpx;
+}
+
+.payment {
+ width: 92%;
+ height: 120rpx;
+ line-height: 120rpx;
+ padding: 0 4%;
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 20rpx solid #EDEDED;
+}
+
+.payment view:nth-child(1) text:nth-child(1) {
+ font-size: 36rpx;
+ color: #ff3434;
+ font-weight: bold;
+}
+
+.payment view:nth-child(1) text:nth-child(2) {
+ font-size: 24rpx;
+ color: #b4b4b4;
+ padding-left: 18rpx;
+ text-decoration: line-through;
+}
+
+.payment view:nth-child(2) {
+ width: 114rpx;
+ height: 50rpx;
+ background: #00c0ff;
+ border-radius: 10px;
+ line-height: 38rpx;
+ text-align: center;
+ margin-top: 40rpx;
+}
+
+.payment view:nth-child(2) text {
+ font-size: 28rpx;
+ color: #fff;
+}
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index b101613..a020fb3 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -32,7 +32,7 @@
-
+
卷包