Commit cf8ead7e41c387f1d7d32e02f128dffc2cc905dc
1 parent
61e86433
礼包详情界面优化,好友助力界面优化
Showing
10 changed files
with
29 additions
and
16 deletions
pages/giftpack/birthdaygift/birthdaygift.json
1 | { | 1 | { |
2 | "navigationBarTitleText": "生日礼包", | 2 | "navigationBarTitleText": "生日礼包", |
3 | - "navigationStyle": "custom", | ||
4 | "usingComponents": { | 3 | "usingComponents": { |
5 | "warn": "/components/long_warn/long_warn", | 4 | "warn": "/components/long_warn/long_warn", |
6 | "my_confirm": "/components/my_confirm/my_confirm" | 5 | "my_confirm": "/components/my_confirm/my_confirm" |
pages/giftpack/buygiftpack/giftpackbuy.js
@@ -200,6 +200,7 @@ Page({ | @@ -200,6 +200,7 @@ Page({ | ||
200 | var th = this; | 200 | var th = this; |
201 | var url = e.currentTarget.dataset.url; | 201 | var url = e.currentTarget.dataset.url; |
202 | getApp().goto(url); | 202 | getApp().goto(url); |
203 | + | ||
203 | }, | 204 | }, |
204 | //下拉事件 | 205 | //下拉事件 |
205 | onReachBottom: function() { | 206 | onReachBottom: function() { |
pages/giftpack/buygiftpack/giftpackbuy.json
1 | { | 1 | { |
2 | "navigationBarTitleText": "礼包列表", | 2 | "navigationBarTitleText": "礼包列表", |
3 | - "enablePullDownRefresh": false, | ||
4 | "usingComponents": { | 3 | "usingComponents": { |
5 | "warn": "/components/long_warn/long_warn", | 4 | "warn": "/components/long_warn/long_warn", |
6 | "my_confirm": "/components/my_confirm/my_confirm" | 5 | "my_confirm": "/components/my_confirm/my_confirm" |
pages/giftpack/evaluategift/evaluategift.json
1 | { | 1 | { |
2 | "navigationBarTitleText": "评价有礼", | 2 | "navigationBarTitleText": "评价有礼", |
3 | - "navigationStyle": "custom", | ||
4 | "usingComponents": { | 3 | "usingComponents": { |
5 | "warn": "/components/long_warn/long_warn", | 4 | "warn": "/components/long_warn/long_warn", |
6 | "my_confirm": "/components/my_confirm/my_confirm" | 5 | "my_confirm": "/components/my_confirm/my_confirm" |
pages/giftpack/giftpacklist/giftpacklist.js
@@ -42,6 +42,7 @@ Page({ | @@ -42,6 +42,7 @@ Page({ | ||
42 | th.setData({ | 42 | th.setData({ |
43 | giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img") | 43 | giftRemark: th.data.giftRemark.replace(/<p><img/gi, "<p class='img'><img") |
44 | }) | 44 | }) |
45 | + th.close(); | ||
45 | }, | 46 | }, |
46 | onShow: function() { | 47 | onShow: function() { |
47 | 48 | ||
@@ -294,4 +295,11 @@ Page({ | @@ -294,4 +295,11 @@ Page({ | ||
294 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 295 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
295 | 296 | ||
296 | }, | 297 | }, |
298 | + //关闭导航 | ||
299 | + close: function () { | ||
300 | + var th = this; | ||
301 | + var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
302 | + nav_b.close_box(); | ||
303 | + nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy"); | ||
304 | + } | ||
297 | }); | 305 | }); |
298 | \ No newline at end of file | 306 | \ No newline at end of file |
pages/giftpack/giftpacklist/giftpacklist.json
1 | { | 1 | { |
2 | "navigationBarTitleText": "礼包详情", | 2 | "navigationBarTitleText": "礼包详情", |
3 | - "navigationStyle": "custom", | ||
4 | "usingComponents": { | 3 | "usingComponents": { |
5 | "warn": "/components/long_warn/long_warn", | 4 | "warn": "/components/long_warn/long_warn", |
6 | "my_confirm": "/components/my_confirm/my_confirm", | 5 | "my_confirm": "/components/my_confirm/my_confirm", |
7 | - "qr_code": "/components/qr_code/qr_code" | 6 | + "qr_code": "/components/qr_code/qr_code", |
7 | + "nav_b": "/components/nav_b/nav_b" | ||
8 | } | 8 | } |
9 | } | 9 | } |
10 | \ No newline at end of file | 10 | \ No newline at end of file |
pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -128,4 +128,6 @@ | @@ -128,4 +128,6 @@ | ||
128 | <warn id="warn"></warn> | 128 | <warn id="warn"></warn> |
129 | <my_confirm id="my_confirm"></my_confirm> | 129 | <my_confirm id="my_confirm"></my_confirm> |
130 | <!-- 弹出框扫描 --> | 130 | <!-- 弹出框扫描 --> |
131 | -<qr_code id="qc_com"></qr_code> | ||
132 | \ No newline at end of file | 131 | \ No newline at end of file |
132 | +<qr_code id="qc_com"></qr_code> | ||
133 | +<!-- 制作一个圆球导航 --> | ||
134 | +<nav_b id="nav_b"></nav_b> | ||
133 | \ No newline at end of file | 135 | \ No newline at end of file |
pages/giftpack/giftpacklist/giftpacklist.wxss
@@ -75,10 +75,12 @@ | @@ -75,10 +75,12 @@ | ||
75 | border: #999999 solid 1rpx; | 75 | border: #999999 solid 1rpx; |
76 | } */ | 76 | } */ |
77 | .box_ware_img image.data-v-3a5b7e36 { | 77 | .box_ware_img image.data-v-3a5b7e36 { |
78 | - width: 185rpx; | ||
79 | - height: 190rpx; | 78 | + /* width: 185rpx; |
79 | + height: 190rpx; */ | ||
80 | /* background-color: rgba(138, 138, 138, 0.63); */ | 80 | /* background-color: rgba(138, 138, 138, 0.63); */ |
81 | border: 2rpx solid #999999; | 81 | border: 2rpx solid #999999; |
82 | + width: 120rpx; | ||
83 | + height: 120rpx; | ||
82 | } | 84 | } |
83 | .box_ware_item.data-v-3a5b7e36 { | 85 | .box_ware_item.data-v-3a5b7e36 { |
84 | width: 70%; | 86 | width: 70%; |
@@ -86,7 +88,7 @@ | @@ -86,7 +88,7 @@ | ||
86 | position: relative; | 88 | position: relative; |
87 | } | 89 | } |
88 | .box_ware_item_title.data-v-3a5b7e36 { | 90 | .box_ware_item_title.data-v-3a5b7e36 { |
89 | - font-size: 30rpx; | 91 | + font-size: 24rpx; |
90 | word-break: break-all; | 92 | word-break: break-all; |
91 | text-overflow: ellipsis; | 93 | text-overflow: ellipsis; |
92 | display: -webkit-box; | 94 | display: -webkit-box; |
@@ -107,19 +109,19 @@ | @@ -107,19 +109,19 @@ | ||
107 | left: 0; | 109 | left: 0; |
108 | } | 110 | } |
109 | .box_ware_item_qty.data-v-3a5b7e36 { | 111 | .box_ware_item_qty.data-v-3a5b7e36 { |
110 | - font-size: 25rpx; | 112 | + font-size: 22rpx; |
111 | position: absolute; | 113 | position: absolute; |
112 | bottom: 15rpx; | 114 | bottom: 15rpx; |
113 | left: 0; | 115 | left: 0; |
114 | } | 116 | } |
115 | .box_ware_code.data-v-3a5b7e36 { | 117 | .box_ware_code.data-v-3a5b7e36 { |
116 | position: absolute; | 118 | position: absolute; |
117 | - bottom: 10rpx; | ||
118 | right: 10rpx; | 119 | right: 10rpx; |
120 | + bottom:10rpx; | ||
119 | } | 121 | } |
120 | .box_ware_code image.data-v-3a5b7e36 { | 122 | .box_ware_code image.data-v-3a5b7e36 { |
121 | - width: 60rpx; | ||
122 | - height: 60rpx; | 123 | + width: 50rpx; |
124 | + height: 50rpx; | ||
123 | } | 125 | } |
124 | .box_ware_code text.data-v-3a5b7e36 { | 126 | .box_ware_code text.data-v-3a5b7e36 { |
125 | font-size: 20rpx; | 127 | font-size: 20rpx; |
pages/user/assistance/assistance.wxml
@@ -47,8 +47,9 @@ | @@ -47,8 +47,9 @@ | ||
47 | <view class="ellipsis-1">豪华任务一 | 47 | <view class="ellipsis-1">豪华任务一 |
48 | </view> | 48 | </view> |
49 | </view> | 49 | </view> |
50 | - | ||
51 | - <view class="flex-center width state"> | 50 | + |
51 | + <!-- 已完成的颜色nostate --> | ||
52 | + <view class="flex-center width state {{index==0?'nostate':''}}"> | ||
52 | <view class="ellipsis-1">进行中 | 53 | <view class="ellipsis-1">进行中 |
53 | </view> | 54 | </view> |
54 | </view> | 55 | </view> |
pages/user/assistance/assistance.wxss
@@ -120,7 +120,9 @@ page { | @@ -120,7 +120,9 @@ page { | ||
120 | .state { | 120 | .state { |
121 | text-decoration: underline; | 121 | text-decoration: underline; |
122 | } | 122 | } |
123 | - | 123 | +.nostate{ |
124 | + color: rgb(195,155,156); | ||
125 | +} | ||
124 | .nothing { | 126 | .nothing { |
125 | padding: 50rpx 0rpx; | 127 | padding: 50rpx 0rpx; |
126 | } | 128 | } |