正在显示
21 个修改的文件
包含
569 行增加
和
201 行删除
@@ -424,19 +424,30 @@ | @@ -424,19 +424,30 @@ | ||
424 | } | 424 | } |
425 | 425 | ||
426 | .huiyuanprice { | 426 | .huiyuanprice { |
427 | - /* width: 166rpx; */ | 427 | + width:auto!important; |
428 | height: 36rpx; | 428 | height: 36rpx; |
429 | background: rgba(255, 248, 230, 1); | 429 | background: rgba(255, 248, 230, 1); |
430 | border-radius: 18rpx; | 430 | border-radius: 18rpx; |
431 | color: #FF9417; | 431 | color: #FF9417; |
432 | font-size: 22rpx; | 432 | font-size: 22rpx; |
433 | - text-align: center; | ||
434 | line-height: 36rpx; | 433 | line-height: 36rpx; |
435 | margin-top: 4rpx; | 434 | margin-top: 4rpx; |
436 | - | ||
437 | padding: 0 5rpx; | 435 | padding: 0 5rpx; |
438 | box-sizing: border-box; | 436 | box-sizing: border-box; |
439 | } | 437 | } |
438 | + .huiyuanpricek{ | ||
439 | + display: inline-block; | ||
440 | + color: #FF9417; | ||
441 | + font-size: 22rpx; | ||
442 | + height: 36rpx; | ||
443 | + background: rgba(255, 248, 230, 1); | ||
444 | + border-radius: 18rpx; | ||
445 | + padding: 0 12rpx; | ||
446 | + box-sizing: border-box; | ||
447 | + line-height: 36rpx; | ||
448 | + margin-top: 4rpx; | ||
449 | + | ||
450 | + } | ||
440 | 451 | ||
441 | .homeshoplist { | 452 | .homeshoplist { |
442 | flex-wrap: wrap; | 453 | flex-wrap: wrap; |
@@ -1094,7 +1105,7 @@ | @@ -1094,7 +1105,7 @@ | ||
1094 | display: flex; | 1105 | display: flex; |
1095 | align-items: center; | 1106 | align-items: center; |
1096 | justify-content: space-between; | 1107 | justify-content: space-between; |
1097 | - padding: 18rpx 82rpx; | 1108 | + padding: 10rpx 82rpx; |
1098 | box-sizing: border-box; | 1109 | box-sizing: border-box; |
1099 | position: fixed; | 1110 | position: fixed; |
1100 | bottom: 0; | 1111 | bottom: 0; |
@@ -1112,15 +1123,19 @@ | @@ -1112,15 +1123,19 @@ | ||
1112 | 1123 | ||
1113 | .teacherfootname { | 1124 | .teacherfootname { |
1114 | color: #5B5E63; | 1125 | color: #5B5E63; |
1115 | - font-size: 20rpx; | ||
1116 | - margin-top: 10rpx; | 1126 | + font-size: 24rpx; |
1127 | + margin-top: 5rpx; | ||
1117 | } | 1128 | } |
1118 | 1129 | ||
1119 | .shou { | 1130 | .shou { |
1120 | - width: 38rpx; | ||
1121 | - height: 37rpx; | 1131 | + width: 55rpx; |
1132 | + height: 55rpx; | ||
1122 | font-size: 0; | 1133 | font-size: 0; |
1123 | } | 1134 | } |
1135 | + .info{ | ||
1136 | + width:70rpx; | ||
1137 | + height:60rpx; | ||
1138 | + } | ||
1124 | 1139 | ||
1125 | .activename { | 1140 | .activename { |
1126 | color: #FF9417; | 1141 | color: #FF9417; |
1 | { | 1 | { |
2 | "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages | 2 | "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages |
3 | 3 | ||
4 | - | ||
5 | - | ||
6 | { | 4 | { |
7 | "path": "pages/homepage/homepage", | 5 | "path": "pages/homepage/homepage", |
8 | "style": { | 6 | "style": { |
@@ -686,6 +684,7 @@ | @@ -686,6 +684,7 @@ | ||
686 | } | 684 | } |
687 | ], | 685 | ], |
688 | 686 | ||
687 | + | ||
689 | "globalStyle": { | 688 | "globalStyle": { |
690 | "navigationBarTextStyle": "black", | 689 | "navigationBarTextStyle": "black", |
691 | "navigationBarTitleText": "uni-app", | 690 | "navigationBarTitleText": "uni-app", |
@@ -150,7 +150,7 @@ | @@ -150,7 +150,7 @@ | ||
150 | <view class="drawrap"> | 150 | <view class="drawrap"> |
151 | <view class="zhongjiang">恭喜中奖</view> | 151 | <view class="zhongjiang">恭喜中奖</view> |
152 | <view class="gifimg"> | 152 | <view class="gifimg"> |
153 | - <image src="../../static/gift.png" mode=""></image> | 153 | + <image src="../../static/imggift.png" mode=""></image> |
154 | </view> | 154 | </view> |
155 | <view class="giftname">零食大礼包</view> | 155 | <view class="giftname">零食大礼包</view> |
156 | <view class="containue" @click="clickLucks()">继续抽奖</view> | 156 | <view class="containue" @click="clickLucks()">继续抽奖</view> |
@@ -422,7 +422,7 @@ | @@ -422,7 +422,7 @@ | ||
422 | /* 中奖遮罩层 */ | 422 | /* 中奖遮罩层 */ |
423 | .drawrap{ | 423 | .drawrap{ |
424 | width:522rpx; | 424 | width:522rpx; |
425 | - height:604rpx; | 425 | + height:624rpx; |
426 | background:rgba(255,255,255,1); | 426 | background:rgba(255,255,255,1); |
427 | border-radius:24rpx; | 427 | border-radius:24rpx; |
428 | position: absolute; | 428 | position: absolute; |
@@ -437,8 +437,8 @@ | @@ -437,8 +437,8 @@ | ||
437 | margin-top:44rpx; | 437 | margin-top:44rpx; |
438 | } | 438 | } |
439 | .gifimg{ | 439 | .gifimg{ |
440 | - width:226rpx; | ||
441 | - height:210rpx; | 440 | + width:374rpx; |
441 | + height:248rpx; | ||
442 | font-size: 0; | 442 | font-size: 0; |
443 | margin:34rpx auto 0; | 443 | margin:34rpx auto 0; |
444 | } | 444 | } |
@@ -106,7 +106,7 @@ | @@ -106,7 +106,7 @@ | ||
106 | </view> | 106 | </view> |
107 | <view class="goodname hidden">{{item.name}}</view> | 107 | <view class="goodname hidden">{{item.name}}</view> |
108 | <view class="saleprice">¥{{item.goods_price}}</view> | 108 | <view class="saleprice">¥{{item.goods_price}}</view> |
109 | - <view class="huiyuanprice">会员价:¥{{item.vip_price}}</view> | 109 | + <view class="huiyuanpricek">会员价:¥{{item.vip_price}}</view> |
110 | </view> | 110 | </view> |
111 | </view> | 111 | </view> |
112 | </view> | 112 | </view> |
@@ -157,12 +157,13 @@ | @@ -157,12 +157,13 @@ | ||
157 | </view> | 157 | </view> |
158 | </view> | 158 | </view> |
159 | </view> | 159 | </view> |
160 | + <!-- <tabBar :current="currentTabIndex" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983" @click="tabClick"></tabBar> --> | ||
160 | 161 | ||
161 | <!-- 底部导航 --> | 162 | <!-- 底部导航 --> |
162 | <view class="teacherfooter"> | 163 | <view class="teacherfooter"> |
163 | <view class="teacherfootitem" @click="selnav" :data-id="1"> | 164 | <view class="teacherfootitem" @click="selnav" :data-id="1"> |
164 | <view class="teacherfootitemtop shou"> | 165 | <view class="teacherfootitemtop shou"> |
165 | - <image :src="footersel==1?'../../static/tieziactive.png':'../../static/tiezi.png'"></image> | 166 | + <image :src="footersel==1?'../../static/indexactive.png':'../../static/index.png'"></image> |
166 | </view> | 167 | </view> |
167 | <view class="teacherfootname " :class="footersel==1?'activename':''">首页</view> | 168 | <view class="teacherfootname " :class="footersel==1?'activename':''">首页</view> |
168 | </view> | 169 | </view> |
@@ -190,11 +191,16 @@ | @@ -190,11 +191,16 @@ | ||
190 | 191 | ||
191 | </view> | 192 | </view> |
192 | </template> | 193 | </template> |
193 | - | ||
194 | <script> | 194 | <script> |
195 | import app from "../../App.vue"; | 195 | import app from "../../App.vue"; |
196 | + import tabBar from '../../components/tabvue/tabvue.vue' | ||
197 | + // Vue.component('tab-bar', tabBar) | ||
196 | export default { | 198 | export default { |
199 | + components:{ | ||
200 | + tabBar | ||
201 | + }, | ||
197 | data() { | 202 | data() { |
203 | + | ||
198 | return { | 204 | return { |
199 | showbanben: false, | 205 | showbanben: false, |
200 | footersel: 1, | 206 | footersel: 1, |
@@ -205,7 +211,7 @@ | @@ -205,7 +211,7 @@ | ||
205 | shoplist: [], | 211 | shoplist: [], |
206 | carttotal:0, | 212 | carttotal:0, |
207 | provincename:'', | 213 | provincename:'', |
208 | - | 214 | + currentTabIndex:0 |
209 | } | 215 | } |
210 | }, | 216 | }, |
211 | onLoad() { | 217 | onLoad() { |
@@ -215,8 +221,43 @@ | @@ -215,8 +221,43 @@ | ||
215 | if(token!=''){ | 221 | if(token!=''){ |
216 | this.getcartnum() | 222 | this.getcartnum() |
217 | } | 223 | } |
224 | + | ||
218 | }, | 225 | }, |
219 | methods: { | 226 | methods: { |
227 | + tabClick(){ | ||
228 | + | ||
229 | + }, | ||
230 | + // 获取签到信息 | ||
231 | + getqiandaoinfo(){ | ||
232 | + let that = this; | ||
233 | + var url = 'sign/index'; | ||
234 | + var params = { | ||
235 | + | ||
236 | + } | ||
237 | + console.log(params) | ||
238 | + app.post(url, params).then((res) => { | ||
239 | + console.log(res); | ||
240 | + | ||
241 | + }).catch((err) => { | ||
242 | + | ||
243 | + }) | ||
244 | + }, | ||
245 | + // 签到 | ||
246 | + qiandao(){ | ||
247 | + let that = this; | ||
248 | + var url = 'sign/sign'; | ||
249 | + var params = { | ||
250 | + | ||
251 | + } | ||
252 | + console.log(params) | ||
253 | + app.post(url, params).then((res) => { | ||
254 | + console.log(res); | ||
255 | + | ||
256 | + }).catch((err) => { | ||
257 | + | ||
258 | + }) | ||
259 | + }, | ||
260 | + | ||
220 | getlocation() { | 261 | getlocation() { |
221 | let that=this; | 262 | let that=this; |
222 | uni.getLocation({ | 263 | uni.getLocation({ |
@@ -427,6 +468,7 @@ | @@ -427,6 +468,7 @@ | ||
427 | }, | 468 | }, |
428 | onShow(){ | 469 | onShow(){ |
429 | this.getlocation(); | 470 | this.getlocation(); |
471 | + this.getqiandaoinfo() | ||
430 | } | 472 | } |
431 | 473 | ||
432 | } | 474 | } |
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | </view> | 6 | </view> |
7 | 7 | ||
8 | </view> | 8 | </view> |
9 | - <view class="miaoshatime flexthree"> | 9 | + <view class="miaoshatime flexthree" v-if="timestatus==1"> |
10 | <view class='miaoname'>距离开始</view> | 10 | <view class='miaoname'>距离开始</view> |
11 | <!-- days:'', | 11 | <!-- days:'', |
12 | hours:'', | 12 | hours:'', |
@@ -29,10 +29,10 @@ | @@ -29,10 +29,10 @@ | ||
29 | <!-- <view class='miaotime boxsizing'>2</view> --> | 29 | <!-- <view class='miaotime boxsizing'>2</view> --> |
30 | </view> | 30 | </view> |
31 | </view> | 31 | </view> |
32 | - | ||
33 | <!-- 搜索商品 --> | 32 | <!-- 搜索商品 --> |
34 | <view class="searchgood commnonpadding"> | 33 | <view class="searchgood commnonpadding"> |
35 | - <view class="searchgooditem flexone boxsizing" v-for="(item,index) in orderlist" :key="index" @click="goodtail" :data-id="item.id"> | 34 | + <view class="searchgooditem flexone boxsizing" v-for="(item,index) in orderlist" :key="index" @click="timestatus==1?goodtail(item):''" > |
35 | + {{timestatus}} | ||
36 | <view class="gooditemleft"> | 36 | <view class="gooditemleft"> |
37 | <image :src="item.image" mode=""></image> | 37 | <image :src="item.image" mode=""></image> |
38 | </view> | 38 | </view> |
@@ -131,6 +131,7 @@ | @@ -131,6 +131,7 @@ | ||
131 | hours:'', | 131 | hours:'', |
132 | minutes:'', | 132 | minutes:'', |
133 | seconds:'', | 133 | seconds:'', |
134 | + timestatus:'' | ||
134 | } | 135 | } |
135 | }, | 136 | }, |
136 | onLoad() { | 137 | onLoad() { |
@@ -149,7 +150,10 @@ | @@ -149,7 +150,10 @@ | ||
149 | console.log(params) | 150 | console.log(params) |
150 | app.post(url,params, "post").then((res) => { | 151 | app.post(url,params, "post").then((res) => { |
151 | console.log(res); | 152 | console.log(res); |
152 | - let remaintime=res.data.data.endtime-res.data.data.starttime | 153 | + that.timestatus=res.data.data.status; |
154 | + let now_time = parseInt(new Date().getTime()) | ||
155 | + now_time=parseInt(now_time/1000); | ||
156 | + let remaintime=res.data.data.endtime-now_time | ||
153 | let number = remaintime; | 157 | let number = remaintime; |
154 | // 时间戳处理 | 158 | // 时间戳处理 |
155 | var totalSecond = number; | 159 | var totalSecond = number; |
@@ -222,8 +226,8 @@ | @@ -222,8 +226,8 @@ | ||
222 | }, | 226 | }, |
223 | 227 | ||
224 | // 商品详情 | 228 | // 商品详情 |
225 | - goodtail(e) { | ||
226 | - let id = e.currentTarget.dataset.id; | 229 | + goodtail(item) { |
230 | + let id = item.id; | ||
227 | console.log(id) | 231 | console.log(id) |
228 | // type 1 面访商品 | 232 | // type 1 面访商品 |
229 | uni.navigateTo({ | 233 | uni.navigateTo({ |
1 | <template> | 1 | <template> |
2 | <view class="content"> | 2 | <view class="content"> |
3 | <view class="giftlist"> | 3 | <view class="giftlist"> |
4 | - <view class="giftitem flextwo"> | 4 | + <!-- v-for="(item,index) in giftarr" :key="index" --> |
5 | + <view class="giftitem flextwo" v-for="(item,index) in giftarr" :key="index"> | ||
5 | <view class="giftitemleft"> | 6 | <view class="giftitemleft"> |
6 | - <view class="itemtop">我的奖品</view> | ||
7 | - <view class="itemtime">2019-10-13 15:30:30</view> | 7 | + <view class="flexone" v-if="item.type==1"> |
8 | + <view class="flexoneleft"> | ||
9 | + <image :src="item.image" mode=""></image> | ||
10 | + </view> | ||
11 | + <view class="itemtop jiangname">{{item.name}}</view> | ||
12 | + </view> | ||
13 | + <view class="itemtop" v-else>{{item.name}}</view> | ||
14 | + | ||
15 | + <view class="itemtime">{{item.givetime}}</view> | ||
8 | </view> | 16 | </view> |
9 | - <view class="itemname">立即兑换</view> | 17 | + <view class="itemname" v-if='item.is_give==2' @click="item.type==1?givegift(item):give(item)">立即兑换</view> |
18 | + <view class="itemnamek" v-if="item.is_give==1">已兑换</view> | ||
10 | </view> | 19 | </view> |
11 | - <view class="giftitem flextwo"> | 20 | + <!-- <view class="giftitem flextwo"> |
12 | <view class="giftitemleft"> | 21 | <view class="giftitemleft"> |
13 | <view class="itemtop">我的奖品</view> | 22 | <view class="itemtop">我的奖品</view> |
14 | <view class="itemtime">2019-10-13 15:30:30</view> | 23 | <view class="itemtime">2019-10-13 15:30:30</view> |
15 | </view> | 24 | </view> |
16 | <view class="itemnamek">立即兑换</view> | 25 | <view class="itemnamek">立即兑换</view> |
17 | - </view> | 26 | + </view> --> |
18 | </view> | 27 | </view> |
19 | </view> | 28 | </view> |
20 | </template> | 29 | </template> |
@@ -24,14 +33,15 @@ | @@ -24,14 +33,15 @@ | ||
24 | export default { | 33 | export default { |
25 | data() { | 34 | data() { |
26 | return { | 35 | return { |
27 | - showbanben: false | 36 | + showbanben: false, |
37 | + giftarr: '' | ||
28 | } | 38 | } |
29 | }, | 39 | }, |
30 | onLoad() { | 40 | onLoad() { |
31 | this.getgift() | 41 | this.getgift() |
32 | }, | 42 | }, |
33 | methods: { | 43 | methods: { |
34 | - getgift(){ | 44 | + getgift(item) { |
35 | let that = this; | 45 | let that = this; |
36 | var url = 'gift/my_gift'; | 46 | var url = 'gift/my_gift'; |
37 | console.log('获取的参数', that.seldata) | 47 | console.log('获取的参数', that.seldata) |
@@ -41,57 +51,115 @@ | @@ -41,57 +51,115 @@ | ||
41 | console.log(params) | 51 | console.log(params) |
42 | app.post(url, params, "post").then((res) => { | 52 | app.post(url, params, "post").then((res) => { |
43 | console.log(res); | 53 | console.log(res); |
54 | + that.giftarr = res.data.data; | ||
44 | // that.goodinfo=res.data.data; | 55 | // that.goodinfo=res.data.data; |
45 | 56 | ||
46 | 57 | ||
47 | }).catch((err) => { | 58 | }).catch((err) => { |
59 | + console.log(err) | ||
48 | }) | 60 | }) |
61 | + }, | ||
62 | + // 领取积分优惠券 | ||
63 | + give(item) { | ||
64 | + let that = this; | ||
65 | + console.log("领取优惠券") | ||
66 | + var url = 'gift/give'; | ||
67 | + console.log('获取的参数', that.seldata) | ||
68 | + var params = { | ||
69 | + gift_log_id: item.id | ||
49 | } | 70 | } |
71 | + console.log(params) | ||
72 | + app.post(url, params, "post").then((res) => { | ||
73 | + console.log(res); | ||
74 | + that.giftarr = res.data.data; | ||
75 | + // that.goodinfo=res.data.data; | ||
50 | 76 | ||
51 | 77 | ||
78 | + }).catch((err) => { | ||
79 | + console.log(err) | ||
80 | + uni.showToast({ | ||
81 | + title:err.msg, | ||
82 | + icon:'none' | ||
83 | + }) | ||
84 | + }) | ||
85 | + }, | ||
86 | + // 领取实物奖品 | ||
87 | + givegift() { | ||
88 | + console.log("领取实物") | ||
89 | + let that = this; | ||
90 | + var url = 'gift/give'; | ||
91 | + console.log('获取的参数', that.seldata) | ||
92 | + var params = { | ||
93 | + gift_log_id: item.id | ||
94 | + } | ||
95 | + console.log(params) | ||
96 | + app.post(url, params, "post").then((res) => { | ||
97 | + console.log(res); | ||
98 | + that.giftarr = res.data.data; | ||
99 | + // that.goodinfo=res.data.data; | ||
100 | + | ||
101 | + | ||
102 | + }).catch((err) => {}) | ||
52 | } | 103 | } |
53 | 104 | ||
105 | + | ||
54 | } | 106 | } |
55 | 107 | ||
108 | + } | ||
56 | </script> | 109 | </script> |
57 | 110 | ||
58 | <style> | 111 | <style> |
59 | - .giftlist{ | 112 | + .flexoneleft { |
113 | + width: 50rpx; | ||
114 | + height: 50rpx; | ||
115 | + font-size: 0; | ||
116 | + } | ||
117 | + | ||
118 | + .jiangname { | ||
119 | + margin-left: 10rpx; | ||
120 | + } | ||
121 | + | ||
122 | + .giftlist { | ||
60 | padding: 0 32rpx; | 123 | padding: 0 32rpx; |
61 | box-sizing: border-box; | 124 | box-sizing: border-box; |
62 | } | 125 | } |
63 | - .giftitem{ | 126 | + |
127 | + .giftitem { | ||
64 | padding: 24rpx 0; | 128 | padding: 24rpx 0; |
65 | box-sizing: border-box; | 129 | box-sizing: border-box; |
66 | - border-bottom:1rpx solid #f5f5f5 | 130 | + border-bottom: 1rpx solid #f5f5f5 |
67 | } | 131 | } |
68 | - .itemtop{ | ||
69 | - color:#232323; | 132 | + |
133 | + .itemtop { | ||
134 | + color: #232323; | ||
70 | font-size: 32rpx; | 135 | font-size: 32rpx; |
71 | font-weight: bold; | 136 | font-weight: bold; |
72 | 137 | ||
73 | } | 138 | } |
74 | - .itemtime{ | ||
75 | - color:#BBC2CB; | 139 | + |
140 | + .itemtime { | ||
141 | + color: #BBC2CB; | ||
76 | font-size: 24rpx; | 142 | font-size: 24rpx; |
77 | - margin-top:10rpx; | 143 | + margin-top: 10rpx; |
78 | } | 144 | } |
79 | - .itemname{ | ||
80 | - width:160rpx; | ||
81 | - height:64rpx; | ||
82 | - border-radius:8rpx; | ||
83 | - border:2rpx solid rgba(255,146,24,1); | ||
84 | - color:#FF9218; | 145 | + |
146 | + .itemname { | ||
147 | + width: 160rpx; | ||
148 | + height: 64rpx; | ||
149 | + border-radius: 8rpx; | ||
150 | + border: 2rpx solid rgba(255, 146, 24, 1); | ||
151 | + color: #FF9218; | ||
85 | font-size: 30rpx; | 152 | font-size: 30rpx; |
86 | text-align: center; | 153 | text-align: center; |
87 | line-height: 64rpx; | 154 | line-height: 64rpx; |
88 | } | 155 | } |
89 | - .itemnamek{ | ||
90 | - width:160rpx; | ||
91 | - height:64rpx; | ||
92 | - border-radius:8rpx; | ||
93 | - color:#3F4444; | ||
94 | - border:1rpx solid #3F4444; | 156 | + |
157 | + .itemnamek { | ||
158 | + width: 160rpx; | ||
159 | + height: 64rpx; | ||
160 | + border-radius: 8rpx; | ||
161 | + color: #3F4444; | ||
162 | + border: 1rpx solid #3F4444; | ||
95 | font-size: 30rpx; | 163 | font-size: 30rpx; |
96 | text-align: center; | 164 | text-align: center; |
97 | line-height: 64rpx; | 165 | line-height: 64rpx; |
@@ -2,10 +2,12 @@ | @@ -2,10 +2,12 @@ | ||
2 | <view class='content'> | 2 | <view class='content'> |
3 | <view class="examinetop flexone"> | 3 | <view class="examinetop flexone"> |
4 | <view class="examinetopleft"> | 4 | <view class="examinetopleft"> |
5 | - <image :src="userinfo.avatar" mode=""></image> | 5 | + <image :src="userinfo.avatar==''?'../../static/headtou.png':avatar" mode=""></image> |
6 | </view> | 6 | </view> |
7 | <view class="examintopright"> | 7 | <view class="examintopright"> |
8 | - <view class='examinename'>{{userinfo.nickname}}</view> | 8 | + |
9 | + <view class="name" v-if="userinfo.nickname==''">暂无昵称</view> | ||
10 | + <view class="name" v-else>{{userinfo.nickname}}</view> | ||
9 | <view class='examinelist flexone' v-if="label.length!=0"> | 11 | <view class='examinelist flexone' v-if="label.length!=0"> |
10 | <view class='examineitem' v-for="(item,index) in userinfo.label" :key="index">{{item.name_label}}</view> | 12 | <view class='examineitem' v-for="(item,index) in userinfo.label" :key="index">{{item.name_label}}</view> |
11 | </view> | 13 | </view> |
@@ -100,11 +102,11 @@ | @@ -100,11 +102,11 @@ | ||
100 | export default { | 102 | export default { |
101 | data() { | 103 | data() { |
102 | return { | 104 | return { |
103 | - footersel:3, | ||
104 | - publish:false, | ||
105 | - questionlist:[], | ||
106 | - userinfo:'', | ||
107 | - label:'' | 105 | + footersel: 3, |
106 | + publish: false, | ||
107 | + questionlist: [], | ||
108 | + userinfo: '', | ||
109 | + label: '' | ||
108 | 110 | ||
109 | } | 111 | } |
110 | }, | 112 | }, |
@@ -117,22 +119,22 @@ | @@ -117,22 +119,22 @@ | ||
117 | hidepublish() { | 119 | hidepublish() { |
118 | this.publish = false | 120 | this.publish = false |
119 | }, | 121 | }, |
120 | - footerseljump(e){ | ||
121 | - let id=e.currentTarget.dataset.id; | ||
122 | - if(id==1){ | 122 | + footerseljump(e) { |
123 | + let id = e.currentTarget.dataset.id; | ||
124 | + if (id == 1) { | ||
123 | uni.navigateTo({ | 125 | uni.navigateTo({ |
124 | - url:'/pages/luntan/luntan' | 126 | + url: '/pages/luntan/luntan' |
125 | }) | 127 | }) |
126 | - }else if(id==3){ | 128 | + } else if (id == 3) { |
127 | uni.navigateTo({ | 129 | uni.navigateTo({ |
128 | - url:"/pages/luntan/examine" | 130 | + url: "/pages/luntan/examine" |
129 | }) | 131 | }) |
130 | - }else if(id==2){ | ||
131 | - this.publish=true | 132 | + } else if (id == 2) { |
133 | + this.publish = true | ||
132 | } | 134 | } |
133 | }, | 135 | }, |
134 | // 获取用户信息 | 136 | // 获取用户信息 |
135 | - getuserinfo(){ | 137 | + getuserinfo() { |
136 | let that = this; | 138 | let that = this; |
137 | var url = 'member/index'; | 139 | var url = 'member/index'; |
138 | var params = { | 140 | var params = { |
@@ -141,8 +143,8 @@ | @@ -141,8 +143,8 @@ | ||
141 | console.log('7766554', params) | 143 | console.log('7766554', params) |
142 | app.post(url, params).then((res) => { | 144 | app.post(url, params).then((res) => { |
143 | console.log(res); | 145 | console.log(res); |
144 | - that.userinfo=res.data.data; | ||
145 | - that.label=res.data.data.label | 146 | + that.userinfo = res.data.data; |
147 | + that.label = res.data.data.label | ||
146 | 148 | ||
147 | 149 | ||
148 | }).catch((err) => { | 150 | }).catch((err) => { |
@@ -150,7 +152,7 @@ | @@ -150,7 +152,7 @@ | ||
150 | }) | 152 | }) |
151 | }, | 153 | }, |
152 | // 获取问卷列表 | 154 | // 获取问卷列表 |
153 | - getquestionlist(){ | 155 | + getquestionlist() { |
154 | let that = this; | 156 | let that = this; |
155 | var url = 'question/get_questionnaire'; | 157 | var url = 'question/get_questionnaire'; |
156 | var params = { | 158 | var params = { |
@@ -159,7 +161,7 @@ | @@ -159,7 +161,7 @@ | ||
159 | console.log('7766554', params) | 161 | console.log('7766554', params) |
160 | app.post(url, params).then((res) => { | 162 | app.post(url, params).then((res) => { |
161 | console.log(res); | 163 | console.log(res); |
162 | - that.questionlist=res.data.data | 164 | + that.questionlist = res.data.data |
163 | 165 | ||
164 | }).catch((err) => { | 166 | }).catch((err) => { |
165 | 167 | ||
@@ -167,17 +169,25 @@ | @@ -167,17 +169,25 @@ | ||
167 | }, | 169 | }, |
168 | 170 | ||
169 | //帮工考试 | 171 | //帮工考试 |
170 | - examinetext(item){ | ||
171 | - let id=item.id | 172 | + examinetext(item) { |
173 | + let token = uni.getStorageSync("token"); | ||
174 | + if (token == '') { | ||
175 | + uni.reLaunch({ | ||
176 | + url: '/pages/login/register' | ||
177 | + }) | ||
178 | + } else { | ||
179 | + let id = item.id; | ||
172 | uni.navigateTo({ | 180 | uni.navigateTo({ |
173 | - url:'/pages/luntan/examintext?id='+id | 181 | + url: '/pages/luntan/examintext?id=' + id |
174 | }) | 182 | }) |
183 | + } | ||
184 | + | ||
175 | }, | 185 | }, |
176 | // 发布评论 | 186 | // 发布评论 |
177 | - publishitezi(e){ | ||
178 | - let type=e.currentTarget.dataset.id; | 187 | + publishitezi(e) { |
188 | + let type = e.currentTarget.dataset.id; | ||
179 | uni.navigateTo({ | 189 | uni.navigateTo({ |
180 | - url:'/pages/luntan/addcontract?type='+type | 190 | + url: '/pages/luntan/addcontract?type=' + type |
181 | }) | 191 | }) |
182 | }, | 192 | }, |
183 | 193 | ||
@@ -187,7 +197,7 @@ | @@ -187,7 +197,7 @@ | ||
187 | </script> | 197 | </script> |
188 | 198 | ||
189 | <style> | 199 | <style> |
190 | - page{ | 200 | + page { |
191 | background: #fff; | 201 | background: #fff; |
192 | } | 202 | } |
193 | 203 | ||
@@ -195,12 +205,12 @@ | @@ -195,12 +205,12 @@ | ||
195 | padding: 0 32rpx; | 205 | padding: 0 32rpx; |
196 | box-sizing: border-box; | 206 | box-sizing: border-box; |
197 | } */ | 207 | } */ |
198 | - .examinetop{ | 208 | + .examinetop { |
199 | padding: 32rpx 32rpx; | 209 | padding: 32rpx 32rpx; |
200 | box-sizing: border-box; | 210 | box-sizing: border-box; |
201 | - border-bottom:1rpx solid #f5f5f5 | ||
202 | - | 211 | + border-bottom: 1rpx solid #f5f5f5 |
203 | } | 212 | } |
213 | + | ||
204 | .examineitem { | 214 | .examineitem { |
205 | height: 36rpx; | 215 | height: 36rpx; |
206 | padding: 0 28rpx; | 216 | padding: 0 28rpx; |
@@ -211,107 +221,125 @@ | @@ -211,107 +221,125 @@ | ||
211 | font-size: 22rpx; | 221 | font-size: 22rpx; |
212 | text-align: ceter; | 222 | text-align: ceter; |
213 | line-height: 36rpx; | 223 | line-height: 36rpx; |
214 | - margin-right:32rpx; | 224 | + margin-right: 32rpx; |
215 | } | 225 | } |
216 | - .examineitem:last-child{ | ||
217 | - margin-right:0 | 226 | + |
227 | + .examineitem:last-child { | ||
228 | + margin-right: 0 | ||
218 | } | 229 | } |
219 | - .examinetopleft{ | ||
220 | - width:128rpx; | ||
221 | - height:128rpx; | 230 | + |
231 | + .examinetopleft { | ||
232 | + width: 128rpx; | ||
233 | + height: 128rpx; | ||
222 | font-size: 0; | 234 | font-size: 0; |
223 | border-radius: 50%; | 235 | border-radius: 50%; |
224 | } | 236 | } |
225 | - .examinetopleft image{ | 237 | + |
238 | + .examinetopleft image { | ||
226 | border-radius: 50%; | 239 | border-radius: 50%; |
227 | } | 240 | } |
228 | - .helpitemtop{ | ||
229 | - width:112rpx; | ||
230 | - height:112rpx; | 241 | + |
242 | + .helpitemtop { | ||
243 | + width: 112rpx; | ||
244 | + height: 112rpx; | ||
231 | font-size: 0; | 245 | font-size: 0; |
232 | } | 246 | } |
233 | - .helpitemname{ | ||
234 | - color:#3D444C; | 247 | + |
248 | + .helpitemname { | ||
249 | + color: #3D444C; | ||
235 | font-size: 26rpx; | 250 | font-size: 26rpx; |
236 | text-align: center; | 251 | text-align: center; |
237 | - margin-top:4rpx; | 252 | + margin-top: 4rpx; |
238 | } | 253 | } |
239 | - .examintopright{ | ||
240 | - margin-left:28rpx; | 254 | + |
255 | + .examintopright { | ||
256 | + margin-left: 28rpx; | ||
241 | } | 257 | } |
242 | - .examinename{ | ||
243 | - color:#3D454C; | 258 | + |
259 | + .examinename { | ||
260 | + color: #3D454C; | ||
244 | font-size: 28rpx; | 261 | font-size: 28rpx; |
245 | font-weight: bold; | 262 | font-weight: bold; |
246 | } | 263 | } |
247 | - .examinelist{ | ||
248 | - margin-top:24rpx; | 264 | + |
265 | + .examinelist { | ||
266 | + margin-top: 24rpx; | ||
249 | 267 | ||
250 | } | 268 | } |
251 | - .helplist{ | 269 | + |
270 | + .helplist { | ||
252 | padding: 32rpx 32rpx; | 271 | padding: 32rpx 32rpx; |
253 | box-sizing: border-box; | 272 | box-sizing: border-box; |
254 | - border-bottom:16rpx solid #F9F9F9 | 273 | + border-bottom: 16rpx solid #F9F9F9 |
255 | } | 274 | } |
256 | - .helpitem{ | ||
257 | - margin-right:60rpx | 275 | + |
276 | + .helpitem { | ||
277 | + margin-right: 60rpx | ||
258 | } | 278 | } |
259 | - .examinrule{ | 279 | + |
280 | + .examinrule { | ||
260 | padding: 32rpx; | 281 | padding: 32rpx; |
261 | box-sizing: border-box; | 282 | box-sizing: border-box; |
262 | } | 283 | } |
263 | - .examineruletitle{ | ||
264 | - color:#061220; | 284 | + |
285 | + .examineruletitle { | ||
286 | + color: #061220; | ||
265 | font-size: 32rpx; | 287 | font-size: 32rpx; |
266 | } | 288 | } |
267 | - .examineruletext{ | ||
268 | - color:#3D454C; | 289 | + |
290 | + .examineruletext { | ||
291 | + color: #3D454C; | ||
269 | font-size: 28rpx; | 292 | font-size: 28rpx; |
270 | - margin-top:16rpx; | ||
271 | - line-height:40rpx; | 293 | + margin-top: 16rpx; |
294 | + line-height: 40rpx; | ||
272 | } | 295 | } |
273 | - | ||
274 | </style> | 296 | </style> |
275 | 297 | ||
276 | <style> | 298 | <style> |
277 | page { | 299 | page { |
278 | background: #F9F9F9; | 300 | background: #F9F9F9; |
279 | } | 301 | } |
280 | - .release-text-content{ | ||
281 | - height:120rpx; | 302 | + |
303 | + .release-text-content { | ||
304 | + height: 120rpx; | ||
282 | display: -webkit-box; | 305 | display: -webkit-box; |
283 | -webkit-box-orient: vertical; | 306 | -webkit-box-orient: vertical; |
284 | -webkit-line-clamp: 3; | 307 | -webkit-line-clamp: 3; |
285 | overflow: hidden; | 308 | overflow: hidden; |
286 | } | 309 | } |
287 | - .enterwordk{ | ||
288 | - color:#BDC4CE; | 310 | + |
311 | + .enterwordk { | ||
312 | + color: #BDC4CE; | ||
289 | font-size: 24rpx; | 313 | font-size: 24rpx; |
290 | 314 | ||
291 | } | 315 | } |
292 | - .proselect{ | ||
293 | - width:120rpx; | ||
294 | - height:60rpx; | ||
295 | - border:2rpx solid rgba(238,238,238,1); | ||
296 | - color:#fff; | ||
297 | - font-size:24rpx; | 316 | + |
317 | + .proselect { | ||
318 | + width: 120rpx; | ||
319 | + height: 60rpx; | ||
320 | + border: 2rpx solid rgba(238, 238, 238, 1); | ||
321 | + color: #fff; | ||
322 | + font-size: 24rpx; | ||
298 | border-radius: 40rpx; | 323 | border-radius: 40rpx; |
299 | padding: 0 10rpx; | 324 | padding: 0 10rpx; |
300 | box-sizing: border-box; | 325 | box-sizing: border-box; |
301 | - margin-left:16rpx; | 326 | + margin-left: 16rpx; |
302 | } | 327 | } |
303 | - .proname{ | ||
304 | - width:90rpx; | 328 | + |
329 | + .proname { | ||
330 | + width: 90rpx; | ||
305 | overflow: hidden; | 331 | overflow: hidden; |
306 | text-overflow: ellipsis; | 332 | text-overflow: ellipsis; |
307 | white-space: nowrap; | 333 | white-space: nowrap; |
308 | - margin-right:5rpx; | 334 | + margin-right: 5rpx; |
309 | } | 335 | } |
310 | - .down-ico{ | ||
311 | - width:16rpx; | ||
312 | - height:16rpx; | 336 | + |
337 | + .down-ico { | ||
338 | + width: 16rpx; | ||
339 | + height: 16rpx; | ||
313 | font-size: 0; | 340 | font-size: 0; |
314 | } | 341 | } |
342 | + | ||
315 | .publishnav { | 343 | .publishnav { |
316 | padding: 0 !important; | 344 | padding: 0 !important; |
317 | } | 345 | } |
@@ -332,7 +360,7 @@ | @@ -332,7 +360,7 @@ | ||
332 | padding: 14rpx 0; | 360 | padding: 14rpx 0; |
333 | box-sizing: border-box; | 361 | box-sizing: border-box; |
334 | background: #C29445; | 362 | background: #C29445; |
335 | - z-index:99; | 363 | + z-index: 99; |
336 | position: fixed; | 364 | position: fixed; |
337 | top: var(--status-bar-height); | 365 | top: var(--status-bar-height); |
338 | left: 0; | 366 | left: 0; |
@@ -345,7 +373,7 @@ | @@ -345,7 +373,7 @@ | ||
345 | justify-content: space-between; | 373 | justify-content: space-between; |
346 | padding: 32rpx 64rpx; | 374 | padding: 32rpx 64rpx; |
347 | margin-bottom: 16rpx; | 375 | margin-bottom: 16rpx; |
348 | - margin-top: calc(var(--status-bar-height) + 100rpx);; | 376 | + /* margin-top: calc(var(--status-bar-height) + 100rpx);; */ |
349 | } | 377 | } |
350 | 378 | ||
351 | .nav-wrap .navigator { | 379 | .nav-wrap .navigator { |
@@ -443,9 +471,11 @@ | @@ -443,9 +471,11 @@ | ||
443 | width: 60rpx; | 471 | width: 60rpx; |
444 | height: 60rpx; | 472 | height: 60rpx; |
445 | } | 473 | } |
446 | - .search-wrap .navigator:nth-child(3){ | 474 | + |
475 | + .search-wrap .navigator:nth-child(3) { | ||
447 | /* font-size: 20rpx; */ | 476 | /* font-size: 20rpx; */ |
448 | } | 477 | } |
478 | + | ||
449 | /* .proname{ | 479 | /* .proname{ |
450 | 480 | ||
451 | overflow: hidden; | 481 | overflow: hidden; |
@@ -453,4 +483,3 @@ | @@ -453,4 +483,3 @@ | ||
453 | white-space: nowrap; | 483 | white-space: nowrap; |
454 | } */ | 484 | } */ |
455 | </style> | 485 | </style> |
456 | - |
@@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
23 | </picker> --> | 23 | </picker> --> |
24 | </view> | 24 | </view> |
25 | <!-- nav --> | 25 | <!-- nav --> |
26 | - <view class="nav-wrap"> | 26 | + <view class="nav-wrap nav-wrapk"> |
27 | <view class="navigator" @click="zhaopin" :data-id="1"> | 27 | <view class="navigator" @click="zhaopin" :data-id="1"> |
28 | <image src="../../static/helppeople.png"></image> | 28 | <image src="../../static/helppeople.png"></image> |
29 | <text>帮工招聘求职</text> | 29 | <text>帮工招聘求职</text> |
@@ -484,8 +484,11 @@ | @@ -484,8 +484,11 @@ | ||
484 | justify-content: space-between; | 484 | justify-content: space-between; |
485 | padding: 32rpx 64rpx; | 485 | padding: 32rpx 64rpx; |
486 | margin-bottom: 16rpx; | 486 | margin-bottom: 16rpx; |
487 | + | ||
488 | + | ||
489 | + } | ||
490 | + .nav-wrapk{ | ||
487 | margin-top: calc(var(--status-bar-height) + 100rpx); | 491 | margin-top: calc(var(--status-bar-height) + 100rpx); |
488 | - ; | ||
489 | } | 492 | } |
490 | 493 | ||
491 | .nav-wrap .navigator { | 494 | .nav-wrap .navigator { |
@@ -40,7 +40,9 @@ | @@ -40,7 +40,9 @@ | ||
40 | 40 | ||
41 | </view> | 41 | </view> |
42 | </view> | 42 | </view> |
43 | - <view class="miaoright flexone"> | 43 | + <view class='miaobox' v-if="timestatus==2">活动未开始</view> |
44 | + <view class='miaobox' v-else-if="timestatus==3">活动已结束</view> | ||
45 | + <view class="miaoright flexone" v-else> | ||
44 | <view class="distance">距离结束还剩</view> | 46 | <view class="distance">距离结束还剩</view> |
45 | <view class="remaintime">{{days}}</view> | 47 | <view class="remaintime">{{days}}</view> |
46 | <view class="dian">天</view> | 48 | <view class="dian">天</view> |
@@ -282,7 +284,9 @@ | @@ -282,7 +284,9 @@ | ||
282 | days:'', | 284 | days:'', |
283 | hours:'', | 285 | hours:'', |
284 | minutes:'', | 286 | minutes:'', |
285 | - seconds:'' | 287 | + seconds:'', |
288 | + // 秒杀商品的设置 | ||
289 | + timestatus:'' | ||
286 | 290 | ||
287 | } | 291 | } |
288 | }, | 292 | }, |
@@ -426,7 +430,10 @@ | @@ -426,7 +430,10 @@ | ||
426 | console.log(params) | 430 | console.log(params) |
427 | app.post(url,params, "post").then((res) => { | 431 | app.post(url,params, "post").then((res) => { |
428 | console.log(res); | 432 | console.log(res); |
429 | - let remaintime=res.data.data.endtime-res.data.data.starttime | 433 | + that.timestatus=res.data.data.status |
434 | + let now_time = parseInt(new Date().getTime()) | ||
435 | + now_time=parseInt(now_time/1000); | ||
436 | + let remaintime=res.data.data.endtime-now_time; | ||
430 | let number = remaintime; | 437 | let number = remaintime; |
431 | // 时间戳处理 | 438 | // 时间戳处理 |
432 | var totalSecond = number; | 439 | var totalSecond = number; |
@@ -461,10 +468,10 @@ | @@ -461,10 +468,10 @@ | ||
461 | totalSecond--; | 468 | totalSecond--; |
462 | if (totalSecond <= 0) { | 469 | if (totalSecond <= 0) { |
463 | clearInterval(interval); | 470 | clearInterval(interval); |
464 | - uni.showToast({ | ||
465 | - title: '活动已结束', | ||
466 | - icon:'none' | ||
467 | - }); | 471 | + // uni.showToast({ |
472 | + // title: '活动已结束', | ||
473 | + // icon:'none' | ||
474 | + // }); | ||
468 | // 倒计时结束 | 475 | // 倒计时结束 |
469 | //that.countDown(); | 476 | //that.countDown(); |
470 | that.days='00'; | 477 | that.days='00'; |
@@ -119,9 +119,9 @@ | @@ -119,9 +119,9 @@ | ||
119 | </view> | 119 | </view> |
120 | --> | 120 | --> |
121 | </view> | 121 | </view> |
122 | - | 122 | +<tabBar :current="currentTabIndex" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983" @click="tabClick"></tabBar> |
123 | <!-- 底部导航 --> | 123 | <!-- 底部导航 --> |
124 | - <view class="teacherfooter"> | 124 | + <!-- <view class="teacherfooter"> |
125 | <view class="teacherfootitem" @click="selnav" :data-id="1"> | 125 | <view class="teacherfootitem" @click="selnav" :data-id="1"> |
126 | <view class="teacherfootitemtop shou"> | 126 | <view class="teacherfootitemtop shou"> |
127 | <image :src="footersel==1?'../../static/tieziactive.png':'../../static/tiezi.png'"></image> | 127 | <image :src="footersel==1?'../../static/tieziactive.png':'../../static/tiezi.png'"></image> |
@@ -147,20 +147,27 @@ | @@ -147,20 +147,27 @@ | ||
147 | <view class="teacherfootname" :class="footersel==4?'activename':''">个人中心</view> | 147 | <view class="teacherfootname" :class="footersel==4?'activename':''">个人中心</view> |
148 | </view> | 148 | </view> |
149 | </view> | 149 | </view> |
150 | - | 150 | + --> |
151 | </view> | 151 | </view> |
152 | </template> | 152 | </template> |
153 | 153 | ||
154 | <script> | 154 | <script> |
155 | + | ||
155 | import app from "../../App.vue"; | 156 | import app from "../../App.vue"; |
157 | + import tabBar from '../../components/tabvue/tabvue.vue' | ||
158 | + | ||
156 | export default { | 159 | export default { |
160 | + components:{ | ||
161 | + tabBar | ||
162 | + }, | ||
157 | data() { | 163 | data() { |
158 | return { | 164 | return { |
159 | showbanben: false, | 165 | showbanben: false, |
160 | footersel: 2, | 166 | footersel: 2, |
161 | keyword: '', | 167 | keyword: '', |
162 | order: '', | 168 | order: '', |
163 | - shoplist: [] | 169 | + shoplist: [], |
170 | + currentTabIndex:1 | ||
164 | } | 171 | } |
165 | }, | 172 | }, |
166 | onLoad() { | 173 | onLoad() { |
@@ -448,9 +448,7 @@ | @@ -448,9 +448,7 @@ | ||
448 | value.postage_type=that.goodservicearr[e.target.value].id; | 448 | value.postage_type=that.goodservicearr[e.target.value].id; |
449 | } | 449 | } |
450 | }) | 450 | }) |
451 | - | ||
452 | this.changeorder(); | 451 | this.changeorder(); |
453 | - | ||
454 | that.seldata.forEach(function(value,index,array){ | 452 | that.seldata.forEach(function(value,index,array){ |
455 | if( value.postage_type==1){ | 453 | if( value.postage_type==1){ |
456 | that.postage_type3=1; | 454 | that.postage_type3=1; |
@@ -462,8 +460,6 @@ | @@ -462,8 +460,6 @@ | ||
462 | enterjifen(e){ | 460 | enterjifen(e){ |
463 | console.log(222222); | 461 | console.log(222222); |
464 | console.log(e.detail.value) | 462 | console.log(e.detail.value) |
465 | - | ||
466 | - | ||
467 | this.jifen=e.detail.value; | 463 | this.jifen=e.detail.value; |
468 | console.log(this.jifen) | 464 | console.log(this.jifen) |
469 | this.changeorder() | 465 | this.changeorder() |
1 | <template> | 1 | <template> |
2 | - <view class="page"> | 2 | + <view class="page" @click="login"> |
3 | <view class="header"> | 3 | <view class="header"> |
4 | <view class="userinfo"> | 4 | <view class="userinfo"> |
5 | - <view class="avator" @click="personziliao"> | 5 | + <view class="avator" @click.stop="personziliao"> |
6 | <image :src="avatar==''?'../../static/headtou.png':avatar" /> | 6 | <image :src="avatar==''?'../../static/headtou.png':avatar" /> |
7 | <!-- <image src="../../static/userpic.png" mode="widthFix" /> --> | 7 | <!-- <image src="../../static/userpic.png" mode="widthFix" /> --> |
8 | </view> | 8 | </view> |
@@ -22,37 +22,37 @@ | @@ -22,37 +22,37 @@ | ||
22 | 已认证 | 22 | 已认证 |
23 | </view> | 23 | </view> |
24 | </view> | 24 | </view> |
25 | - <view class="setup" @click="set"> | 25 | + <view class="setup" @click.stop="set"> |
26 | <image src="../../static/setup.png" mode="widthFix" /> | 26 | <image src="../../static/setup.png" mode="widthFix" /> |
27 | </view> | 27 | </view> |
28 | </view> | 28 | </view> |
29 | 29 | ||
30 | 30 | ||
31 | <view class="orderBox"> | 31 | <view class="orderBox"> |
32 | - <view class="orderItem" @click="fahuo" :data-id="1"> | 32 | + <view class="orderItem" @click.stop="fahuo" :data-id="1"> |
33 | <image src="../../static/order_a.png" mode="widthFix"></image> | 33 | <image src="../../static/order_a.png" mode="widthFix"></image> |
34 | <view>待付款</view> | 34 | <view>待付款</view> |
35 | </view> | 35 | </view> |
36 | - <view class="orderItem" @click="fahuo" :data-id="2"> | 36 | + <view class="orderItem" @click.stop="fahuo" :data-id="2"> |
37 | <image src="../../static/order_b.png" mode="widthFix"></image> | 37 | <image src="../../static/order_b.png" mode="widthFix"></image> |
38 | <view>待发货</view> | 38 | <view>待发货</view> |
39 | </view> | 39 | </view> |
40 | - <view class="orderItem" @click="fahuo" :data-id="3"> | 40 | + <view class="orderItem" @click.stop="fahuo" :data-id="3"> |
41 | <image src="../../static/order_c.png" mode="widthFix"></image> | 41 | <image src="../../static/order_c.png" mode="widthFix"></image> |
42 | <view>待收货</view> | 42 | <view>待收货</view> |
43 | </view> | 43 | </view> |
44 | - <view class="orderItem" @click="fahuo" :data-id="4"> | 44 | + <view class="orderItem" @click.stop="fahuo" :data-id="4"> |
45 | <image src="../../static/order_d.png" mode="widthFix"></image> | 45 | <image src="../../static/order_d.png" mode="widthFix"></image> |
46 | <view>待评价</view> | 46 | <view>待评价</view> |
47 | </view> | 47 | </view> |
48 | - <view class="orderItem" @click="fahuo" :data-id="0"> | 48 | + <view class="orderItem" @click.stop="fahuo" :data-id="0"> |
49 | <image src="../../static/order_e.png" mode="widthFix"></image> | 49 | <image src="../../static/order_e.png" mode="widthFix"></image> |
50 | <view>全部订单</view> | 50 | <view>全部订单</view> |
51 | </view> | 51 | </view> |
52 | </view> | 52 | </view> |
53 | </view> | 53 | </view> |
54 | <view class="contanier"> | 54 | <view class="contanier"> |
55 | - <view class="citem" @click="jump" data-id="1"> | 55 | + <view class="citem" @click.stop="jump" data-id="1"> |
56 | <view class="left"> | 56 | <view class="left"> |
57 | <image src="../../static/icon_a.png" mode="widthFix" /> | 57 | <image src="../../static/icon_a.png" mode="widthFix" /> |
58 | 我的钱包 | 58 | 我的钱包 |
@@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
61 | <image src="../../static/right.png" mode="widthFix" /> | 61 | <image src="../../static/right.png" mode="widthFix" /> |
62 | </view> | 62 | </view> |
63 | </view> | 63 | </view> |
64 | - <view class="citem" @click="jump" data-id="2"> | 64 | + <view class="citem" @click.stop="jump" data-id="2"> |
65 | <view class="left"> | 65 | <view class="left"> |
66 | <image src="../../static/icon_b.png" mode="widthFix" /> | 66 | <image src="../../static/icon_b.png" mode="widthFix" /> |
67 | 会员中心 | 67 | 会员中心 |
@@ -70,7 +70,7 @@ | @@ -70,7 +70,7 @@ | ||
70 | <image src="../../static/right.png" mode="widthFix" /> | 70 | <image src="../../static/right.png" mode="widthFix" /> |
71 | </view> | 71 | </view> |
72 | </view> | 72 | </view> |
73 | - <view class="citem" @click="jump" data-id="7"> | 73 | + <view class="citem" @click.stop="jump" data-id="7"> |
74 | <view class="left"> | 74 | <view class="left"> |
75 | <image src="../../static/fenxiao.png" mode="widthFix" /> | 75 | <image src="../../static/fenxiao.png" mode="widthFix" /> |
76 | 我的分销 | 76 | 我的分销 |
@@ -79,7 +79,7 @@ | @@ -79,7 +79,7 @@ | ||
79 | <image src="../../static/right.png" mode="widthFix" /> | 79 | <image src="../../static/right.png" mode="widthFix" /> |
80 | </view> | 80 | </view> |
81 | </view> | 81 | </view> |
82 | - <view class="citem" @click="jump" data-id="3"> | 82 | + <view class="citem" @click.stop="jump" data-id="3"> |
83 | <view class="left"> | 83 | <view class="left"> |
84 | <image src="../../static/icon_c.png" mode="widthFix" /> | 84 | <image src="../../static/icon_c.png" mode="widthFix" /> |
85 | 我的积分 | 85 | 我的积分 |
@@ -88,7 +88,7 @@ | @@ -88,7 +88,7 @@ | ||
88 | <image src="../../static/right.png" mode="widthFix" /> | 88 | <image src="../../static/right.png" mode="widthFix" /> |
89 | </view> | 89 | </view> |
90 | </view> | 90 | </view> |
91 | - <view class="citem" @click="jump" data-id="4"> | 91 | + <view class="citem" @click.stop="jump" data-id="4"> |
92 | <view class="left"> | 92 | <view class="left"> |
93 | <image src="../../static/icon_e.png" mode="widthFix" /> | 93 | <image src="../../static/icon_e.png" mode="widthFix" /> |
94 | 我的优惠卷 | 94 | 我的优惠卷 |
@@ -97,7 +97,7 @@ | @@ -97,7 +97,7 @@ | ||
97 | <image src="../../static/right.png" mode="widthFix" /> | 97 | <image src="../../static/right.png" mode="widthFix" /> |
98 | </view> | 98 | </view> |
99 | </view> | 99 | </view> |
100 | - <view class="citem" @click="jump" data-id="5"> | 100 | + <view class="citem" @click.stop="jump" data-id="5"> |
101 | <view class="left"> | 101 | <view class="left"> |
102 | <image src="../../static/icon_f.png" mode="widthFix" /> | 102 | <image src="../../static/icon_f.png" mode="widthFix" /> |
103 | 我的发布 | 103 | 我的发布 |
@@ -106,7 +106,7 @@ | @@ -106,7 +106,7 @@ | ||
106 | <image src="../../static/right.png" mode="widthFix" /> | 106 | <image src="../../static/right.png" mode="widthFix" /> |
107 | </view> | 107 | </view> |
108 | </view> | 108 | </view> |
109 | - <view class="citem" @click="jump" data-id="6"> | 109 | + <view class="citem" @click.stop="jump" data-id="6"> |
110 | <view class="left"> | 110 | <view class="left"> |
111 | <image src="../../static/icon_g.png" mode="widthFix" /> | 111 | <image src="../../static/icon_g.png" mode="widthFix" /> |
112 | 销售管理 | 112 | 销售管理 |
@@ -119,25 +119,25 @@ | @@ -119,25 +119,25 @@ | ||
119 | 119 | ||
120 | <!-- 底部导航 --> | 120 | <!-- 底部导航 --> |
121 | <view class="teacherfooter"> | 121 | <view class="teacherfooter"> |
122 | - <view class="teacherfootitem" @click="selnav" :data-id="1"> | 122 | + <view class="teacherfootitem" @click.stop="selnav" :data-id="1"> |
123 | <view class="teacherfootitemtop shou"> | 123 | <view class="teacherfootitemtop shou"> |
124 | <image :src="footersel==1?'../../static/tieziactive.png':'../../static/tiezi.png'"></image> | 124 | <image :src="footersel==1?'../../static/tieziactive.png':'../../static/tiezi.png'"></image> |
125 | </view> | 125 | </view> |
126 | <view class="teacherfootname " :class="footersel==1?'activename':''">首页</view> | 126 | <view class="teacherfootname " :class="footersel==1?'activename':''">首页</view> |
127 | </view> | 127 | </view> |
128 | - <view class="teacherfootitem" @click="selnav" :data-id="2"> | 128 | + <view class="teacherfootitem" @click.stop="selnav" :data-id="2"> |
129 | <view class="teacherfootitemtop shou"> | 129 | <view class="teacherfootitemtop shou"> |
130 | <image :src="footersel==2?'../../static/nearshopactive.png':'../../static/nearshop.png'"></image> | 130 | <image :src="footersel==2?'../../static/nearshopactive.png':'../../static/nearshop.png'"></image> |
131 | </view> | 131 | </view> |
132 | <view class="teacherfootname" :class="footersel==2?'activename':''">附近店铺</view> | 132 | <view class="teacherfootname" :class="footersel==2?'activename':''">附近店铺</view> |
133 | </view> | 133 | </view> |
134 | - <view class="teacherfootitem" @click="selnav" :data-id="3"> | 134 | + <view class="teacherfootitem" @click.stop="selnav" :data-id="3"> |
135 | <view class="teacherfootitemtop shou"> | 135 | <view class="teacherfootitemtop shou"> |
136 | <image :src="footersel==3?'../../static/luntanctive.png':'../../static/luntan.png'"></image> | 136 | <image :src="footersel==3?'../../static/luntanctive.png':'../../static/luntan.png'"></image> |
137 | </view> | 137 | </view> |
138 | <view class="teacherfootname" :class="footersel==3?'activename':''">中面论坛</view> | 138 | <view class="teacherfootname" :class="footersel==3?'activename':''">中面论坛</view> |
139 | </view> | 139 | </view> |
140 | - <view class="teacherfootitem" @click="selnav" :data-id="4"> | 140 | + <view class="teacherfootitem" @click.stop="selnav" :data-id="4"> |
141 | <view class="teacherfootitemtop shou"> | 141 | <view class="teacherfootitemtop shou"> |
142 | <image :src="footersel==4?'../../static/useractive.png':'../../static/user.png'"></image> | 142 | <image :src="footersel==4?'../../static/useractive.png':'../../static/user.png'"></image> |
143 | </view> | 143 | </view> |
@@ -170,6 +170,15 @@ | @@ -170,6 +170,15 @@ | ||
170 | url:'/pages/usercenter/setUp?avatar='+this.avatar+'&nickname='+this.nickname | 170 | url:'/pages/usercenter/setUp?avatar='+this.avatar+'&nickname='+this.nickname |
171 | }) | 171 | }) |
172 | }, | 172 | }, |
173 | + login(){ | ||
174 | + let token=uni.getStorageSync("token"); | ||
175 | + if(token==''){ | ||
176 | + uni.navigateTo({ | ||
177 | + url:'/pages/login/register' | ||
178 | + }) | ||
179 | + } | ||
180 | + }, | ||
181 | + | ||
173 | // 获取用户信息 | 182 | // 获取用户信息 |
174 | getuserinfo() { | 183 | getuserinfo() { |
175 | let that = this; | 184 | let that = this; |
1 | <template> | 1 | <template> |
2 | <view class="page"> | 2 | <view class="page"> |
3 | <view class="box"> | 3 | <view class="box"> |
4 | - <view class="item"> | 4 | + <view class="item" v-for="(item,index) in creditarr" :key="index"> |
5 | <view class="title"> | 5 | <view class="title"> |
6 | - 2019年 | 6 | + {{item.year}} |
7 | <image src="../../static/more.png" mode="widthFix" class="more" /> | 7 | <image src="../../static/more.png" mode="widthFix" class="more" /> |
8 | </view> | 8 | </view> |
9 | - <view class="xitem"> | ||
10 | - <view class="month">8月</view> | 9 | + <view class="xitem" v-for="(itemk,indexk) in item.list" :key="indexk"> |
10 | + <view class="month">{{itemk.month}}</view> | ||
11 | <view class="minfo"> | 11 | <view class="minfo"> |
12 | <view class="left"> | 12 | <view class="left"> |
13 | - <view class="money">3125.55元</view> | ||
14 | - <view class="time">期限:2019-10-10</view> | 13 | + <view class="money">{{itemk.money}}元</view> |
14 | + <view class="time">期限:{{itemk.start_returntime}}</view> | ||
15 | </view> | 15 | </view> |
16 | - <view class="btn">还款</view> | 16 | + <view class="btn" v-if="itemk.status==1" @click="paymoney(itemk)">还款</view> |
17 | + <view class="btn activea" v-else-if="itemk.status==3">已逾期</view> | ||
18 | + <view class="btn activeb" v-else>已还款</view> | ||
17 | </view> | 19 | </view> |
18 | </view> | 20 | </view> |
19 | - <view class="xitem"> | 21 | + |
22 | + | ||
23 | + <!-- <view class="xitem"> | ||
20 | <view class="month">7月</view> | 24 | <view class="month">7月</view> |
21 | <view class="minfo"> | 25 | <view class="minfo"> |
22 | <view class="left"> | 26 | <view class="left"> |
@@ -46,53 +50,213 @@ | @@ -46,53 +50,213 @@ | ||
46 | <view class="btn activeb">已还款</view> | 50 | <view class="btn activeb">已还款</view> |
47 | </view> | 51 | </view> |
48 | </view> | 52 | </view> |
53 | + --> | ||
54 | + | ||
55 | + | ||
49 | </view> | 56 | </view> |
50 | </view> | 57 | </view> |
51 | - <view class="cover"> | 58 | + <view class="cover" v-if="paycover"> |
52 | <view class="coverBox"> | 59 | <view class="coverBox"> |
53 | - <view class="top"> | 60 | + <view class="top" @click="hidepay"> |
54 | <view class="close"><image src="../../static/colose.png" mode="widthFix" /></view> | 61 | <view class="close"><image src="../../static/colose.png" mode="widthFix" /></view> |
55 | 支付 | 62 | 支付 |
56 | </view> | 63 | </view> |
57 | <view class="monetall"> | 64 | <view class="monetall"> |
58 | - <view class="moneyNum">¥2560.00</view> | ||
59 | - <view class="moneyTitle">订单总额</view> | 65 | + <view class="moneyNum">¥{{money}}</view> |
66 | + <!-- <view class="moneyTitle">订单总额</view> --> | ||
60 | </view> | 67 | </view> |
61 | <view class="payBox"> | 68 | <view class="payBox"> |
62 | <view class="payItem"> | 69 | <view class="payItem"> |
63 | <view class="left"> | 70 | <view class="left"> |
64 | - <image src="../../static/paya.png" mode="widthFix" /> | ||
65 | - 支付宝 | 71 | + <image src="../../static/payb.png" mode="widthFix" /> |
72 | + 微信 | ||
73 | + </view> | ||
74 | + <view class="right" @click="selecttype" :data-id="1"> | ||
75 | + <image src="../../static/check.png" mode="widthFix" class="check" v-if="type==1"/> | ||
76 | + <image src="../../static/nocheck.png" mode="widthFix" class="check" v-else/> | ||
77 | + | ||
78 | + | ||
66 | </view> | 79 | </view> |
67 | - <view class="right"><image src="../../static/nocheck.png" mode="widthFix" class="check" /></view> | ||
68 | </view> | 80 | </view> |
69 | <view class="payItem"> | 81 | <view class="payItem"> |
70 | <view class="left"> | 82 | <view class="left"> |
71 | - <image src="../../static/payb.png" mode="widthFix" /> | ||
72 | - 微信 | 83 | + <image src="../../static/paya.png" mode="widthFix" /> |
84 | + 支付宝 | ||
85 | + </view> | ||
86 | + <view class="right" @click="selecttype" :data-id="2"> | ||
87 | + <image src="../../static/check.png" mode="widthFix" class="check" v-if="type==2"/> | ||
88 | + <image src="../../static/nocheck.png" mode="widthFix" class="check" v-else/> | ||
89 | + | ||
73 | </view> | 90 | </view> |
74 | - <view class="right"><image src="../../static/check.png" mode="widthFix" class="check" /></view> | ||
75 | </view> | 91 | </view> |
92 | + | ||
76 | <view class="payItem"> | 93 | <view class="payItem"> |
77 | <view class="left"> | 94 | <view class="left"> |
78 | <image src="../../static/balance.png" mode="widthFix" /> | 95 | <image src="../../static/balance.png" mode="widthFix" /> |
79 | 余额支付 <text>(余额 3840.00)</text> | 96 | 余额支付 <text>(余额 3840.00)</text> |
80 | </view> | 97 | </view> |
81 | - <view class="right"><image src="../../static/nocheck.png" mode="widthFix" class="check" /></view> | 98 | + <view class="right" @click="selecttype" :data-id="3"> |
99 | + <image src="../../static/check.png" mode="widthFix" class="check" v-if="type==3"/> | ||
100 | + <image src="../../static/nocheck.png" mode="widthFix" class="check" v-else/> | ||
101 | + | ||
102 | + </view> | ||
82 | </view> | 103 | </view> |
83 | </view> | 104 | </view> |
84 | - <view class="submit">确认支付(¥2560.00)</view> | 105 | + <view class="submit" @click="suremoney">确认支付(¥2560.00)</view> |
85 | </view> | 106 | </view> |
86 | </view> | 107 | </view> |
87 | </view> | 108 | </view> |
88 | </template> | 109 | </template> |
89 | 110 | ||
90 | <script> | 111 | <script> |
112 | +import app from "../../App.vue"; | ||
91 | export default { | 113 | export default { |
92 | data() { | 114 | data() { |
93 | - return {}; | 115 | + return { |
116 | + creditarr:[], | ||
117 | + paycover:false, | ||
118 | + borrow_order_id:'', | ||
119 | + type:'', | ||
120 | + money:'' | ||
121 | + }; | ||
122 | + }, | ||
123 | + onLoad() { | ||
124 | + this.getmycredit() | ||
125 | + }, | ||
126 | + methods: { | ||
127 | + hidepay(){ | ||
128 | + this.paycover=false | ||
94 | }, | 129 | }, |
95 | - methods: {} | 130 | + selecttype(e){ |
131 | + this.type=e.currentTarget.dataset.id; | ||
132 | + }, | ||
133 | + // 还款 | ||
134 | + paymoney(item){ | ||
135 | + console.log(item) | ||
136 | + this.borrow_order_id=item.id, | ||
137 | + this.paycover=true; | ||
138 | + this.money=item.money | ||
139 | + }, | ||
140 | + suremoney(){ | ||
141 | + let that = this; | ||
142 | + var url = 'money/pay2'; | ||
143 | + var params = { | ||
144 | + borrow_order_id:that.borrow_order_id, | ||
145 | + return_type:that.type | ||
146 | + } | ||
147 | + console.log('7766554', params) | ||
148 | + app.post(url, params).then((res) => { | ||
149 | + console.log(res); | ||
150 | + if(that.type == 2) { | ||
151 | + // 支付宝支付 | ||
152 | + uni.requestPayment({ | ||
153 | + provider: 'alipay', | ||
154 | + orderInfo: res.data.data.result, | ||
155 | + success(r) { | ||
156 | + console.log(r) | ||
157 | + } | ||
158 | + | ||
159 | + }) | ||
160 | + }else if(that.type == 1){ | ||
161 | + console.log(JSON.stringify(res.data.data.result)); | ||
162 | + let result=res.data.data.result; | ||
163 | + let obj={}; | ||
164 | + obj.appid=result.appid; | ||
165 | + obj.partnerid=result.mch_id; | ||
166 | + obj.prepayid=result.prepay_id; | ||
167 | + obj.timestamp=result.timestamp; | ||
168 | + obj.noncestr=result.nonce_str; | ||
169 | + obj.sign=result.sign; | ||
170 | + obj.package='Sign=WXPay'; | ||
171 | + console.log(JSON.stringify(obj)); | ||
172 | + var str = JSON.stringify(obj); | ||
173 | + let pay_data= { | ||
174 | + "appid": "wx24f90adc1d2f4f3d", | ||
175 | + "partnerid": "1579091771", | ||
176 | + "prepayid": "wx29181909445973cc4d52be011695617700", | ||
177 | + "timestamp": "1588155549", | ||
178 | + "noncestr": "2FfYK6wKqvG5nj5f", | ||
179 | + "package": "Sign=WXPay", | ||
180 | + "sign": "AEF0D513D8B20B560C8638EDFDA9567D" | ||
181 | + } | ||
182 | + console.log(JSON.stringify(pay_data)) | ||
183 | + | ||
184 | + // var str = '{"appid": "wx24f90adc1d2f4f3d","partnerid": "1579091771","prepayid": "wx28163732591490e929f635151961570300","noncestr": "R4etAWk7ypn1L6xJ","package": "Sign=WXPay","sign": "A0A1ED1D7F7FC373FADB2C2E38DBE7AE"}' | ||
185 | + // obj.result_code=result.result_code; | ||
186 | + // obj.trade_type=result.trade_type; | ||
187 | + // let pay_data="{\"appid\":\"wx24f90adc1d2f4f3d\",\"partnerid\":\"1555731861\",\"prepayid\":\"wx28161109417542347a6766cf1365829300\",\"timestamp\":\"1588060827\",\"noncestr\":\"9cyHOrhkdWyDBp2w\",\"package\":\"Sign=WXPay\",\"sign\":\"B69AB48D8D14F3E04F4898BDAA729578\"}" | ||
188 | + | ||
189 | + // 微信支付 | ||
190 | + uni.requestPayment({ | ||
191 | + provider: 'wxpay', | ||
192 | + orderInfo: JSON.stringify(pay_data), //微信、支付宝订单数据 | ||
193 | + success: function (res) { | ||
194 | + console.log('success:' + JSON.stringify(res)); | ||
195 | + if(res.errMsg == 'requestPayment:ok') { | ||
196 | + uni.showToast({ | ||
197 | + title: '支付成功' | ||
198 | + }) | ||
199 | + } | ||
200 | + }, | ||
201 | + fail: function (err) { | ||
202 | + console.log('fail:' + JSON.stringify(err)); | ||
203 | + } | ||
204 | + }); | ||
205 | + // uni.requestPayment({ | ||
206 | + // provider: 'wxpay', | ||
207 | + // // orderInfo: res.data.data.result.prepay_id, //微信、支付宝订单数据 | ||
208 | + // orderInfo: JSON.stringify(obj), | ||
209 | + // // timeStamp: String(Date.now()), | ||
210 | + // // nonceStr: res.data.data.result.nonce_str, | ||
211 | + // // package: "prepay_id="+res.data.data.result.prepay_id, | ||
212 | + // // signType: 'MD5', | ||
213 | + // // paySign: res.data.data.result.sign, | ||
214 | + // ccess: function (res) { | ||
215 | + // console.log('success:' + JSON.stringify(res)); | ||
216 | + // }, | ||
217 | + // fail: function (err) { | ||
218 | + // console.log(err) | ||
219 | + // console.log('fail:' + JSON.stringify(err)); | ||
220 | + // } | ||
221 | + // }); | ||
222 | + | ||
223 | + }else{ | ||
224 | + uni.showToast({ | ||
225 | + title:'支付成功', | ||
226 | + icon:'none' | ||
227 | + }) | ||
228 | + setTimeout(function(){ | ||
229 | + uni.navigateBack({ | ||
230 | + checked:true | ||
231 | + }) | ||
232 | + },1500) | ||
233 | + } | ||
234 | + | ||
235 | + | ||
236 | + }).catch((err) => { | ||
237 | + console.log(err) | ||
238 | + | ||
239 | + }) | ||
240 | + }, | ||
241 | + // 获取赊吧列表 | ||
242 | + getmycredit(){ | ||
243 | + let that = this; | ||
244 | + var url = 'money/me_borrow'; | ||
245 | + var params = { | ||
246 | + | ||
247 | + } | ||
248 | + console.log('7766554', params) | ||
249 | + app.post(url, params).then((res) => { | ||
250 | + console.log(res); | ||
251 | + that.creditarr=res.data.data | ||
252 | + | ||
253 | + | ||
254 | + }).catch((err) => { | ||
255 | + console.log(err) | ||
256 | + | ||
257 | + }) | ||
258 | + } | ||
259 | + } | ||
96 | }; | 260 | }; |
97 | </script> | 261 | </script> |
98 | 262 | ||
@@ -157,6 +321,7 @@ page { | @@ -157,6 +321,7 @@ page { | ||
157 | font-weight:500; | 321 | font-weight:500; |
158 | color:rgba(91,94,100,1); | 322 | color:rgba(91,94,100,1); |
159 | line-height:34rpx; | 323 | line-height:34rpx; |
324 | + margin-left:30rpx; | ||
160 | } | 325 | } |
161 | .btn{ | 326 | .btn{ |
162 | width:160rpx; | 327 | width:160rpx; |
@@ -374,8 +374,9 @@ | @@ -374,8 +374,9 @@ | ||
374 | .info { | 374 | .info { |
375 | width: 530rpx; | 375 | width: 530rpx; |
376 | padding: 22rpx 0; | 376 | padding: 22rpx 0; |
377 | - border-bottom: 1px solid #EEEEEE; | 377 | + /* border-bottom: 1px solid #EEEEEE; */ |
378 | box-sizing: border-box; | 378 | box-sizing: border-box; |
379 | + height:auto!important; | ||
379 | } | 380 | } |
380 | 381 | ||
381 | .word { | 382 | .word { |
@@ -16,6 +16,14 @@ | @@ -16,6 +16,14 @@ | ||
16 | <text>{{userinfo.nickname}}</text> | 16 | <text>{{userinfo.nickname}}</text> |
17 | </view> | 17 | </view> |
18 | </view> | 18 | </view> |
19 | + <view class="box" v-else> | ||
20 | + <view class="title">到账用户信息</view> | ||
21 | + <view class="userbox"> | ||
22 | + <image src="../../static/zhuanzhang.png" mode="widthFix" class="avator" /> | ||
23 | + <text>未找到该用户</text> | ||
24 | + </view> | ||
25 | + </view> | ||
26 | + | ||
19 | <view class="box"> | 27 | <view class="box"> |
20 | <view class="title">转账金额</view> | 28 | <view class="title">转账金额</view> |
21 | <view class="fillArea"> | 29 | <view class="fillArea"> |
@@ -134,8 +142,12 @@ | @@ -134,8 +142,12 @@ | ||
134 | icon:"none" | 142 | icon:"none" |
135 | }) | 143 | }) |
136 | setTimeout(function(){ | 144 | setTimeout(function(){ |
137 | - uni.navigateBack({ | ||
138 | - checked:true | 145 | + // uni.navigateBack({ |
146 | + // checked:true | ||
147 | + // }) | ||
148 | + let userinfo=JSON.stringify(that.userinfo) | ||
149 | + uni.navigateTo({ | ||
150 | + url:'/pages/usercenter/transferDetails?userinfo='+userinfo+'&money='+that.money | ||
139 | }) | 151 | }) |
140 | },1500) | 152 | },1500) |
141 | 153 | ||
@@ -227,6 +239,7 @@ | @@ -227,6 +239,7 @@ | ||
227 | .avator { | 239 | .avator { |
228 | width: 72rpx; | 240 | width: 72rpx; |
229 | margin-right: 16rpx; | 241 | margin-right: 16rpx; |
242 | + border-radius: 50%; | ||
230 | } | 243 | } |
231 | 244 | ||
232 | .fillArea { | 245 | .fillArea { |
@@ -2,11 +2,11 @@ | @@ -2,11 +2,11 @@ | ||
2 | <view class="page"> | 2 | <view class="page"> |
3 | <view class="box"> | 3 | <view class="box"> |
4 | <view class="tipsword">转账详情</view> | 4 | <view class="tipsword">转账详情</view> |
5 | - <view class="money">¥200.00</view> | 5 | + <view class="money">¥{{money}}</view> |
6 | <view class="peopleBox"> | 6 | <view class="peopleBox"> |
7 | <text>收款人</text> | 7 | <text>收款人</text> |
8 | - <image class="avator" src="../../static/userpic.png" mode="widthFix" /> | ||
9 | - <view class="ename">用户昵称昵称</view> | 8 | + <image class="avator" :src="userinfo.avatar" mode="widthFix" /> |
9 | + <view class="ename">{{userinfo.nickname}}</view> | ||
10 | </view> | 10 | </view> |
11 | </view> | 11 | </view> |
12 | </view> | 12 | </view> |
@@ -16,11 +16,18 @@ | @@ -16,11 +16,18 @@ | ||
16 | export default { | 16 | export default { |
17 | data() { | 17 | data() { |
18 | return { | 18 | return { |
19 | - | 19 | + userinfo:'', |
20 | + money:'' | ||
20 | } | 21 | } |
21 | }, | 22 | }, |
23 | + onLoad(options) { | ||
24 | + console.log(options) | ||
25 | + this.userinfo=JSON.parse(options.userinfo); | ||
26 | + this.money=options.money; | ||
27 | + }, | ||
22 | methods: { | 28 | methods: { |
23 | 29 | ||
30 | + | ||
24 | } | 31 | } |
25 | } | 32 | } |
26 | </script> | 33 | </script> |
@@ -66,4 +73,7 @@ | @@ -66,4 +73,7 @@ | ||
66 | margin-left: 40rpx; | 73 | margin-left: 40rpx; |
67 | margin-right: 20rpx; | 74 | margin-right: 20rpx; |
68 | } | 75 | } |
76 | + .avator{ | ||
77 | + border-radius: 50%; | ||
78 | + } | ||
69 | </style> | 79 | </style> |
1 | 1 | ||
2 | var isReady=false;var onReadyCallbacks=[]; | 2 | var isReady=false;var onReadyCallbacks=[]; |
3 | -var __uniConfig = {"pages":["pages/homepage/homepage","pages/login/loginindex","pages/usercenter/cardrenzheng","pages/homepage/map","pages/homepage/map","pages/usercenter/fenxiaomyteam","pages/usercenter/fenxiaotidetail","pages/usercenter/fenxiaodingdan","pages/usercenter/fenxiaoyongjin","pages/usercenter/myfenxiao","pages/nearshop/allprovince","pages/usercenter/orderdetail","pages/nearshop/selectcoupon","pages/nearshop/cartbox","pages/nearshop/cartlist","pages/homepage/collectshop","pages/luntan/examineresult","pages/luntan/examintext","pages/luntan/examine","pages/nearshop/sureorder","pages/login/accountpassword","pages/login/registercode","pages/homepage/mygift","pages/homepage/drawlottery","pages/login/finishregister","pages/homepage/miaosha","pages/luntan/luntan","pages/luntan/addcontract","pages/luntan/luntandetail","pages/luntan/luntandetailsecond","pages/luntan/luntanlist","pages/luntan/luntanpage","pages/nearshop/goodtail","pages/nearshop/shopdetail","pages/usercenter/companyshenhe","pages/usercenter/usercenter","pages/nearshop/nearshop","pages/homepage/goodkind","pages/homepage/jifenshop","pages/homepage/shoplist","pages/homepage/search","pages/login/xieyi","pages/login/setmima","pages/login/register","pages/login/forgetmima","pages/index/index","pages/usercenter/setPassword","pages/usercenter/accountDetails","pages/usercenter/recharge","pages/usercenter/transferAccounts","pages/usercenter/transferDetails","pages/usercenter/cashOut","pages/usercenter/account","pages/usercenter/withdrawalsRecord","pages/usercenter/addCard","pages/usercenter/editCard","pages/usercenter/myCredit","pages/usercenter/myIntegral","pages/usercenter/myCoupon","pages/usercenter/myPublish","pages/usercenter/myOrder","pages/usercenter/shopEvaluate","pages/usercenter/sales","pages/usercenter/myAchievement","pages/usercenter/myCustomer","pages/usercenter/my","pages/usercenter/wallet","pages/usercenter/setUp","pages/usercenter/setUp","pages/usercenter/myIntegral","pages/usercenter/myCoupon","pages/usercenter/myPublish","pages/usercenter/sales","pages/usercenter/personalData","pages/usercenter/address","pages/usercenter/addAddress","pages/usercenter/myCredit","pages/usercenter/myOrder","pages/usercenter/shopEvaluate","pages/usercenter/myAchievement","pages/usercenter/myCustomer"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#fff","backgroundColor":"#fff"},"renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"zhongmian","compilerVersion":"2.6.15","entryPagePath":"pages/homepage/homepage","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}}; | 3 | +var __uniConfig = {"pages":["pages/homepage/homepage","pages/login/loginindex","pages/usercenter/cardrenzheng","pages/homepage/map","pages/homepage/map","pages/usercenter/fenxiaomyteam","pages/usercenter/fenxiaotidetail","pages/usercenter/fenxiaodingdan","pages/usercenter/fenxiaoyongjin","pages/usercenter/myfenxiao","pages/nearshop/allprovince","pages/usercenter/orderdetail","pages/nearshop/selectcoupon","pages/nearshop/cartbox","pages/nearshop/cartlist","pages/homepage/collectshop","pages/luntan/examineresult","pages/luntan/examintext","pages/luntan/examine","pages/nearshop/sureorder","pages/login/accountpassword","pages/login/registercode","pages/homepage/mygift","pages/homepage/drawlottery","pages/login/finishregister","pages/homepage/miaosha","pages/luntan/luntan","pages/luntan/addcontract","pages/luntan/luntandetail","pages/luntan/luntandetailsecond","pages/luntan/luntanlist","pages/luntan/luntanpage","pages/nearshop/goodtail","pages/nearshop/shopdetail","pages/usercenter/companyshenhe","pages/usercenter/usercenter","pages/nearshop/nearshop","pages/homepage/goodkind","pages/homepage/jifenshop","pages/homepage/shoplist","pages/homepage/search","pages/login/xieyi","pages/login/setmima","pages/login/register","pages/login/forgetmima","pages/index/index","pages/usercenter/setPassword","pages/usercenter/accountDetails","pages/usercenter/recharge","pages/usercenter/transferAccounts","pages/usercenter/transferDetails","pages/usercenter/cashOut","pages/usercenter/account","pages/usercenter/withdrawalsRecord","pages/usercenter/addCard","pages/usercenter/editCard","pages/usercenter/myCredit","pages/usercenter/myIntegral","pages/usercenter/myCoupon","pages/usercenter/myPublish","pages/usercenter/myOrder","pages/usercenter/shopEvaluate","pages/usercenter/sales","pages/usercenter/myAchievement","pages/usercenter/myCustomer","pages/usercenter/my","pages/usercenter/wallet","pages/usercenter/setUp","pages/usercenter/setUp","pages/usercenter/myIntegral","pages/usercenter/myCoupon","pages/usercenter/myPublish","pages/usercenter/sales","pages/usercenter/personalData","pages/usercenter/address","pages/usercenter/addAddress","pages/usercenter/myCredit","pages/usercenter/myOrder","pages/usercenter/shopEvaluate","pages/usercenter/myAchievement","pages/usercenter/myCustomer"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#fff","backgroundColor":"#fff"},"renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"zhongmian","compilerVersion":"2.6.16","entryPagePath":"pages/homepage/homepage","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}}; |
4 | var __uniRoutes = [{"path":"/pages/homepage/homepage","meta":{"isQuit":true},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#C29445","navigationBarTextStyle":"white","navigationStyle":"custom","bounce":"none"}},{"path":"/pages/login/loginindex","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/cardrenzheng","meta":{},"window":{"navigationBarTitleText":"身份认证","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/map","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaomyteam","meta":{},"window":{"navigationBarTitleText":"我的团队","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaotidetail","meta":{},"window":{"navigationBarTitleText":"提现明细","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaodingdan","meta":{},"window":{"navigationBarTitleText":"分销订单","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaoyongjin","meta":{},"window":{"navigationBarTitleText":"分销佣金","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myfenxiao","meta":{},"window":{"navigationBarTitleText":"我的分销","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/allprovince","meta":{},"window":{"navigationBarTitleText":"全部省份","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/orderdetail","meta":{},"window":{"navigationBarTitleText":"订单详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/selectcoupon","meta":{},"window":{"navigationBarTitleText":"选择优惠券","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/cartbox","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/cartlist","meta":{},"window":{"navigationBarTitleText":"购物车","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/collectshop","meta":{},"window":{"navigationBarTitleText":"店铺收藏","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/examineresult","meta":{},"window":{"navigationBarTitleText":"等级考试","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/examintext","meta":{},"window":{"navigationBarTitleText":"等级考试","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/examine","meta":{},"window":{"navigationBarTitleText":"等级考试","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/sureorder","meta":{},"window":{"navigationBarTitleText":"订单详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/accountpassword","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/registercode","meta":{},"window":{"navigationBarTitleText":"注册","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/mygift","meta":{},"window":{"navigationBarTitleText":"我的奖品","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/drawlottery","meta":{},"window":{"navigationBarTitleText":"抽奖专区","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/finishregister","meta":{},"window":{"navigationBarTitleText":"注册","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/miaosha","meta":{},"window":{"navigationBarTitleText":"秒杀商城","navigationBarBackgroundColor":"#C29445","navigationBarTextStyle":"white","titleNView":{"titleSize":"12"}}},{"path":"/pages/luntan/luntan","meta":{},"window":{"navigationBarTitleText":"论坛","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black","navigationStyle":"custom","bounce":"none"}},{"path":"/pages/luntan/addcontract","meta":{},"window":{"navigationBarTitleText":"发布帖子","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntandetail","meta":{},"window":{"navigationBarTitleText":"帖子详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntandetailsecond","meta":{},"window":{"navigationBarTitleText":"帖子详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntanlist","meta":{},"window":{"navigationBarTitleText":"帖子列表","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntanpage","meta":{},"window":{"navigationBarTitleText":"个人主页","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/goodtail","meta":{},"window":{"navigationBarTitleText":"商品详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/shopdetail","meta":{},"window":{"navigationBarTitleText":"店铺详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/companyshenhe","meta":{},"window":{"navigationBarTitleText":"企业会员申请","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/usercenter","meta":{},"window":{"navigationBarTitleText":"会员中心","navigationBarBackgroundColor":"#ECCB90","navigationBarTextStyle":"white"}},{"path":"/pages/nearshop/nearshop","meta":{},"window":{"navigationBarTitleText":"附近店铺","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/goodkind","meta":{},"window":{"navigationBarTitleText":"商品分类","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/jifenshop","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/shoplist","meta":{},"window":{"navigationBarTitleText":"商品列表","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/search","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"white","navigationStyle":"custom","bounce":"none"}},{"path":"/pages/login/xieyi","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/setmima","meta":{},"window":{"navigationBarTitleText":"设置密码","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/register","meta":{},"window":{"navigationBarTitleText":"注册","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/forgetmima","meta":{},"window":{"navigationBarTitleText":"重置密码","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/index/index","meta":{},"window":{"navigationBarTitleText":"uni-app"}},{"path":"/pages/usercenter/setPassword","meta":{},"window":{"navigationBarTitleText":"设置密码","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/accountDetails","meta":{},"window":{"navigationBarTitleText":"账户明细","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/recharge","meta":{},"window":{"navigationBarTitleText":"充值","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/transferAccounts","meta":{},"window":{"navigationBarTitleText":"转账","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/transferDetails","meta":{},"window":{"navigationBarTitleText":"转账详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/cashOut","meta":{},"window":{"navigationBarTitleText":"提现","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/account","meta":{},"window":{"navigationBarTitleText":"选择到账账户","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/withdrawalsRecord","meta":{},"window":{"navigationBarTitleText":"提现记录","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/addCard","meta":{},"window":{"navigationBarTitleText":"添加银行卡","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/editCard","meta":{},"window":{"navigationBarTitleText":"编辑银行卡","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myCredit","meta":{},"window":{"navigationBarTitleText":"我的赊吧","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myIntegral","meta":{},"window":{"navigationBarTitleText":"我的积分","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myCoupon","meta":{},"window":{"navigationBarTitleText":"我的优惠券","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myPublish","meta":{},"window":{"navigationBarTitleText":"我的发布","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myOrder","meta":{},"window":{"navigationBarTitleText":"我的订单","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/shopEvaluate","meta":{},"window":{"navigationBarTitleText":"商品评价","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/sales","meta":{},"window":{"navigationBarTitleText":"销售管理","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myAchievement","meta":{},"window":{"navigationBarTitleText":"我的业绩","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myCustomer","meta":{},"window":{"navigationBarTitleText":"我的客户","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/my","meta":{},"window":{"navigationBarTitleText":"我的","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/wallet","meta":{},"window":{"navigationBarTitleText":"我的钱包","navigationBarBackgroundColor":"#C29445","navigationBarTextStyle":"white"}},{"path":"/pages/usercenter/setUp","meta":{},"window":{"navigationBarTitleText":"设置","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/personalData","meta":{},"window":{"navigationBarTitleText":"个人资料","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/address","meta":{},"window":{"navigationBarTitleText":"地址管理","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/addAddress","meta":{},"window":{"navigationBarTitleText":"新增收货地址","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}}]; | 4 | var __uniRoutes = [{"path":"/pages/homepage/homepage","meta":{"isQuit":true},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#C29445","navigationBarTextStyle":"white","navigationStyle":"custom","bounce":"none"}},{"path":"/pages/login/loginindex","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/cardrenzheng","meta":{},"window":{"navigationBarTitleText":"身份认证","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/map","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaomyteam","meta":{},"window":{"navigationBarTitleText":"我的团队","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaotidetail","meta":{},"window":{"navigationBarTitleText":"提现明细","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaodingdan","meta":{},"window":{"navigationBarTitleText":"分销订单","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/fenxiaoyongjin","meta":{},"window":{"navigationBarTitleText":"分销佣金","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myfenxiao","meta":{},"window":{"navigationBarTitleText":"我的分销","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/allprovince","meta":{},"window":{"navigationBarTitleText":"全部省份","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/orderdetail","meta":{},"window":{"navigationBarTitleText":"订单详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/selectcoupon","meta":{},"window":{"navigationBarTitleText":"选择优惠券","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/cartbox","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/cartlist","meta":{},"window":{"navigationBarTitleText":"购物车","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/collectshop","meta":{},"window":{"navigationBarTitleText":"店铺收藏","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/examineresult","meta":{},"window":{"navigationBarTitleText":"等级考试","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/examintext","meta":{},"window":{"navigationBarTitleText":"等级考试","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/examine","meta":{},"window":{"navigationBarTitleText":"等级考试","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/sureorder","meta":{},"window":{"navigationBarTitleText":"订单详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/accountpassword","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/registercode","meta":{},"window":{"navigationBarTitleText":"注册","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/mygift","meta":{},"window":{"navigationBarTitleText":"我的奖品","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/drawlottery","meta":{},"window":{"navigationBarTitleText":"抽奖专区","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/finishregister","meta":{},"window":{"navigationBarTitleText":"注册","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/miaosha","meta":{},"window":{"navigationBarTitleText":"秒杀商城","navigationBarBackgroundColor":"#C29445","navigationBarTextStyle":"white","titleNView":{"titleSize":"12"}}},{"path":"/pages/luntan/luntan","meta":{},"window":{"navigationBarTitleText":"论坛","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black","navigationStyle":"custom","bounce":"none"}},{"path":"/pages/luntan/addcontract","meta":{},"window":{"navigationBarTitleText":"发布帖子","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntandetail","meta":{},"window":{"navigationBarTitleText":"帖子详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntandetailsecond","meta":{},"window":{"navigationBarTitleText":"帖子详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntanlist","meta":{},"window":{"navigationBarTitleText":"帖子列表","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/luntan/luntanpage","meta":{},"window":{"navigationBarTitleText":"个人主页","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/goodtail","meta":{},"window":{"navigationBarTitleText":"商品详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/nearshop/shopdetail","meta":{},"window":{"navigationBarTitleText":"店铺详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/companyshenhe","meta":{},"window":{"navigationBarTitleText":"企业会员申请","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/usercenter","meta":{},"window":{"navigationBarTitleText":"会员中心","navigationBarBackgroundColor":"#ECCB90","navigationBarTextStyle":"white"}},{"path":"/pages/nearshop/nearshop","meta":{},"window":{"navigationBarTitleText":"附近店铺","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/goodkind","meta":{},"window":{"navigationBarTitleText":"商品分类","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/jifenshop","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/shoplist","meta":{},"window":{"navigationBarTitleText":"商品列表","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/homepage/search","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"white","navigationStyle":"custom","bounce":"none"}},{"path":"/pages/login/xieyi","meta":{},"window":{"navigationBarTitleText":"","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/setmima","meta":{},"window":{"navigationBarTitleText":"设置密码","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/register","meta":{},"window":{"navigationBarTitleText":"注册","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/login/forgetmima","meta":{},"window":{"navigationBarTitleText":"重置密码","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/index/index","meta":{},"window":{"navigationBarTitleText":"uni-app"}},{"path":"/pages/usercenter/setPassword","meta":{},"window":{"navigationBarTitleText":"设置密码","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/accountDetails","meta":{},"window":{"navigationBarTitleText":"账户明细","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/recharge","meta":{},"window":{"navigationBarTitleText":"充值","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/transferAccounts","meta":{},"window":{"navigationBarTitleText":"转账","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/transferDetails","meta":{},"window":{"navigationBarTitleText":"转账详情","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/cashOut","meta":{},"window":{"navigationBarTitleText":"提现","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/account","meta":{},"window":{"navigationBarTitleText":"选择到账账户","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/withdrawalsRecord","meta":{},"window":{"navigationBarTitleText":"提现记录","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/addCard","meta":{},"window":{"navigationBarTitleText":"添加银行卡","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/editCard","meta":{},"window":{"navigationBarTitleText":"编辑银行卡","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myCredit","meta":{},"window":{"navigationBarTitleText":"我的赊吧","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myIntegral","meta":{},"window":{"navigationBarTitleText":"我的积分","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myCoupon","meta":{},"window":{"navigationBarTitleText":"我的优惠券","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myPublish","meta":{},"window":{"navigationBarTitleText":"我的发布","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myOrder","meta":{},"window":{"navigationBarTitleText":"我的订单","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/shopEvaluate","meta":{},"window":{"navigationBarTitleText":"商品评价","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/sales","meta":{},"window":{"navigationBarTitleText":"销售管理","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myAchievement","meta":{},"window":{"navigationBarTitleText":"我的业绩","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/myCustomer","meta":{},"window":{"navigationBarTitleText":"我的客户","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/my","meta":{},"window":{"navigationBarTitleText":"我的","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/wallet","meta":{},"window":{"navigationBarTitleText":"我的钱包","navigationBarBackgroundColor":"#C29445","navigationBarTextStyle":"white"}},{"path":"/pages/usercenter/setUp","meta":{},"window":{"navigationBarTitleText":"设置","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/personalData","meta":{},"window":{"navigationBarTitleText":"个人资料","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/address","meta":{},"window":{"navigationBarTitleText":"地址管理","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}},{"path":"/pages/usercenter/addAddress","meta":{},"window":{"navigationBarTitleText":"新增收货地址","navigationBarBackgroundColor":"#fff","navigationBarTextStyle":"black"}}]; |
5 | __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); | 5 | __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}}); |
6 | service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}}); | 6 | service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}}); |
此 diff 太大无法显示。
此 diff 太大无法显示。
1 | -{"@platforms":["android","iPhone","iPad"],"id":"__UNI__86EF000","name":"zhongmian","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"FaceID":{},"Payment":{},"Maps":{"coordType":"gcj02"},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","distribute":{"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"payment":{"alipay":{},"weixin":{"appid":"wx24f90adc1d2f4f3d","UniversalLinks":""}},"ad":{},"maps":{"amap":{"appkey_ios":"39ab1cc4587cc0c5f21f25054c59bb18","appkey_android":"01d25fb8343d7ce5040bc32cb3e5379f"}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"2.6.15","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}} | ||
1 | +{"@platforms":["android","iPhone","iPad"],"id":"__UNI__86EF000","name":"zhongmian","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"FaceID":{},"Payment":{},"Maps":{"coordType":"gcj02"},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","distribute":{"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>","<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{},"plugins":{"payment":{"alipay":{},"weixin":{"appid":"wx24f90adc1d2f4f3d","UniversalLinks":""}},"ad":{},"maps":{"amap":{"appkey_ios":"39ab1cc4587cc0c5f21f25054c59bb18","appkey_android":"01d25fb8343d7ce5040bc32cb3e5379f"}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"uni-app":{"compilerVersion":"2.6.16","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"launch_path":"__uniappview.html"}} |
此 diff 太大无法显示。
-
请 注册 或 登录 后发表评论