miniprogram / chuanda · 提交

转到一个项目

作者 刘晓艳
提交 7b1edd87c62027259eeada2993ee03991c7fa4af 1 个父辈 81a6fedc

穿搭bug修改

内嵌 并排对比
正在显示 18 个修改的文件 包含 422 行增加 和 192 行删除
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
5 <view>审核!</view> 5 <view>审核!</view>
6 <view>别急!</view> 6 <view>别急!</view>
7 </view> 7 </view>
8 - <view class='bottom_btn' bindtap='goIndex'>确定</view> 8 + <view class='bottom_btn' bindtap='goIndex'>回首页</view>
9 </view> 9 </view>
10 </view> 10 </view>
@@ -17,18 +17,58 @@ Page({ @@ -17,18 +17,58 @@ Page({
17 comment_text: '' 17 comment_text: ''
18 }, 18 },
19 19
20 - showPoster() {  
21 - this.setData({ 20 + showPoster(e) {
  21 + var id = e.currentTarget.dataset.id
  22 + var that = this
  23 + wx.hideTabBar({})
  24 + wx.showToast({
  25 + title: '加载中',
  26 + icon: 'loading'
  27 + })
  28 + // setTimeout(function() {
  29 + that.setData({
22 poster_state: true 30 poster_state: true
23 }) 31 })
  32 + // }, 2000)
  33 + this.getPoster(id)
24 }, 34 },
25 35
26 canclePopup() { 36 canclePopup() {
  37 + var list = this.data.list
  38 + for (var i = 0; i < list.length; i++) {
  39 + list[i].more_state = false
  40 + }
27 this.setData({ 41 this.setData({
28 - poster_state: false 42 + poster_state: false,
  43 + list: list
29 }) 44 })
  45 + wx.showTabBar({})
30 }, 46 },
31 47
  48 +
  49 + getPoster(id) {
  50 + let that = this;
  51 + let url = '/home/index/fashionShare';
  52 + let param = {
  53 + list_id: id
  54 + }
  55 + let header = {
  56 + 'XX-Token': wx.getStorageSync('token'),
  57 + 'XX-Device-Type': 'wxapp'
  58 + }
  59 + app.post(url, param, header).then((res) => {
  60 + console.log(res)
  61 +
  62 + if (res.data.code == 20000) {
  63 + this.setData({
  64 + poster: res.data.data.url,
  65 + })
  66 + }
  67 +
  68 + })
  69 + },
  70 +
  71 +
32 showMore() { 72 showMore() {
33 this.setData({ 73 this.setData({
34 more_state: !(this.data.more_state) 74 more_state: !(this.data.more_state)
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 <!-- <textarea placeholder='请输入评论内容' bindconfirm='submitComment' fixed='true'></textarea> --> 103 <!-- <textarea placeholder='请输入评论内容' bindconfirm='submitComment' fixed='true'></textarea> -->
104 </view> 104 </view>
105 105
106 -<view class='mask_box' wx:if='{{poster_state}}'> 106 +<!-- <view class='mask_box' wx:if='{{poster_state}}'>
107 <view class='popup_box'> 107 <view class='popup_box'>
108 <view> 108 <view>
109 <view class='popup_content_box'> 109 <view class='popup_content_box'>
@@ -126,4 +126,24 @@ @@ -126,4 +126,24 @@
126 </view> 126 </view>
127 <view class='iconfont icon-quxiao' bindtap='canclePopup'></view> 127 <view class='iconfont icon-quxiao' bindtap='canclePopup'></view>
128 </view> 128 </view>
  129 +</view> -->
  130 +
  131 +<view class='mask_box2' wx:if='{{poster_state}}'>
  132 + <view class='popup_box2'>
  133 + <view>
  134 + <view class='popup_content_box'>
  135 + <view class='popup_info_box'>
  136 + <view class='popup_img'>
  137 + <image src='{{poster}}'></image>
  138 + </view>
  139 + <view class='popup_icon_box'>
  140 + <view class='popup_btn_box' bindtap='saveImg' data-src='{{poster}}'>
  141 + <view class='popup_btn2'>保存图片</view>
  142 + </view>
  143 + </view>
  144 + </view>
  145 + </view>
  146 + </view>
  147 + <view class='iconfont icon-quxiao' bindtap='canclePopup'></view>
  148 + </view>
129 </view> 149 </view>
@@ -453,13 +453,121 @@ page { @@ -453,13 +453,121 @@ page {
453 border-radius: 10rpx; 453 border-radius: 10rpx;
454 } 454 }
455 455
456 -.popup_info_box { 456 +
  457 +
  458 +
  459 +
  460 +.mask_chassify_box {
  461 + width: 100%;
  462 + height: 100%;
  463 + background: rgba(0, 0, 0, 0.3);
  464 + position: fixed;
  465 + top: 90rpx;
  466 + left: 0;
  467 + z-index: 10;
  468 +}
  469 +
  470 +.classif_popup_box {
  471 + width: 80%;
  472 + height: 100%;
457 background: #fff; 473 background: #fff;
  474 + position: fixed;
  475 + top: 90rpx;
  476 + right: 0rpx;
  477 + z-index: 10;
  478 +}
  479 +
  480 +.classify_item {
  481 + display: flex;
  482 + align-items: center;
  483 + padding: 20rpx 30rpx;
  484 + box-sizing: border-box;
  485 + border-bottom: 1rpx solid #ebebeb;
  486 + font-size: 28rpx;
  487 + color: #282829;
  488 +}
  489 +
  490 +.chassify_picker {
  491 + width: 83%;
  492 + display: flex;
  493 + align-items: center;
  494 +}
  495 +
  496 +.chassify_picker input {
  497 + width: 140%;
  498 + text-align: right;
  499 +}
  500 +
  501 +.classify_btn_box {
  502 + width: 80%;
  503 + display: flex;
  504 + align-items: center;
  505 + justify-content: space-between;
458 padding: 30rpx; 506 padding: 30rpx;
459 box-sizing: border-box; 507 box-sizing: border-box;
  508 + position: fixed;
  509 + bottom: 30rpx;
  510 +}
  511 +
  512 +.classify_btn {
  513 + width: 200rpx;
  514 + height: 80rpx;
  515 + background: #ebebeb;
  516 + border-radius: 10rpx;
  517 + display: flex;
  518 + align-items: center;
  519 + justify-content: center;
460 font-size: 28rpx; 520 font-size: 28rpx;
461 color: #282829; 521 color: #282829;
  522 +}
  523 +
  524 +.classify_active {
  525 + background: #000;
  526 + color: #fff;
  527 +}
  528 +.mask_box2 {
  529 + width: 100%;
  530 + height: 100%;
  531 + background: #000;
  532 + position: fixed;
  533 + top: 0;
  534 + left: 0;
  535 + z-index: 10;
  536 + padding: 30rpx;
  537 + box-sizing: border-box;
  538 +}
  539 +
  540 +.icon-quxiao {
  541 + font-size: 36rpx;
  542 + text-align: center;
  543 + color: #fff;
  544 + position: absolute;
  545 + bottom: -80rpx;
  546 + left: 50%;
  547 + transform: translateX(-50%);
  548 +}
  549 +
  550 +.popup_box2 {
  551 + width: 100%;
  552 + border-radius: 10rpx;
  553 + position: relative;
  554 +}
  555 +
  556 +.popup_box2 image {
  557 + width: 100%;
  558 + height: 686rpx;
  559 + border-radius: 10rpx;
  560 +}
  561 +
  562 +.popup_info_box {
  563 + width: 686rpx;
  564 + /* background: #fff;
  565 + padding: 30rpx;
  566 + box-sizing: border-box;
  567 + font-size: 28rpx;
  568 + color: #282829; */
462 border-radius: 10rpx; 569 border-radius: 10rpx;
  570 + position: relative;
463 } 571 }
464 572
465 .popup_icon_box { 573 .popup_icon_box {
@@ -468,9 +576,12 @@ page { @@ -468,9 +576,12 @@ page {
468 justify-content: space-between; 576 justify-content: space-between;
469 padding: 0 45rpx; 577 padding: 0 45rpx;
470 margin-top: 30rpx; 578 margin-top: 30rpx;
  579 + position: absolute;
  580 + left: 0;
  581 + bottom: 0;
471 } 582 }
472 583
473 -.popup_title { 584 +.popup_title2 {
474 font-size: 34rpx; 585 font-size: 34rpx;
475 color: #000; 586 color: #000;
476 font-weight: bold; 587 font-weight: bold;
@@ -489,7 +600,7 @@ page { @@ -489,7 +600,7 @@ page {
489 position: relative; 600 position: relative;
490 } 601 }
491 602
492 -.popup_btn { 603 +.popup_btn2 {
493 width: 200rpx; 604 width: 200rpx;
494 height: 72rpx; 605 height: 72rpx;
495 background: rgba(0, 0, 0, 1); 606 background: rgba(0, 0, 0, 1);
@@ -523,77 +634,26 @@ page { @@ -523,77 +634,26 @@ page {
523 position: absolute; 634 position: absolute;
524 bottom: -25rpx; 635 bottom: -25rpx;
525 right: 0; 636 right: 0;
  637 + z-index: 100;
526 } 638 }
527 -  
528 -.popup_img {  
529 - position: relative;  
530 -}  
531 -  
532 -.mask_chassify_box { 639 +.popup_img{
533 width: 100%; 640 width: 100%;
534 - height: 100%;  
535 - background: rgba(0, 0, 0, 0.3);  
536 - position: fixed;  
537 - top: 90rpx;  
538 - left: 0;  
539 - z-index: 10; 641 + height:1026rpx;
  642 + border-radius: 16rpx;
  643 + overflow: hidden;
540 } 644 }
541 -  
542 -.classif_popup_box {  
543 - width: 80%; 645 +.popup_img image{
  646 + width: 100%;
544 height: 100%; 647 height: 100%;
545 - background: #fff;  
546 - position: fixed;  
547 - top: 90rpx;  
548 - right: 0rpx;  
549 - z-index: 10;  
550 -}  
551 -  
552 -.classify_item {  
553 - display: flex;  
554 - align-items: center;  
555 - padding: 20rpx 30rpx;  
556 - box-sizing: border-box;  
557 - border-bottom: 1rpx solid #ebebeb;  
558 - font-size: 28rpx;  
559 - color: #282829;  
560 -}  
561 -  
562 -.chassify_picker {  
563 - width: 83%;  
564 - display: flex;  
565 - align-items: center;  
566 -}  
567 -  
568 -.chassify_picker input {  
569 - width: 140%;  
570 - text-align: right;  
571 -}  
572 -  
573 -.classify_btn_box {  
574 - width: 80%;  
575 - display: flex;  
576 - align-items: center;  
577 - justify-content: space-between;  
578 - padding: 30rpx;  
579 - box-sizing: border-box;  
580 - position: fixed;  
581 - bottom: 30rpx;  
582 } 648 }
583 649
584 -.classify_btn {  
585 - width: 200rpx;  
586 - height: 80rpx;  
587 - background: #ebebeb;  
588 - border-radius: 10rpx;  
589 - display: flex;  
590 - align-items: center;  
591 - justify-content: center;  
592 - font-size: 28rpx;  
593 - color: #282829; 650 +.popup_img2 {
  651 + width: 686rpx;
  652 + height: 686rpx;
  653 + position: relative;
594 } 654 }
595 655
596 -.classify_active {  
597 - background: #000;  
598 - color: #fff; 656 +.popup_img2 image {
  657 + width: 100%;
  658 + height: 100%;
599 } 659 }
@@ -7,7 +7,9 @@ Page({ @@ -7,7 +7,9 @@ Page({
7 */ 7 */
8 data: { 8 data: {
9 status: '', 9 status: '',
10 - list: [] 10 + list: [],
  11 + mask_state:false,
  12 + id:0,
11 }, 13 },
12 14
13 goUserInfo(e) { 15 goUserInfo(e) {
@@ -20,7 +22,9 @@ Page({ @@ -20,7 +22,9 @@ Page({
20 getData() { 22 getData() {
21 let url = '/home/index/checkFans' 23 let url = '/home/index/checkFans'
22 let params = { 24 let params = {
23 - status: this.data.status 25 + status: this.data.status,
  26 + open_user_id:this.data.id,
  27 + page:1
24 } 28 }
25 let header = { 29 let header = {
26 "XX-Token": wx.getStorageSync('token'), 30 "XX-Token": wx.getStorageSync('token'),
@@ -29,11 +33,6 @@ Page({ @@ -29,11 +33,6 @@ Page({
29 app.post(url, params, header).then((res) => { 33 app.post(url, params, header).then((res) => {
30 console.log(res) 34 console.log(res)
31 var list = res.data.data.list 35 var list = res.data.data.list
32 - // if (this.data.status == 1) {  
33 - // for (var i in list) {  
34 - // list[i].user_host == 1  
35 - // }  
36 - // }  
37 if (res.data.code == 20000) { 36 if (res.data.code == 20000) {
38 this.setData({ 37 this.setData({
39 list: list 38 list: list
@@ -42,34 +41,53 @@ Page({ @@ -42,34 +41,53 @@ Page({
42 }) 41 })
43 }, 42 },
44 43
45 - //点击关注  
46 - attention(e) {  
47 - var status = ''  
48 - var index = e.currentTarget.dataset.index 44 +
  45 + //关注接口
  46 + // attentionInfo(e) {
  47 + // let that = this;
  48 + // var id = e.currentTarget.dataset.id
  49 + // var status = e.currentTarget.dataset.status
  50 + // let url = '/home/index/host';
  51 + // let param = {
  52 + // open_user_id: id,
  53 + // status: status
  54 + // }
  55 + // let header = {
  56 + // 'XX-Token': wx.getStorageSync('token'),
  57 + // 'XX-Device-Type': 'wxapp'
  58 + // }
  59 + // app.post(url, param, header).then((res) => {
  60 + // if (res.data.code == 20000) {
  61 + // this.getData()
  62 + // }
  63 + // })
  64 + // },
  65 +
  66 + showMask(e) {
49 var id = e.currentTarget.dataset.id 67 var id = e.currentTarget.dataset.id
50 - var list = this.data.list  
51 - if (list.user_host == 1) {  
52 - list.user_host = 0  
53 - status = 2  
54 - } else {  
55 - list.user_host = 1  
56 - status = 1  
57 - }  
58 - this.attentionInfo(id, status) 68 + var status = e.currentTarget.dataset.status
  69 + wx.setStorageSync('id', id)
  70 + wx.setStorageSync('status', status)
59 this.setData({ 71 this.setData({
60 - list: list 72 + mask_state: true,
  73 + // id: id,
  74 + // status: status
61 }) 75 })
62 }, 76 },
63 77
64 - //关注接口  
65 - attentionInfo(e) {  
66 - let that = this;  
67 - var id = e.currentTarget.dataset.id  
68 - var status = e.currentTarget.dataset.status 78 + cancleMask() {
  79 + this.setData({
  80 + mask_state: false
  81 + })
  82 + },
  83 + attentionInfo() {
  84 + var id = wx.getStorageSync('id')
  85 + var status = parseInt(wx.getStorageSync('status'))
  86 + var that = this
69 let url = '/home/index/host'; 87 let url = '/home/index/host';
70 let param = { 88 let param = {
71 - open_user_id: id,  
72 - status: status 89 + open_user_id:id,
  90 + status:status ,
73 } 91 }
74 let header = { 92 let header = {
75 'XX-Token': wx.getStorageSync('token'), 93 'XX-Token': wx.getStorageSync('token'),
@@ -77,18 +95,18 @@ Page({ @@ -77,18 +95,18 @@ Page({
77 } 95 }
78 app.post(url, param, header).then((res) => { 96 app.post(url, param, header).then((res) => {
79 if (res.data.code == 20000) { 97 if (res.data.code == 20000) {
80 - this.getData() 98 + that.getData()
81 } 99 }
82 }) 100 })
83 }, 101 },
84 102
85 -  
86 /** 103 /**
87 * 生命周期函数--监听页面加载 104 * 生命周期函数--监听页面加载
88 */ 105 */
89 onLoad: function(options) { 106 onLoad: function(options) {
90 this.setData({ 107 this.setData({
91 - status: options.status ? options.status : '' 108 + status: options.status ? options.status : '',
  109 + id: options.id ? options.id : 0
92 }) 110 })
93 this.getData() 111 this.getData()
94 if (options.status == 1) { 112 if (options.status == 1) {
1 <!--pages/index/fans/fans.wxml--> 1 <!--pages/index/fans/fans.wxml-->
2 <view class='content_box'> 2 <view class='content_box'>
3 - <view class='item_list' wx:for='{{list}}' wx:key bindtap='goUserInfo' data-id='{{item.id}}'> 3 + <view class='item_list' wx:for='{{list}}' wx:key catchtap='goUserInfo' data-id='{{item.id}}'>
4 <view class='list_left'> 4 <view class='list_left'>
5 <image class='head_img' src='{{item.avatar}}'></image> 5 <image class='head_img' src='{{item.avatar}}'></image>
6 <view> 6 <view>
@@ -10,7 +10,18 @@ @@ -10,7 +10,18 @@
10 </view> 10 </view>
11 </view> 11 </view>
12 </view> 12 </view>
13 - <view class="list_label list_active" bindtap='attentionInfo' data-id='{{item.id}}' data-status='1' wx:if='{{status==2}}'>添加关注</view>  
14 - <view class="list_label" bindtap='attentionInfo' data-id='{{item.id}}' data-status='2' wx:if='{{status==1}}'>取消关注</view> 13 + <view class="list_label list_active" catchtap='showMask' data-id='{{item.id}}' data-status='1' wx:if='{{status==2}}'>添加关注</view>
  14 + <view class="list_label" catchtap='showMask' data-id='{{item.id}}' data-status='2' wx:if='{{status==1}}'>取消关注</view>
  15 + </view>
  16 +</view>
  17 +
  18 +<view class='mask_box' wx:if='{{mask_state}}' catchtap='cancleMask'>
  19 + <view class='popup_box'>
  20 + <view class='popup_title'>提示</view>
  21 + <view>确认取消关注吗？</view>
  22 + <view class='popup_btn_box'>
  23 + <view class='popup_btn' catchtap='cancleMask'>取消</view>
  24 + <view class='popup_btn' bindtap='attentionInfo'>确定</view>
  25 + </view>
15 </view> 26 </view>
16 </view> 27 </view>
@@ -14,11 +14,11 @@ Page({ @@ -14,11 +14,11 @@ Page({
14 style_array: ['时尚', '学院', '欧美风'], 14 style_array: ['时尚', '学院', '欧美风'],
15 style_index: -1, 15 style_index: -1,
16 height_array: [ 16 height_array: [
17 - '150cm-155cm', '155cm-160cm', '160cm-165cm', '165cm-170cm', '170cm-175cm', '175cm-180cm', '180cm-185cm', '185cm-190cm', 17 + '150cm-153cm', '153cm-156cm', '156cm-159cm', '159cm-162cm', '162cm-165cm', '165cm-168cm', '168cm-171cm', '171cm-174cm', '174cm-177cm', '174cm-177cm', '177cm-180cm', '180cm-183cm', '183cm-186cm', '186cm-189cm', '192cm-195cm', '195cm-198cm',
18 ], 18 ],
19 height_index: -1, 19 height_index: -1,
20 weight_array: [ 20 weight_array: [
21 - '40kg-45kg', '45kg-50kg', '55kg-60kg', '60kg-65kg', '65kg-70kg', '70kg-75kg', '75kg-80kg', '85kg-90kg', '90kg-95kg', 21 + '45kg-50kg', '50kg-55kg', '55kg-60kg', '60kg-65kg', '65kg-70kg', '70kg-75kg', '75kg-80kg', '80kg-85kg', '85kg-90kg', '90kg-95kg', '95kg-100kg'
22 ], 22 ],
23 weight_index: -1, 23 weight_index: -1,
24 sex: '', 24 sex: '',
@@ -27,13 +27,16 @@ Page({ @@ -27,13 +27,16 @@ Page({
27 stature: '', 27 stature: '',
28 weight: '', 28 weight: '',
29 status: 0, 29 status: 0,
30 - list: [], 30 +
31 order: 1, 31 order: 1,
32 poster_list: [], 32 poster_list: [],
33 img_state: false, 33 img_state: false,
34 imgUrl: '', 34 imgUrl: '',
35 img_text: '', 35 img_text: '',
36 poster: '', 36 poster: '',
  37 + list: [],
  38 + list2: [],
  39 + last_page: '',
37 40
38 // https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1534766809331&di=012cc4ad15d457ffa55c6537503eb84a&imgtype=0&src=http%3A%2F%2Fpicture.5068.com%2Fallimg%2F121120%2F4-1211201G920.jpg 41 // https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1534766809331&di=012cc4ad15d457ffa55c6537503eb84a&imgtype=0&src=http%3A%2F%2Fpicture.5068.com%2Fallimg%2F121120%2F4-1211201G920.jpg
39 cardPath: '', 42 cardPath: '',
@@ -83,7 +86,7 @@ Page({ @@ -83,7 +86,7 @@ Page({
83 var list = this.data.list 86 var list = this.data.list
84 var imgs = list[mindex].img 87 var imgs = list[mindex].img
85 var current = e.currentTarget.dataset.src 88 var current = e.currentTarget.dataset.src
86 - console.log(imgs) 89 + // console.log(imgs)
87 this.setData({ 90 this.setData({
88 imgUrl: current, 91 imgUrl: current,
89 img_text: e.currentTarget.dataset.text, 92 img_text: e.currentTarget.dataset.text,
@@ -248,7 +251,7 @@ Page({ @@ -248,7 +251,7 @@ Page({
248 251
249 showPoster(e) { 252 showPoster(e) {
250 var id = e.currentTarget.dataset.id 253 var id = e.currentTarget.dataset.id
251 - var that=this 254 + var that = this
252 wx.hideTabBar({}) 255 wx.hideTabBar({})
253 wx.showToast({ 256 wx.showToast({
254 title: '加载中', 257 title: '加载中',
@@ -436,15 +439,29 @@ Page({ @@ -436,15 +439,29 @@ Page({
436 'XX-Device-Type': 'wxapp' 439 'XX-Device-Type': 'wxapp'
437 } 440 }
438 app.post(url, param, header).then((res) => { 441 app.post(url, param, header).then((res) => {
  442 + console.log('data', res)
439 if (res.data.code == 20000) { 443 if (res.data.code == 20000) {
440 - var list = res.data.data.list  
441 - for (var i = 0; i < list.length; i++) {  
442 - list[i].more_state = false  
443 - }  
444 - if (list != '') { 444 + var list = this.data.list
  445 + console.log(list, '33')
  446 + console.log(list.concat(res.data.data.list))
  447 + // list2.concat(res.data.data.list)
  448 + // var list = list2
  449 + // for (var i = 0; i < list.length; i++) {
  450 + // list[i].more_state = false
  451 + // }
  452 +
  453 +
  454 + if (res.data.data.list != '') {
  455 + console.log(that.data.list2)
445 that.setData({ 456 that.setData({
446 - list: list,  
447 - page: res.data.data.page, 457 + list: list.concat(res.data.data.list),
  458 + last_page: res.data.data.last_page,
  459 + })
  460 + console.log('list', that.data.list)
  461 + } else if (this.data.page > res.data.data.last_page) {
  462 + wx.showToast({
  463 + title: '没有更多数据了',
  464 + icon: 'none'
448 }) 465 })
449 } else { 466 } else {
450 wx.showToast({ 467 wx.showToast({
@@ -460,8 +477,6 @@ Page({ @@ -460,8 +477,6 @@ Page({
460 }).catch((errMsg) => {}) 477 }).catch((errMsg) => {})
461 }, 478 },
462 479
463 -  
464 -  
465 //画图 480 //画图
466 drawCanvas: function() { 481 drawCanvas: function() {
467 console.log(this.data.cardPath, 'aa') 482 console.log(this.data.cardPath, 'aa')
@@ -545,13 +560,9 @@ Page({ @@ -545,13 +560,9 @@ Page({
545 } 560 }
546 }, 561 },
547 562
548 -  
549 -  
550 -  
551 onLoad: function() { 563 onLoad: function() {
552 this.getData() 564 this.getData()
553 this.getStyle() 565 this.getStyle()
554 -  
555 var that = this; 566 var that = this;
556 wx: wx.getSystemInfo({ 567 wx: wx.getSystemInfo({
557 success: function(res) { 568 success: function(res) {
@@ -564,7 +575,20 @@ Page({ @@ -564,7 +575,20 @@ Page({
564 }) 575 })
565 that.drawCanvas(); 576 that.drawCanvas();
566 }, 577 },
  578 +
567 onShow() { 579 onShow() {
568 - this.getData() 580 + // this.getData()
  581 + },
  582 +
  583 + onReachBottom: function() {
  584 + const that = this;
  585 + var len = that.data.list.length
  586 + var last_page = this.data.last_page
  587 + var page = that.data.page
  588 + page++
  589 + that.setData({
  590 + page: page
  591 + })
  592 + that.getData();
569 }, 593 },
570 }) 594 })
@@ -36,7 +36,10 @@ @@ -36,7 +36,10 @@
36 <image src='{{items.img}}' catchtap='viewImg' data-src='{{items.img}}' data-text='{{items.text}}' data-mindex="{{mindex}}" data-sindex='{{sindex}}'></image> 36 <image src='{{items.img}}' catchtap='viewImg' data-src='{{items.img}}' data-text='{{items.text}}' data-mindex="{{mindex}}" data-sindex='{{sindex}}'></image>
37 </block> 37 </block>
38 </view> 38 </view>
39 - <view class='list_content'>{{item.text}}</view> 39 + <view class='list_content'>
  40 + <!-- {{item.text}} -->
  41 + <text wx:for='{{item.styles}}' wx:for-item='its' wx:key>{{its}}</text>
  42 + </view>
40 </view> 43 </view>
41 <view class='list_state_box'> 44 <view class='list_state_box'>
42 <view class='time'>{{item.open_time}}</view> 45 <view class='time'>{{item.open_time}}</view>
@@ -112,41 +115,41 @@ @@ -112,41 +115,41 @@
112 </view> 115 </view>
113 116
114 <!-- catchtap='cancleClassify' --> 117 <!-- catchtap='cancleClassify' -->
115 -<view class='mask_chassify_box' wx:if='{{classify_state}}'> 118 +<view class='mask_chassify_box' wx:if='{{classify_state}}' catchtap='cancleClassify'>
116 <view class='classif_popup_box'> 119 <view class='classif_popup_box'>
117 <view class='classify_content_box'> 120 <view class='classify_content_box'>
118 <view class='classify_item'> 121 <view class='classify_item'>
119 <view>性别</view> 122 <view>性别</view>
120 - <picker class='chassify_picker' range='{{sex_array}}' value='{{sex_index}}' bindchange='setSex'> 123 + <picker class='chassify_picker' range='{{sex_array}}' value='{{sex_index}}' bindchange='setSex' catchtap='stop'>
121 <input placeholder='请选择' value='{{sex}}' disabled='true'></input> 124 <input placeholder='请选择' value='{{sex}}' disabled='true'></input>
122 </picker> 125 </picker>
123 <text class='iconfont icon-fanhui'></text> 126 <text class='iconfont icon-fanhui'></text>
124 </view> 127 </view>
125 <view class='classify_item'> 128 <view class='classify_item'>
126 <view>风格</view> 129 <view>风格</view>
127 - <picker class='chassify_picker' range='{{style_array}}' value='{{style_index}}' range-key='name' bindchange='setStyle'> 130 + <picker class='chassify_picker' range='{{style_array}}' value='{{style_index}}' range-key='name' bindchange='setStyle' catchtap='stop'>
128 <input placeholder='请选择' value='{{style}}' disabled='true'></input> 131 <input placeholder='请选择' value='{{style}}' disabled='true'></input>
129 </picker> 132 </picker>
130 <text class='iconfont icon-fanhui'></text> 133 <text class='iconfont icon-fanhui'></text>
131 </view> 134 </view>
132 <view class='classify_item'> 135 <view class='classify_item'>
133 <view>身高</view> 136 <view>身高</view>
134 - <picker class='chassify_picker' range='{{height_array}}' value='{{height_index}}' bindchange='getHeight'> 137 + <picker class='chassify_picker' range='{{height_array}}' value='{{height_index}}' bindchange='getHeight' catchtap='stop'>
135 <input placeholder='请选择' disabled='true' value='{{stature}}'></input> 138 <input placeholder='请选择' disabled='true' value='{{stature}}'></input>
136 </picker> 139 </picker>
137 <text class='iconfont icon-fanhui'></text> 140 <text class='iconfont icon-fanhui'></text>
138 </view> 141 </view>
139 <view class='classify_item'> 142 <view class='classify_item'>
140 <view>体重</view> 143 <view>体重</view>
141 - <picker class='chassify_picker' range='{{weight_array}}' value='{{weight_index}}' bindchange='getWeight'> 144 + <picker class='chassify_picker' range='{{weight_array}}' value='{{weight_index}}' bindchange='getWeight' catchtap='stop'>
142 <input placeholder='请选择' disabled='true' value='{{weight}}'></input> 145 <input placeholder='请选择' disabled='true' value='{{weight}}'></input>
143 </picker> 146 </picker>
144 <text class='iconfont icon-fanhui'></text> 147 <text class='iconfont icon-fanhui'></text>
145 </view> 148 </view>
146 </view> 149 </view>
147 <view class='classify_btn_box'> 150 <view class='classify_btn_box'>
148 - <view class='classify_btn' bindtap='clearData'>重置</view>  
149 - <view class='classify_btn classify_active' bindtap='confirmData'>确认</view> 151 + <view class='classify_btn' catchtap='clearData'>重置</view>
  152 + <view class='classify_btn classify_active' catchtap='confirmData'>确认</view>
150 </view> 153 </view>
151 </view> 154 </view>
152 </view> 155 </view>
@@ -329,7 +329,9 @@ page { @@ -329,7 +329,9 @@ page {
329 color: #1a1a1a; 329 color: #1a1a1a;
330 margin-top: 10rpx; 330 margin-top: 10rpx;
331 } 331 }
332 - 332 +.list_content text{
  333 + margin-right: 10rpx;
  334 +}
333 .list_img_box { 335 .list_img_box {
334 display: flex; 336 display: flex;
335 flex-wrap: wrap; 337 flex-wrap: wrap;
@@ -586,7 +588,7 @@ page { @@ -586,7 +588,7 @@ page {
586 position: fixed; 588 position: fixed;
587 top: 90rpx; 589 top: 90rpx;
588 right: 0rpx; 590 right: 0rpx;
589 - z-index: 10; 591 + z-index:900;
590 } 592 }
591 593
592 .classify_item { 594 .classify_item {
@@ -10,7 +10,16 @@ Page({ @@ -10,7 +10,16 @@ Page({
10 page: 1, 10 page: 1,
11 list1: [], 11 list1: [],
12 list2: [], 12 list2: [],
  13 + },
  14 +
  15 + goCenter(e) {
  16 + var id = e.currentTarget.dataset.id
  17 + var look_type = e.currentTarget.dataset.look_type
  18 + var look = e.currentTarget.dataset.look
13 19
  20 + wx.navigateTo({
  21 + url: '/pages/my/userInfo/userInfo?id=' + id + '&look_type=' + look_type + '&look=' + look,
  22 + })
14 }, 23 },
15 24
16 readState(e) { 25 readState(e) {
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <block wx:if='{{status==1||status==2}}'> 8 <block wx:if='{{status==1||status==2}}'>
9 <view class='item_list' wx:for='{{list1.data}}' wx:key> 9 <view class='item_list' wx:for='{{list1.data}}' wx:key>
10 <view class='list_left'> 10 <view class='list_left'>
11 - <image class='head_img' src='{{item.avatar}}'></image> 11 + <image class='head_img' src='{{item.avatar}}' catchtap='goCenter' data-id='{{item.news_user_id}}' data-look_type='{{status}}' data-look="{{item.news_id}}"></image>
12 <view> 12 <view>
13 <view class=' user_name '>{{item.user_nickname}}</view> 13 <view class=' user_name '>{{item.user_nickname}}</view>
14 <view> 14 <view>
@@ -44,8 +44,8 @@ @@ -44,8 +44,8 @@
44 <text>{{item.user_nickname}}您好，您发布的{{title}}审核</text> 44 <text>{{item.user_nickname}}您好，您发布的{{title}}审核</text>
45 <text class='list_hint2'>未通过</text> 45 <text class='list_hint2'>未通过</text>
46 </view> 46 </view>
47 - <view>原因：发布内容有歧义</view>  
48 - <view>2018-11-22 14:00</view> 47 + <view>原因：{{item.status_text}}</view>
  48 + <view>{{item.status_time}}</view>
49 </view> 49 </view>
50 </view> 50 </view>
51 </view> 51 </view>
@@ -93,5 +93,5 @@ @@ -93,5 +93,5 @@
93 </textarea> 93 </textarea>
94 </view> 94 </view>
95 </view> 95 </view>
96 - <view class='bottom_btn2' bindtap='goCheck'>确定</view> 96 + <view class='bottom_btn2' bindtap='goCheck'>确定发布</view>
97 </view> 97 </view>
@@ -18,6 +18,25 @@ Page({ @@ -18,6 +18,25 @@ Page({
18 status: 1, 18 status: 1,
19 }, 19 },
20 20
  21 + complain(e) {
  22 + var id = e.currentTarget.dataset.id
  23 + var status = e.currentTarget.dataset.status
  24 + let url = '/home/index/updateFashion'
  25 + let params = {
  26 + list_id: id,
  27 + status: status
  28 + }
  29 + let header = {
  30 + "XX-Token": wx.getStorageSync('token'),
  31 + 'XX-Device-Type': 'wxapp'
  32 + }
  33 + app.post(url, params, header).then((res) => {
  34 + if (res.data.code == 20000) {
  35 + this.getData()
  36 + }
  37 + })
  38 + },
  39 +
21 cancleMask() { 40 cancleMask() {
22 this.setData({ 41 this.setData({
23 mask_state: false 42 mask_state: false
@@ -186,7 +205,7 @@ Page({ @@ -186,7 +205,7 @@ Page({
186 * 生命周期函数--监听页面加载 205 * 生命周期函数--监听页面加载
187 */ 206 */
188 onLoad: function(options) { 207 onLoad: function(options) {
189 - // this.getData() 208 + this.getData()
190 this.getData2() 209 this.getData2()
191 }, 210 },
192 211
@@ -202,6 +221,7 @@ Page({ @@ -202,6 +221,7 @@ Page({
202 */ 221 */
203 onShow: function() { 222 onShow: function() {
204 this.getData() 223 this.getData()
  224 + this.getData2()
205 }, 225 },
206 226
207 /** 227 /**
@@ -64,8 +64,8 @@ @@ -64,8 +64,8 @@
64 <view class='time'>{{item.open_time}}</view> 64 <view class='time'>{{item.open_time}}</view>
65 <view class='list_icon'> 65 <view class='list_icon'>
66 <view bindtap='likeCharge' data-index="{{index}}" data-id='{{item.list_id}}' data-status='2' wx:if='{{tab_current!=4&&tab_current!=3}}'> 66 <view bindtap='likeCharge' data-index="{{index}}" data-id='{{item.list_id}}' data-status='2' wx:if='{{tab_current!=4&&tab_current!=3}}'>
67 - <text class='iconfont icon-dianzan2 zan'></text>  
68 - <!-- <text class='iconfont icon-huida pinglun1' wx:else></text> --> 67 + <text class='iconfont icon-dianzan2 zan' wx:if='{{tab_current!=1}}'></text>
  68 + <text class='iconfont icon-huida pinglun1' wx:else></text>
69 <text class=''>{{item.support}}</text> 69 <text class=''>{{item.support}}</text>
70 </view> 70 </view>
71 <view bindtap='review' data-id='{{item.list_id}}' data-type='review'> 71 <view bindtap='review' data-id='{{item.list_id}}' data-type='review'>
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 <text class=''>{{item.collect}}</text> 78 <text class=''>{{item.collect}}</text>
79 </view> 79 </view>
80 <view class='more_box' wx:if='{{tab_current==1 || tab_current==4}}'> 80 <view class='more_box' wx:if='{{tab_current==1 || tab_current==4}}'>
81 - <text class='iconfont icon-gengduo' catchtap='showMore' data-index='{{index}}'></text> 81 + <text class='iconfont icon-gengduo'></text>
82 <block wx:if='{{state2}}'> 82 <block wx:if='{{state2}}'>
83 <view class='more_label_box more2' wx:if='{{item.more_state}}'> 83 <view class='more_label_box more2' wx:if='{{item.more_state}}'>
84 <view class='more_item' bindtap='showPoster'> 84 <view class='more_item' bindtap='showPoster'>
@@ -88,25 +88,25 @@ @@ -88,25 +88,25 @@
88 </block> 88 </block>
89 <block wx:else> 89 <block wx:else>
90 <view class='more_label_box' wx:if='{{item.more_state}}'> 90 <view class='more_label_box' wx:if='{{item.more_state}}'>
91 - <view class='more_item' bindtap='showPoster'> 91 + <view class='more_item' catchtap='complain' data-id='{{item.list_id}}' data-status='4'>
92 <text>删除</text> 92 <text>删除</text>
93 </view> 93 </view>
94 - <view class='more_line'></view>  
95 - <view class='more_item' catchtap='complain'> 94 + <!-- <view class='more_line'></view> -->
  95 + <view class='more_item' catchtap='complain' data-id='{{item.list_id}}' data-status='4'>
96 <text>仅自己可见</text> 96 <text>仅自己可见</text>
97 </view> 97 </view>
98 - <view class='more_line'></view>  
99 - <view class='more_item' catchtap='complain'> 98 + <!-- <view class='more_line'></view> -->
  99 + <view class='more_item' catchtap='complain' data-id='{{item.list_id}}' data-status='3'>
100 <text>粉丝可见</text> 100 <text>粉丝可见</text>
101 </view> 101 </view>
102 - <view class='more_line'></view>  
103 - <view class='more_item' catchtap='complain'> 102 + <!-- <view class='more_line'></view> -->
  103 + <view class='more_item' catchtap='complain' data-id='{{item.list_id}}' data-status='1'>
104 <text>全部</text> 104 <text>全部</text>
105 </view> 105 </view>
106 </view> 106 </view>
107 </block> 107 </block>
108 </view> 108 </view>
109 - <text class='iconfont icon-suo' wx:if='{{tab_current==1}}'></text> 109 + <text class='iconfont icon-suo' wx:if='{{tab_current==1}}' catchtap='showMore' data-index='{{index}}'></text>
110 </view> 110 </view>
111 </view> 111 </view>
112 </view> 112 </view>
@@ -412,13 +412,14 @@ page { @@ -412,13 +412,14 @@ page {
412 display: inline-block; 412 display: inline-block;
413 position: absolute; 413 position: absolute;
414 right: 0; 414 right: 0;
415 - bottom: -355rpx; 415 + bottom: -275rpx;
416 width: 250rpx; 416 width: 250rpx;
417 background: #fff; 417 background: #fff;
418 box-shadow: 0 8rpx 30rpx 0 #e5e5e5; 418 box-shadow: 0 8rpx 30rpx 0 #e5e5e5;
419 color: #000; 419 color: #000;
420 text-align: center; 420 text-align: center;
421 - padding: 30rpx 0; 421 + /* padding: 30rpx 0; */
  422 + overflow: hidden;
422 } 423 }
423 424
424 .more { 425 .more {
@@ -432,8 +433,10 @@ page { @@ -432,8 +433,10 @@ page {
432 } 433 }
433 434
434 .more_item { 435 .more_item {
435 - padding: 0 25rpx; 436 + width: 100%;
  437 + padding:15rpx 0;
436 text-align: center; 438 text-align: center;
  439 + border-bottom: 1rpx solid #ebebeb;
437 } 440 }
438 441
439 .more_line { 442 .more_line {
@@ -7,10 +7,56 @@ Page({ @@ -7,10 +7,56 @@ Page({
7 */ 7 */
8 data: { 8 data: {
9 id: '', 9 id: '',
10 - look: '', 10 + look: 0,
11 look_type: '', 11 look_type: '',
12 status: 1, 12 status: 1,
13 - page: 1 13 + page: 1,
  14 + list:[],
  15 + },
  16 + goList(e) {
  17 + var status = e.currentTarget.dataset.status
  18 + var id = this.data.id
  19 + wx.navigateTo({
  20 + url: '/pages/index/fans/fans?status=' + status+'&id='+id,
  21 + })
  22 + },
  23 + //点赞
  24 + likeCharge(e) {
  25 + console.log(e)
  26 + var id = e.currentTarget.dataset.id
  27 + var index = e.currentTarget.dataset.index
  28 + var list = this.data.list
  29 + var status = ''
  30 + if (list[index].my_support == 1) {
  31 + console.log(11)
  32 + list[index].my_support = 0
  33 + status = 2
  34 + } else {
  35 + console.log(22)
  36 + list[index].my_support = 1
  37 + status = 1
  38 + }
  39 + this.setData({
  40 + list: list
  41 + })
  42 + this.like(id, status)
  43 + },
  44 +
  45 + like(id, status) {
  46 + let url = '/home/index/support'
  47 + let params = {
  48 + list_id: id,
  49 + status: status
  50 + }
  51 + let header = {
  52 + "XX-Token": wx.getStorageSync('token'),
  53 + 'XX-Device-Type': 'wxapp'
  54 + }
  55 + app.post(url, params, header).then((res) => {
  56 + if (res.data.code == 20000) {
  57 + this.getData()
  58 + }
  59 + })
14 }, 60 },
15 61
16 getData() { 62 getData() {
@@ -132,7 +178,9 @@ Page({ @@ -132,7 +178,9 @@ Page({
132 */ 178 */
133 onLoad: function(options) { 179 onLoad: function(options) {
134 this.setData({ 180 this.setData({
135 - id: options.id ? options.id : '' 181 + id: options.id ? options.id : '',
  182 + look_type: options.look_type ? options.look_type : '',
  183 + look: options.look ? options.look : ''
136 }) 184 })
137 if (options.id != '' && options.id != undefined) { 185 if (options.id != '' && options.id != undefined) {
138 this.getData() 186 this.getData()
1 <view class='banner_box' bindtap='uoloadImg'> 1 <view class='banner_box' bindtap='uoloadImg'>
2 <view class='banner_info info1'> 2 <view class='banner_info info1'>
3 - <view class="list_label1 {{host==1?'list_active1':''}}" bindtap='attentionInfo' data-id='{{item.id}}'>{{host==1?'已关注':'添加关注'}}</view> 3 + <view class="list_label1 {{host==1?'list_active1':''}}" bindtap='attentionInfo'>{{host==1?'已关注':'添加关注'}}</view>
4 </view> 4 </view>
5 <view class='head_img'> 5 <view class='head_img'>
6 <image class='banner_img' src='{{avatar}}'></image> 6 <image class='banner_img' src='{{avatar}}'></image>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <text class='' style='color:#999;'>粉丝</text> 12 <text class='' style='color:#999;'>粉丝</text>
13 <text class='user_num'>{{fans_num}}</text> 13 <text class='user_num'>{{fans_num}}</text>
14 </view> 14 </view>
15 - <view bindtap='goList' data-status='1'> 15 + <view bindtap='goList' data-status='1' data-id='{{}}'>
16 <text class='' style='color:#999;'>关注</text> 16 <text class='' style='color:#999;'>关注</text>
17 <text class='user_num'>{{host_num}}</text> 17 <text class='user_num'>{{host_num}}</text>
18 </view> 18 </view>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <view class='time'>{{item.open_time}}</view> 46 <view class='time'>{{item.open_time}}</view>
47 <view class='list_icon'> 47 <view class='list_icon'>
48 <view bindtap='likeCharge' data-index="{{index}}" data-id='{{item.list_id}}' wx:if='{{status!=4}}'> 48 <view bindtap='likeCharge' data-index="{{index}}" data-id='{{item.list_id}}' wx:if='{{status!=4}}'>
49 - <text class='iconfont icon-dianzan2 zan' wx:if="{{item.user_support==1}}"></text> 49 + <text class='iconfont icon-dianzan2 zan' wx:if="{{item.my_support==1}}"></text>
50 <text class='iconfont icon-huida pinglun1' wx:else></text> 50 <text class='iconfont icon-huida pinglun1' wx:else></text>
51 <text class=''>{{item.support}}</text> 51 <text class=''>{{item.support}}</text>
52 </view> 52 </view>
@@ -59,36 +59,6 @@ @@ -59,36 +59,6 @@
59 <!-- <text class='iconfont icon-shoucang4 pinglun1' wx:else></text> --> 59 <!-- <text class='iconfont icon-shoucang4 pinglun1' wx:else></text> -->
60 <text class=''>{{item.collect}}</text> 60 <text class=''>{{item.collect}}</text>
61 </view> 61 </view>
62 - <view class='more_box' wx:if='{{status==1 || status==4}}'>  
63 - <text class='iconfont icon-gengduo' catchtap='showMore' data-index='{{index}}'></text>  
64 - <block wx:if='{{state2}}'>  
65 - <view class='more_label_box more2' wx:if='{{item.more_state}}'>  
66 - <view class='more_item' bindtap='showPoster'>  
67 - <text>删除</text>  
68 - </view>  
69 - </view>  
70 - </block>  
71 - <block wx:else>  
72 - <view class='more_label_box' wx:if='{{item.more_state}}'>  
73 - <view class='more_item' bindtap='showPoster'>  
74 - <text>删除</text>  
75 - </view>  
76 - <view class='more_line'></view>  
77 - <view class='more_item' catchtap='complain'>  
78 - <text>仅自己可见</text>  
79 - </view>  
80 - <view class='more_line'></view>  
81 - <view class='more_item' catchtap='complain'>  
82 - <text>粉丝可见</text>  
83 - </view>  
84 - <view class='more_line'></view>  
85 - <view class='more_item' catchtap='complain'>  
86 - <text>全部</text>  
87 - </view>  
88 - </view>  
89 - </block>  
90 - </view>  
91 - <text class='iconfont icon-suo' wx:if='{{status==1}}'></text>  
92 </view> 62 </view>
93 </view> 63 </view>
94 </view> 64 </view>
@@ -283,7 +283,9 @@ page { @@ -283,7 +283,9 @@ page {
283 font-size: 26rpx; 283 font-size: 26rpx;
284 color: #fff; 284 color: #fff;
285 } 285 }
286 - 286 +.zan{
  287 + color: #000;
  288 +}
287 .zan, .pinglun1 { 289 .zan, .pinglun1 {
288 font-size: 28rpx; 290 font-size: 28rpx;
289 margin-right: 10rpx; 291 margin-right: 10rpx;