Commit 066667dc4f08a992b773340da47afd4854fafb8c
1 parent
387a4dd477
Exists in
master
add refundProgress
Showing
7 changed files
with
302 additions
and
33 deletions
Show diff stats
src/pages.json
1 | 1 | { |
2 | 2 | "pages": [ |
3 | 3 | { |
4 | + "path" : "pages/refundProgress/refundProgress", | |
5 | + "style": { | |
6 | + "navigationBarTitleText": "申请退款" | |
7 | + } | |
8 | + }, | |
9 | + { | |
4 | 10 | "path": "pages/index/index", |
5 | 11 | "style": { |
6 | 12 | "navigationBarTitleText": "商城一览" |
7 | 13 | // "enablePullDownRefresh":true |
8 | 14 | } |
9 | 15 | }, |
10 | - { | |
11 | - "path" : "pages/refund/refund", | |
12 | - "style": { | |
13 | - "navigationBarTitleText": "申请退款" | |
14 | - } | |
15 | - }, | |
16 | 16 | { |
17 | 17 | "path" : "pages/myOrder/myOrder", |
18 | 18 | "style" : { |
... | ... | @@ -51,6 +51,9 @@ |
51 | 51 | "path": "pages/refundment/refundment" |
52 | 52 | }, |
53 | 53 | { |
54 | + "path": "pages/Predelivery/Predelivery" | |
55 | + }, | |
56 | + { | |
54 | 57 | "path": "pages/customerService/customerService" |
55 | 58 | }, |
56 | 59 | { | ... | ... |
src/pages/addArddess/addArddess.vue
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 | <text class="itemText">地区</text> |
14 | 14 | <view class="btn" v-if="pickerText===''" @tap="openAddres">选择省/市/区</view> |
15 | 15 | <view class="btn" v-else @tap="openAddres">{{pickerText}}</view> |
16 | - <simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onConfirm" themeColor="#007AFF"></simple-address> | |
16 | + <simple-address ref="SimpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onConfirm" themeColor="#007AFF"></simple-address> | |
17 | 17 | </view> |
18 | 18 | <view class="item,address" > |
19 | 19 | <text class="itemText">详细地址</text> |
... | ... | @@ -30,7 +30,7 @@ |
30 | 30 | </template> |
31 | 31 | |
32 | 32 | <script> |
33 | - import simpleAddress from '@/components/Simple-address/simple-address.vue'; | |
33 | + import SimpleAddress from '@/components/Simple-address/Simple-address.vue'; | |
34 | 34 | export default { |
35 | 35 | data() { |
36 | 36 | return { |
... | ... | @@ -41,12 +41,12 @@ |
41 | 41 | }; |
42 | 42 | }, |
43 | 43 | components: { |
44 | - simpleAddress | |
44 | + SimpleAddress | |
45 | 45 | }, |
46 | 46 | methods: { |
47 | 47 | openAddres() { |
48 | 48 | this.cityPickerValueDefault = [0,0,1] |
49 | - this.$refs.simpleAddress.open(); | |
49 | + this.$refs.SimpleAddress.open(); | |
50 | 50 | }, |
51 | 51 | onConfirm(e) { |
52 | 52 | this.pickerText = e.label; | ... | ... |
src/pages/index/index.vue
... | ... | @@ -50,7 +50,7 @@ |
50 | 50 | </template> |
51 | 51 | |
52 | 52 | <script> |
53 | - import UniDrawer from "@/components/uni-drawer/uni-drawer.vue"; | |
53 | + import UniDrawer from "@/components/Uni-drawer/Uni-drawer.vue"; | |
54 | 54 | import Card from "../../components/Card/Card.vue" |
55 | 55 | import HMfilterDropdown from "../../components/HM-filterDropdown/HM-filterDropdown.vue"; |
56 | 56 | import data from '@/common/data.js';//筛选菜单数据 | ... | ... |
src/pages/myOrder/myOrder.vue
src/pages/refund/refund.vue
src/pages/refundProgress/refundProgress.vue
... | ... | @@ -0,0 +1,269 @@ |
1 | +<template> | |
2 | + <view class="content"> | |
3 | + <view class="header" v-if="type===1"> | |
4 | + <view class="header-left"> | |
5 | + <view class="text1" >退款中</view> | |
6 | + <view class="text2">还剩00:56:27确认</view> | |
7 | + </view> | |
8 | + <image class="header-right" src="../../static/customerService-simle.png" mode="aspectFill"></image> | |
9 | + </view> | |
10 | + <view class="header" v-if="type===2"> | |
11 | + <view class="header-left"> | |
12 | + <view class="text1" >商家处理中</view> | |
13 | + <view class="text2">还剩00:56:27确认</view> | |
14 | + </view> | |
15 | + <image class="header-right" src="../../static/customerService-simle.png" mode="aspectFill"></image> | |
16 | + </view> | |
17 | + <view class="header" v-if="type===3"> | |
18 | + <view class="header-left"> | |
19 | + <view class="text1" >卖家已发货</view> | |
20 | + <view class="text2">还剩 00:56:27 确认</view> | |
21 | + </view> | |
22 | + <image class="header-right" src="../../static/customerService-simle.png" mode="aspectFill"></image> | |
23 | + </view> | |
24 | + <view class="orderInfoCard"> | |
25 | + <view class="info"> | |
26 | + <image src="../../static/img/detail/d1.png" mode="aspectFill"></image> | |
27 | + <view class="infoText"> | |
28 | + <view class="orderName">商品名称商品名称商品名称</view> | |
29 | + <view class="orderDescrib">规格:玫瑰金 / 钛合金 / 防日光防紫外线</view> | |
30 | + <view class="infoText-bottom"> | |
31 | + <view class="markPrice">¥188</view> | |
32 | + <view class="buy-num">X 1</view> | |
33 | + </view> | |
34 | + </view> | |
35 | + </view> | |
36 | + <view class="refund_price"> | |
37 | + <text class="refund_price_title">退款金额</text> | |
38 | + <text class="refund_price_price">¥110</text> | |
39 | + </view> | |
40 | + </view> | |
41 | + <view class="application"> | |
42 | + <view class="title">申请记录</view> | |
43 | + <view class="item"> | |
44 | + <text class="text1">服务类型</text> | |
45 | + <text class="text2">退款</text> | |
46 | + </view> | |
47 | + <view class="item"> | |
48 | + <text class="text1">换货原因</text> | |
49 | + <text class="text2">不想要了</text> | |
50 | + </view> | |
51 | + <view class="item"> | |
52 | + <text class="text1">申请时间</text> | |
53 | + <text class="text2">2020-10-22 17:55:03</text> | |
54 | + </view> | |
55 | + <view class="item"> | |
56 | + <text class="text1">货物编号</text> | |
57 | + <text class="text2">173549842184</text> | |
58 | + </view> | |
59 | + <view class="button"> | |
60 | + <image src="../../static/customerService-horn.png" mode="aspectFill" style="width: 38rpx;height: 38rpx;"></image> | |
61 | + <text>联系客服</text> | |
62 | + </view> | |
63 | + </view> | |
64 | + <view class="btn-bar" v-if="type===1"> | |
65 | + <view class="btn2"> | |
66 | + 退款进度 | |
67 | + </view> | |
68 | + </view> | |
69 | + <view class="btn1" v-if="type===2"> | |
70 | + 修改申请 | |
71 | + </view> | |
72 | + <view v-if="type===3"></view> | |
73 | + </view> | |
74 | +</template> | |
75 | + | |
76 | +<script> | |
77 | + export default { | |
78 | + data() { | |
79 | + return { | |
80 | + type:3 | |
81 | + }; | |
82 | + } | |
83 | + } | |
84 | +</script> | |
85 | + | |
86 | +<style lang="scss"> | |
87 | + .content{ | |
88 | + background-color: #F2F2F2; | |
89 | + min-height: 100vh; | |
90 | + display: flex; | |
91 | + flex-direction: column; | |
92 | + align-items: center; | |
93 | + .header{ | |
94 | + width: 100%; | |
95 | + height: 142rpx; | |
96 | + background-color: #4A90E2; | |
97 | + color: #FFFFFF; | |
98 | + display: flex; | |
99 | + justify-content: space-between; | |
100 | + align-items: center; | |
101 | + padding: 0 60rpx; | |
102 | + box-sizing: border-box; | |
103 | + .header-left{ | |
104 | + display: flex; | |
105 | + flex-direction: column; | |
106 | + justify-content: space-between; | |
107 | + align-items: center; | |
108 | + height: 92rpx; | |
109 | + width: 220rpx; | |
110 | + color: #FFFFFF; | |
111 | + .text1{ | |
112 | + font-size: 36rpx; | |
113 | + } | |
114 | + .text2{ | |
115 | + font-size: 24rpx; | |
116 | + } | |
117 | + } | |
118 | + .header-right{ | |
119 | + height: 48rpx; | |
120 | + width: 48rpx; | |
121 | + } | |
122 | + } | |
123 | + .orderInfoCard{ | |
124 | + height: 362rpx; | |
125 | + width: 670rpx; | |
126 | + background: #FFFFFF; | |
127 | + box-shadow: 0 0 10px 0 rgba(177,128,128,0.06); | |
128 | + border-radius: 8px; | |
129 | + margin-top: 20rpx; | |
130 | + margin-bottom: 20rpx; | |
131 | + padding: 40rpx 40rpx 60rpx 40rpx; | |
132 | + box-sizing: border-box; | |
133 | + .info{ | |
134 | + width: 100%; | |
135 | + display: flex; | |
136 | + flex-direction: row; | |
137 | + justify-content: space-between; | |
138 | + align-items: center; | |
139 | + margin-bottom: 30rpx; | |
140 | + image{ | |
141 | + height: 188rpx; | |
142 | + width: 188rpx; | |
143 | + margin-right: 24rpx; | |
144 | + } | |
145 | + .infoText{ | |
146 | + display: flex; | |
147 | + flex-direction: column; | |
148 | + justify-content: space-between; | |
149 | + align-items: flex-start; | |
150 | + height: 188rpx; | |
151 | + } | |
152 | + .orderName{ | |
153 | + font-size: 14px; | |
154 | + color: #333333; | |
155 | + } | |
156 | + .orderDescrib{ | |
157 | + font-size: 12px; | |
158 | + color: #999999; | |
159 | + } | |
160 | + .infoText-bottom{ | |
161 | + display: flex; | |
162 | + flex-direction: row; | |
163 | + justify-content: space-between; | |
164 | + align-items: center; | |
165 | + width: 100%; | |
166 | + .markPrice{ | |
167 | + font-size: 14px; | |
168 | + color: #FF6B4A; | |
169 | + } | |
170 | + .buy-num{ | |
171 | + font-size: 12px; | |
172 | + color: #999999; | |
173 | + } | |
174 | + } | |
175 | + } | |
176 | + .refund_price{ | |
177 | + text-align: right; | |
178 | + .refund_price_title{ | |
179 | + font-size: 14px; | |
180 | + color: #333333; | |
181 | + margin-right: 40rpx; | |
182 | + } | |
183 | + .refund_price_price{ | |
184 | + font-size: 14px; | |
185 | + color: #FF6B4A; | |
186 | + } | |
187 | + } | |
188 | + } | |
189 | + .application{ | |
190 | + background: #FFFFFF; | |
191 | + box-shadow: 0 0 10px 0 rgba(177,128,128,0.06); | |
192 | + border-radius: 8px; | |
193 | + height: 532rpx; | |
194 | + width: 670rpx; | |
195 | + margin-bottom: 132rpx; | |
196 | + padding: 40rpx 40rpx 32rpx 36rpx; | |
197 | + box-sizing: border-box; | |
198 | + display: flex; | |
199 | + flex-direction: column; | |
200 | + justify-content: space-between; | |
201 | + .title{ | |
202 | + font-size: 16px; | |
203 | + color: #333333; | |
204 | + } | |
205 | + .item{ | |
206 | + font-size: 12px; | |
207 | + color: #999999; | |
208 | + .text1{ | |
209 | + font-size: 12px; | |
210 | + color: #999999; | |
211 | + margin-right: 40rpx; | |
212 | + } | |
213 | + .text2{ | |
214 | + font-size: 12px; | |
215 | + color: #B8B8B8; | |
216 | + } | |
217 | + } | |
218 | + .button{ | |
219 | + display: flex; | |
220 | + justify-content: flex-start; | |
221 | + image{ | |
222 | + margin-right: 20rpx; | |
223 | + } | |
224 | + font-size: 14px; | |
225 | + color: #333333; | |
226 | + } | |
227 | + } | |
228 | + .btn1{ | |
229 | + position: fixed; | |
230 | + height: 112rpx; | |
231 | + width: 100%; | |
232 | + background-color: #FF6B4A; | |
233 | + color: #FFFFFF; | |
234 | + font-size: 32rpx; | |
235 | + left: 0; | |
236 | + bottom: 0; | |
237 | + font-size: 16px; | |
238 | + color: #FFFFFF; | |
239 | + line-height: 112rpx; | |
240 | + text-align: center; | |
241 | + } | |
242 | + .btn-bar{ | |
243 | + position: fixed; | |
244 | + left: 0; | |
245 | + bottom: 0; | |
246 | + height: 112rpx; | |
247 | + width: 100%; | |
248 | + background-color: #FFFFFF; | |
249 | + padding-right: 26rpx; | |
250 | + box-sizing: border-box; | |
251 | + display: flex; | |
252 | + justify-content: flex-end; | |
253 | + align-items: center; | |
254 | + .btn2{ | |
255 | + width: 204rpx; | |
256 | + height: 80rpx; | |
257 | + border: 1px solid #FF6B4A; | |
258 | + border-radius: 20px; | |
259 | + border-radius: 20px; | |
260 | + background-color: #FFFFFF; | |
261 | + font-size: 16px; | |
262 | + color: #FF6B4A; | |
263 | + line-height: 80rpx; | |
264 | + text-align: center; | |
265 | + } | |
266 | + } | |
267 | + | |
268 | + } | |
269 | +</style> | ... | ... |
src/pages/user/user.vue
... | ... | @@ -22,11 +22,11 @@ |
22 | 22 | </view> |
23 | 23 | </view> |
24 | 24 | <view class="orderBody"> |
25 | - <view class="item,waitPay"> | |
25 | + <view class="item,waitPay" @click=toMyOrderPaying> | |
26 | 26 | <image src="../../static/waitPay.png" mode="aspectFill"></image> |
27 | 27 | <text>待付款</text> |
28 | 28 | </view> |
29 | - <view class="item,waitDeliver"> | |
29 | + <view class="item,waitDeliver" @click=toPredelivery> | |
30 | 30 | <image src="../../static/waitDeliver.png" mode="aspectFill"></image> |
31 | 31 | <text>待发货</text> |
32 | 32 | </view> |
... | ... | @@ -98,6 +98,22 @@ |
98 | 98 | fail: () => {}, |
99 | 99 | complete: () => {} |
100 | 100 | }); |
101 | + }, | |
102 | + toPredelivery(){ | |
103 | + uni.navigateTo({ | |
104 | + url: '../Predelivery/Predelivery', | |
105 | + success: res => {}, | |
106 | + fail: () => {}, | |
107 | + complete: () => {} | |
108 | + }); | |
109 | + }, | |
110 | + toMyOrderPaying(){ | |
111 | + uni.navigateTo({ | |
112 | + url: '../myorder-paying/myorder-paying', | |
113 | + success: res => {}, | |
114 | + fail: () => {}, | |
115 | + complete: () => {} | |
116 | + }); | |
101 | 117 | } |
102 | 118 | } |
103 | 119 | } | ... | ... |