Blame view
src/pages/user/user.vue
16.5 KB
0db291810 “-mcomfirmOder页面 |
1 |
<template> |
323398550 若干功能添加 |
2 |
<view class="wrap"> |
daf137d6f 合并冲突 |
3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 |
<!-- 弹窗 --> <uni-popup ref="popup" type="center" > <!-- 给一个左边弹窗的样式 --> <!-- 关闭弹窗按钮 --> <view class="closeBtn" @tap="this.$refs.popup.close()" >x</view> <view class="popUpWrap" v-if="whichTap==0" > <text>这是一款眼镜及周边产品的销售平台,我们将帮您进行建立全球销售网络,欢迎入驻。</text> |
31dea37da 新增验光单和修改验光单 |
19 |
|
daf137d6f 合并冲突 |
20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
<!-- 左 --> <!-- <image class="glassInfo" src="../../static/img/myOpticsData/glassInfo.png" v-if="whichTap == 0" mode="aspectFit"></image> --> <!-- 右 --> <!-- <image class="dataInfo" src="../../static/img/myOpticsData/dataInfo.png" v-else mode="aspectFit"></image> --> </view> <view class="popUpWrap" v-if="whichTap==1" > <text>本平台欢迎全国各地的眼镜工厂、品牌、眼镜店加入。请联系我们申请注册账号。</text> </view> <view class="popUpWrap" v-if="whichTap==2" > <button @tap="chatOur(1)">客服1</button> <button @tap="chatOur(2)">客服2</button> </view> </uni-popup> |
2cd0b0f44 bug修复 |
39 |
<!-- <scroll-view |
967ce241a 合并冲突 |
40 41 42 43 44 |
enable-flex @scrolltolower="handleScrolltolower" scroll-y style="height: 1000px;" > --> |
2cd0b0f44 bug修复 |
45 46 47 48 |
<view v-if="isAuth" class="content" > |
323398550 若干功能添加 |
49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
<view class="userInfo"> <view class="info"> <image :src="headerphoto" mode="aspectFill" ></image> <view class="infoText"> <text class="userName">{{nickName}}</text> </view> </view> <!-- <view class="service"> <image src="../../static/serviceLogo.png" mode="aspectFill"></image> </view> --> </view> <view class="myOpticsData" |
daf137d6f 合并冲突 |
65 |
@tap="toOpticsData" |
323398550 若干功能添加 |
66 67 68 69 70 71 72 73 74 75 76 77 78 79 |
> <view class="left"> <image src="../../static/img/user/dataWrite.png" mode="aspectFit" ></image> <text>验光数据</text> </view> <image src="../../static/right.png" mode="aspectFit" ></image> </view> <view class="myOrder"> |
eed6c3ca9 订单列表添加支付和取消功能,修改订... |
80 |
<view class="orderHeader" @click="toMyOrder('10')" > |
156736a2e 样式修改 |
81 |
<text>我的订单</text> |
eed6c3ca9 订单列表添加支付和取消功能,修改订... |
82 |
<view class="btn"> |
323398550 若干功能添加 |
83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 |
全部 <image src="../../static/right.png" mode="aspectFit" ></image> </view> </view> <view class="orderBody"> <view class="item waitPay" @click="toMyOrder('0')" > <image src="../../static/img/user/waitDeliver.png" mode="aspectFit" ></image> <text>待付款</text> </view> <view class="item waitDeliver" @click="toMyOrder('1')" > <image src="../../static/img/user/waitPay.png" mode="aspectFit" ></image> <text>待收货</text> </view> <view class="item waitReceive" @click="toMyOrder('2')" > <image src="../../static/img/user/waitReceive.png" mode="aspectFit" ></image> <text>已完成</text> </view> <!-- <view class="item service" @click="toMyOrder('3')"> <image src="../../static/img/user/refound.png" mode="aspectFit"></image> <text>已评价</text> </view> --> </view> </view> <view class="someItem"> <!-- <view class="item"> <view class="left"> <image src="../../static/img/user/shouyi.png" mode="aspectFit"></image> <text>推广记录与收益</text> </view> <image src="../../static/right.png" mode="aspectFit"></image> </view> --> |
2cd0b0f44 bug修复 |
135 136 137 138 |
<view @tap="toAddress" class="item" > |
156736a2e 样式修改 |
139 140 141 142 |
<image src="../../static/address-icon.png" mode="aspectFit" ></image> |
323398550 若干功能添加 |
143 |
<view class="left"> |
2cd0b0f44 bug修复 |
144 |
<text>地址管理</text> |
323398550 若干功能添加 |
145 |
<image |
156736a2e 样式修改 |
146 147 |
class="image2" src="../../static/right.png" |
323398550 若干功能添加 |
148 149 |
mode="aspectFit" ></image> |
323398550 若干功能添加 |
150 |
</view> |
156736a2e 样式修改 |
151 152 |
</view> |
2cd0b0f44 bug修复 |
153 154 155 156 |
<view @tap="introduce" class="item" > |
323398550 若干功能添加 |
157 |
<image |
156736a2e 样式修改 |
158 |
src="../../static/img/user/introduce.png" |
323398550 若干功能添加 |
159 160 |
mode="aspectFit" ></image> |
323398550 若干功能添加 |
161 |
<view class="left"> |
2cd0b0f44 bug修复 |
162 |
<text>系统介绍</text> |
323398550 若干功能添加 |
163 |
<image |
156736a2e 样式修改 |
164 |
src="../../static/right.png" |
323398550 若干功能添加 |
165 166 |
mode="aspectFit" ></image> |
323398550 若干功能添加 |
167 |
</view> |
156736a2e 样式修改 |
168 |
</view> |
2cd0b0f44 bug修复 |
169 170 171 172 |
<view @tap="joinUs" class="item" > |
323398550 若干功能添加 |
173 |
<image |
156736a2e 样式修改 |
174 |
src="../../static/img/user/joinUs.png" |
323398550 若干功能添加 |
175 176 |
mode="aspectFit" ></image> |
323398550 若干功能添加 |
177 |
<view class="left"> |
2cd0b0f44 bug修复 |
178 |
<text>加入我们</text> |
323398550 若干功能添加 |
179 |
<image |
156736a2e 样式修改 |
180 |
src="../../static/right.png" |
323398550 若干功能添加 |
181 182 |
mode="aspectFit" ></image> |
323398550 若干功能添加 |
183 |
</view> |
156736a2e 样式修改 |
184 185 |
</view> <view class="item"> |
323398550 若干功能添加 |
186 |
<image |
156736a2e 样式修改 |
187 |
src="../../static/img/user/service.png" |
323398550 若干功能添加 |
188 189 |
mode="aspectFit" ></image> |
156736a2e 样式修改 |
190 191 |
<view class="left lastLeft"> <text>联系客服</text> |
323398550 若干功能添加 |
192 |
<image |
156736a2e 样式修改 |
193 |
src="../../static/right.png" |
323398550 若干功能添加 |
194 195 |
mode="aspectFit" ></image> |
323398550 若干功能添加 |
196 |
</view> |
323398550 若干功能添加 |
197 198 199 200 201 202 203 204 205 206 |
</view> </view> <view class="recommend"> <view class="title"> <view class="line"></view> <view class="text">精选推荐</view> <view class="line"></view> </view> <!-- 商品列表 --> <view class="goods-list"> |
2cd0b0f44 bug修复 |
207 |
<!-- <scroll-view |
323398550 若干功能添加 |
208 209 210 211 |
enable-flex @scrolltolower="handleScrolltolower" scroll-y class="product-list" |
967ce241a 合并冲突 |
212 |
> --> |
2cd0b0f44 bug修复 |
213 |
<view class="product-list"> |
323398550 若干功能添加 |
214 215 216 217 218 |
<view class="product" v-for="(item, index) in userRecommandList" :key="index" > |
2cd0b0f44 bug修复 |
219 220 221 222 223 |
<Card :goods="item" :scrollTop="scrollTop" :viewHeight="viewHeight" ></Card> |
323398550 若干功能添加 |
224 |
</view> |
2cd0b0f44 bug修复 |
225 |
</view> |
967ce241a 合并冲突 |
226 |
<!-- </scroll-view> --> |
323398550 若干功能添加 |
227 228 229 |
<view class="loading-text">{{loadingText}}</view> </view> </view> |
2cd0b0f44 bug修复 |
230 |
</view> |
323398550 若干功能添加 |
231 232 233 234 235 236 237 238 239 240 241 242 243 244 |
<view v-else class="auth" > <view class="icon"></view> <view class="divider"></view> <view class="title">申请获取以下权限</view> <view class="text">获得您的公开信息(昵称、头像等)</view> <button type="primary" open-type="getUserInfo" @getuserinfo="onGotUserInfo" >授权登陆</button> </view> |
2cd0b0f44 bug修复 |
245 |
<!-- </scroll-view> --> |
323398550 若干功能添加 |
246 |
</view> |
0db291810 “-mcomfirmOder页面 |
247 248 249 |
</template> <script> |
323398550 若干功能添加 |
250 251 |
import Card from '@/components/CommodityCard/CommodityCard.vue' import store from '@/store' |
daf137d6f 合并冲突 |
252 |
import UniPopup from '@/components/UniPopup/uni-popup.vue' |
55ddb3f8a 登陆逻辑修改 |
253 |
|
323398550 若干功能添加 |
254 255 |
export default { components: { |
daf137d6f 合并冲突 |
256 |
Card, |
2cd0b0f44 bug修复 |
257 |
UniPopup, |
323398550 若干功能添加 |
258 259 260 261 |
}, data() { return { isAuth: true, // 是否显示授权页面, |
daf137d6f 合并冲突 |
262 |
pagesnum: 1, // 分页请求初始值 |
2cd0b0f44 bug修复 |
263 |
whichTap: 0, // 弹窗渲染选择条件 |
967ce241a 合并冲突 |
264 265 266 |
loadingText: '到底了', scrollTop: 0, viewHeight: uni.getSystemInfoSync().windowHeight, |
323398550 若干功能添加 |
267 268 |
} }, |
2cd0b0f44 bug修复 |
269 |
onPageScroll({ scrollTop }) { |
967ce241a 合并冲突 |
270 |
// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件 |
2cd0b0f44 bug修复 |
271 |
this.scrollTop = scrollTop |
967ce241a 合并冲突 |
272 |
}, |
323398550 若干功能添加 |
273 |
onLoad() { |
d6200736b 登陆问题修复 |
274 |
const that = this |
323398550 若干功能添加 |
275 276 277 278 279 |
// 判断是否授权 uni.getSetting({ success(res) { console.log('authSetting', res.authSetting) if (res.authSetting['scope.userInfo'] === true) { |
d6200736b 登陆问题修复 |
280 |
that.isAuth = true |
323398550 若干功能添加 |
281 |
} else { |
d6200736b 登陆问题修复 |
282 |
that.isAuth = false |
323398550 若干功能添加 |
283 |
} |
2cd0b0f44 bug修复 |
284 |
}, |
323398550 若干功能添加 |
285 286 |
}) store.dispatch('userRecommand/getRecommandList', { |
d6200736b 登陆问题修复 |
287 288 289 |
uid: that.$store.state.user.userInfo.uid, openid: that.$store.state.user.userInfo.openid, page: that.pagesnum, |
323398550 若干功能添加 |
290 291 |
}) }, |
967ce241a 合并冲突 |
292 293 294 295 296 297 |
onReachBottom() { // console.log('usr-my',this.$store.state.user.userInfo) this.pagesnum++ store.dispatch('userRecommand/getRecommandList', { uid: this.$store.state.user.userInfo.uid, openid: this.$store.state.user.userInfo.openid, |
2cd0b0f44 bug修复 |
298 |
page: this.pagesnum, |
967ce241a 合并冲突 |
299 300 |
}) }, |
323398550 若干功能添加 |
301 302 303 304 305 306 307 308 |
computed: { nickName() { return this.$store.state.user.userInfo.nickName }, headerphoto() { return this.$store.state.user.userInfo.headerphoto }, userRecommandList() { |
2cd0b0f44 bug修复 |
309 |
console.log('userRecommandList=====>', this.$store.state.userRecommand.recommandList) |
323398550 若干功能添加 |
310 |
return this.$store.state.userRecommand.recommandList |
2cd0b0f44 bug修复 |
311 |
}, |
323398550 若干功能添加 |
312 313 |
}, methods: { |
daf137d6f 合并冲突 |
314 315 316 317 318 319 320 321 |
// 弹窗 changeTap(item) { this.whichTap = item this.$refs.popup.open() }, chatOur(item) { if (item === 1) { uni.makePhoneCall({ |
2cd0b0f44 bug修复 |
322 |
phoneNumber: 13376189297, // 客服1 电话 |
daf137d6f 合并冲突 |
323 324 325 |
}) } else { uni.makePhoneCall({ |
2cd0b0f44 bug修复 |
326 |
phoneNumber: 18014995101, // 客服2 电话 |
daf137d6f 合并冲突 |
327 328 329 |
}) } }, |
323398550 若干功能添加 |
330 331 332 333 334 335 336 337 338 339 340 341 342 343 |
// 授权 onGotUserInfo(e) { if (e.detail.errMsg === 'getUserInfo:ok') { const { fromInfo } = this.$store.state.user // 用户授权成功 store.dispatch('user/getUserInfo', fromInfo) this.isAuth = true } }, toAddress() { uni.navigateTo({ url: '../address/addressList', success: res => {}, fail: () => {}, |
2cd0b0f44 bug修复 |
344 |
complete: () => {}, |
323398550 若干功能添加 |
345 346 347 348 349 |
}) }, introduce() { uni.showModal({ content: '这是一款眼镜及周边产品的销售平台,我们将帮您进行建立全球销售网络,欢迎入住。', |
2cd0b0f44 bug修复 |
350 |
showCancel: false, |
323398550 若干功能添加 |
351 352 353 354 355 |
}) }, joinUs() { uni.showModal({ content: '本平台欢迎全国各地的眼镜工厂、品牌、眼镜店加入。请联系我们申请注册账号', |
2cd0b0f44 bug修复 |
356 |
showCancel: false, |
323398550 若干功能添加 |
357 358 359 360 361 362 363 |
}) }, toMyOrder(status) { uni.navigateTo({ url: `../myOrder/myOrder?status=${status}`, success: res => {}, fail: () => {}, |
2cd0b0f44 bug修复 |
364 |
complete: () => {}, |
323398550 若干功能添加 |
365 366 367 368 |
}) }, toOpticsData() { uni.navigateTo({ |
2cd0b0f44 bug修复 |
369 |
url: '../addOpticsData/addOpticsData', |
323398550 若干功能添加 |
370 |
}) |
2cd0b0f44 bug修复 |
371 372 |
}, }, |
323398550 若干功能添加 |
373 |
} |
0db291810 “-mcomfirmOder页面 |
374 375 |
</script> |
fb85b244c user页面 |
376 |
<style lang="scss"> |
323398550 若干功能添加 |
377 378 379 380 381 382 383 384 385 386 387 388 389 |
.warp { font-size: 24rpx; background-color: #f2f2f2; height: 100vh; } .content { display: flex; flex-direction: column; align-items: center; justify-content: center; background-color: #f2f2f2; } .userInfo { |
2cd0b0f44 bug修复 |
390 |
background-image: linear-gradient(270deg, #f79067 0%, #ff5f3b 66%); |
323398550 若干功能添加 |
391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 |
width: 100%; height: 240rpx; color: #ffffff; padding: 60rpx 82rpx 80rpx 44rpx; box-sizing: border-box; display: flex; flex-direction: row; justify-content: space-between; align-items: flex-start; .info { display: flex; flex-direction: row; justify-content: space-between; align-items: center; image { border-radius: 50rpx; height: 100rpx; width: 100rpx; margin-right: 40rpx; } .infoText { display: flex; flex-direction: column; justify-content: space-between; align-items: flex-scetart; .userName { font-size: 18px; color: #ffffff; margin-bottom: 8rpx; } .nickName { font-size: 12px; color: #ffffff; } } } // .service { // margin-top: 20rpx; // image { // height: 36rpx; // width: 36rpx; // } // } } .myOpticsData { width: 670rpx; height: 120rpx; background-color: #ffffff; border-radius: 6px; box-shadow: 1px 1px 7px 0 rgba(133, 107, 107, 0.1); position: relative; bottom: 44rpx; padding: 40rpx; box-sizing: border-box; display: flex; justify-content: space-between; align-items: center; .left { font-size: 14px; color: #333333; display: flex; align-items: center; image { margin-right: 32rpx; |
156736a2e 样式修改 |
455 456 |
width: 40rpx; height: 44rpx; |
323398550 若干功能添加 |
457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 |
} } image { height: 16px; width: 8px; } } .myOrder { width: 100%; height: 296rpx; // margin-top: 116rpx; margin-bottom: 20rpx; padding: 0 40rpx; box-sizing: border-box; background: #ffffff; box-shadow: 0 0 4px 0 rgba(133, 107, 107, 0.1); border-radius: 6px; border-radius: 6px; display: flex; flex-direction: column; justify-content: space-around; align-items: center; .orderHeader { width: 100%; height: 100rpx; display: flex; flex-direction: row; justify-content: space-between; align-items: center; |
2cd0b0f44 bug修复 |
486 |
border-bottom: 1px solid #f5f5f5; |
323398550 若干功能添加 |
487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 |
font-weight: bold; font-size: 18px; color: #333333; .btn { font-size: 12px; color: #999999; display: flex; align-items: center; image { margin-left: 20rpx; height: 32rpx; width: 16rpx; } } } .orderBody { width: 100%; display: flex; flex-direction: row; justify-content: space-around; align-items: center; .item { display: flex; flex-direction: column; align-items: center; image { width: 62rpx; height: 46rpx; } text { margin-top: 24rpx; font-size: 12px; color: #333333; } } } } .someItem { width: 100%; height: 336rpx; background: #ffffff; box-shadow: 0 0 4px 0 rgba(133, 107, 107, 0.1); border-radius: 6px; border-radius: 6px; margin-bottom: 18rpx; box-sizing: border-box; padding: 21rpx 48rpx 21rpx 42rpx; box-sizing: border-box; display: flex; flex-direction: column; justify-content: space-between; align-items: center; .item { |
156736a2e 样式修改 |
540 541 |
display: grid; grid-template-columns: 10% 90%; |
323398550 若干功能添加 |
542 543 544 545 546 547 548 549 |
align-items: center; height: 72rpx; width: 100%; .left { font-size: 14px; color: #333333; display: flex; align-items: center; |
156736a2e 样式修改 |
550 551 |
justify-content: space-between; height: 72rpx; |
2cd0b0f44 bug修复 |
552 |
border-bottom: 1px solid #f2f2f2; |
323398550 若干功能添加 |
553 |
image { |
156736a2e 样式修改 |
554 555 556 |
margin-right: 0; height: 16px; width: 8px; |
323398550 若干功能添加 |
557 558 559 |
} } image { |
156736a2e 样式修改 |
560 561 562 |
margin-right: 32rpx; width: 40rpx; height: 44rpx; |
323398550 若干功能添加 |
563 |
} |
2cd0b0f44 bug修复 |
564 565 566 |
.lastLeft { border-bottom: none; } |
323398550 若干功能添加 |
567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 |
} } .recommend { background: #ffffff; box-shadow: 0 0 4px 0 rgba(133, 107, 107, 0.1); border-radius: 6px; border-radius: 6px; width: 100%; .title { display: flex; flex-direction: row; align-items: center; justify-content: space-between; padding: 20rpx 40rpx; .line { width: 264rpx; height: 1rpx; border-bottom: 1px solid #eaeaea; } .text { font-family: PingFangSC-Medium; font-size: 14px; color: #333333; letter-spacing: -0.26px; text-align: justify; line-height: 24px; } } .goods-list { .loading-text { width: 100%; display: flex; justify-content: center; align-items: center; height: 30px; color: #979797; font-size: 12px; } .product-list { width: 92%; padding: 0 4% 3vw 4%; display: flex; justify-content: space-between; flex-wrap: wrap; .product { width: 48%; margin: 0 0 20rpx 0; background: #ffffff; border: 1px solid #f2f2f2; } } } } .auth { height: 100vh; display: flex; flex-direction: column; align-items: center; .icon { width: 140rpx; height: 140rpx; border-radius: 50%; margin-top: 100rpx; background-color: grey; } .divider { height: 1rpx; width: 600rpx; margin-top: 80rpx; background-color: #e6e3e3; } .title { width: 600rpx; margin-top: 50rpx; text-align: left; } .text { width: 600rpx; margin-top: 30rpx; text-align: left; color: #e6e3e3; } button { width: 450rpx; height: 80rpx; line-height: 80rpx; margin-top: 80rpx; border-radius: 30rpx; } } |
daf137d6f 合并冲突 |
657 658 659 660 661 662 663 664 |
.closeBtn { height: 28rpx; width: 28rpx; // border: 1px solid red; position: absolute; top: 20rpx; right: 10rpx; } |
9ff2df1bf 文件名称规范 |
665 |
</style> |