倪静楠 / muying · 提交

转到一个项目

作者 倪静楠
提交 480731eb2bde5c18981bcc7e31c4ad44d85da612 1 个父辈 11cd61c5

8/26

内嵌 并排对比
正在显示 10 个修改的文件 包含 64 行增加 和 42 行删除
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 .goodsBtn { 128 .goodsBtn {
129 width: 180rpx; 129 width: 180rpx;
130 height: 68rpx; 130 height: 68rpx;
131 - background: linear-gradient(135deg, #ff814a, #ff9d66); 131 + background:#ff814a;
132 border-radius: 48rpx; 132 border-radius: 48rpx;
133 font-size: 28rpx; 133 font-size: 28rpx;
134 color: #fff; 134 color: #fff;
@@ -137,6 +137,7 @@ @@ -137,6 +137,7 @@
137 align-items: center; 137 align-items: center;
138 margin-right: 32rpx; 138 margin-right: 32rpx;
139 } 139 }
  140 +
140 .goodsBtn1 { 141 .goodsBtn1 {
141 background: #d5d5d5; 142 background: #d5d5d5;
142 } 143 }
@@ -185,3 +186,4 @@ @@ -185,3 +186,4 @@
185 color: #cdcecf; 186 color: #cdcecf;
186 font-size: 24rpx; 187 font-size: 24rpx;
187 } 188 }
  189 +
@@ -127,7 +127,7 @@ @@ -127,7 +127,7 @@
127 }) 127 })
128 }, 128 },
129 publish() { 129 publish() {
130 - if (this.wechat == null) { 130 + if (this.wechat == 'null ') {
131 uni.showToast({ 131 uni.showToast({
132 title: '请先设置微信号', 132 title: '请先设置微信号',
133 icon: 'none' 133 icon: 'none'
@@ -135,12 +135,12 @@ @@ -135,12 +135,12 @@
135 }, 135 },
136 //分享 136 //分享
137 onShareAppMessage: function(e) { 137 onShareAppMessage: function(e) {
138 - let title = '近邻交易，闲置不再闲置'  
139 - let imgUrls='../../static/image/shareImg.png' 138 + let title = '快来社区淘转闲置兑奖吧！'
  139 + // let imgUrls='../../static/image/shareImg.png'
140 return { 140 return {
141 title: title, 141 title: title,
142 path: "/pages/activity/pintu-detail?id=" + this.id+'&lat='+this.lat+'&lot='+this.lot+'&userId='+uni.getStorageSync('userInfo').id, 142 path: "/pages/activity/pintu-detail?id=" + this.id+'&lat='+this.lat+'&lot='+this.lot+'&userId='+uni.getStorageSync('userInfo').id,
143 - imageUrl:imgUrls 143 + imageUrl:''
144 } 144 }
145 }, 145 },
146 onShareTimeline() { 146 onShareTimeline() {
@@ -64,6 +64,7 @@ @@ -64,6 +64,7 @@
64 import request from "../../utils/request.js" 64 import request from "../../utils/request.js"
65 export default { 65 export default {
66 onLoad(options) { 66 onLoad(options) {
  67 + console.log(options,'optionsss')
67 this.id = options.id 68 this.id = options.id
68 this.index = options.index 69 this.index = options.index
69 70
@@ -129,7 +130,7 @@ @@ -129,7 +130,7 @@
129 }, 130 },
130 //发送 131 //发送
131 send() { 132 send() {
132 - if (this.wechat == null) { 133 + if (this.wechat == 'null ') {
133 uni.showToast({ 134 uni.showToast({
134 title: '请先设置微信号', 135 title: '请先设置微信号',
135 icon: 'none' 136 icon: 'none'
@@ -170,19 +171,19 @@ @@ -170,19 +171,19 @@
170 171
171 } 172 }
172 }, 173 },
173 - created() {  
174 - request.get('/api/push/erLei', {  
175 - lat2: uni.getStorageSync('lat'),  
176 - lng2: uni.getStorageSync('lot'),  
177 - sort2_id: 2,  
178 - p: priceType,  
179 - q: jvType  
180 - }).then(res => {  
181 - this.goodsList = res.data.info  
182 - }).catch(err => { 174 + // created() {
  175 + // request.get('/api/push/erLei', {
  176 + // lat2: uni.getStorageSync('lat'),
  177 + // lng2: uni.getStorageSync('lot'),
  178 + // sort2_id: 2,
  179 + // p: priceType,
  180 + // q: jvType
  181 + // }).then(res => {
  182 + // this.goodsList = res.data.info
  183 + // }).catch(err => {
183 184
184 - })  
185 - } 185 + // })
  186 + // }
186 } 187 }
187 </script> 188 </script>
188 189
@@ -190,7 +190,11 @@ @@ -190,7 +190,11 @@
190 //个人资料 190 //个人资料
191 getUserInfo() { 191 getUserInfo() {
192 request.get('/api/personal/chaKan', {}).then(res => { 192 request.get('/api/personal/chaKan', {}).then(res => {
193 - this.wechat = res.data.info[0].wechat_id 193 + console.log(res)
  194 + this.wechat = res.data.info[0].wechat_id?res.data.info[0].wechat_id:'';
  195 + console.log(this.wechat,'。。。。’')
  196 + console.log(typeof(this.wechat))
  197 + console.log(!this.wechat && typeof(this.wechat)!='undefined' && this.wechat!=0)
194 }).catch(err => { 198 }).catch(err => {
195 199
196 }) 200 })
@@ -199,11 +203,13 @@ @@ -199,11 +203,13 @@
199 goUser(id) { 203 goUser(id) {
200 uni.navigateTo({ 204 uni.navigateTo({
201 url: '/pages/index/user-page?id=' + id 205 url: '/pages/index/user-page?id=' + id
202 - }) 206 + })
203 }, 207 },
204 //交换微信号 208 //交换微信号
205 allpyWechat() { 209 allpyWechat() {
206 - if (this.wechat == '') { 210 + console.log(this.wechat,'微信号微信号')
  211 + console.log(this.wechat+'1')
  212 + if (this.wechat == 'null ') {
207 uni.showToast({ 213 uni.showToast({
208 title: '请设置微信号', 214 title: '请设置微信号',
209 icon: 'none' 215 icon: 'none'
@@ -479,7 +479,6 @@ @@ -479,7 +479,6 @@
479 content: '确定保存到相册吗', 479 content: '确定保存到相册吗',
480 success: function(res) { 480 success: function(res) {
481 if (res.confirm) { 481 if (res.confirm) {
482 -  
483 uni.downloadFile({ 482 uni.downloadFile({
484 url: _self.haibaoPic, 483 url: _self.haibaoPic,
485 success: (res) => { 484 success: (res) => {
@@ -503,8 +502,6 @@ @@ -503,8 +502,6 @@
503 } 502 }
504 } 503 }
505 }) 504 })
506 -  
507 -  
508 } else if (res.cancel) { 505 } else if (res.cancel) {
509 506
510 } 507 }
@@ -713,24 +710,25 @@ @@ -713,24 +710,25 @@
713 } else if (res.cancel) { 710 } else if (res.cancel) {
714 if (that.id) { 711 if (that.id) {
715 uni.navigateTo({ 712 uni.navigateTo({
716 - url: "/pages/index/all-message?id=" + that.id+'&index=0' 713 + url: "/pages/index/all-message?id=" + that.id + '&index=0'
717 }) 714 })
718 } else { 715 } else {
719 uni.navigateTo({ 716 uni.navigateTo({
720 - url: "/pages/index/all-message?id=" + that.goods_id+'&index=1' 717 + url: "/pages/index/all-message?id=" + that.goods_id +
  718 + '&index=1'
721 }) 719 })
722 } 720 }
723 } 721 }
724 } 722 }
725 }) 723 })
726 } else { 724 } else {
727 - if (that.id) { 725 + if (that.id == undefined || that.id == 'undefined') {
728 uni.navigateTo({ 726 uni.navigateTo({
729 - url: "/pages/index/all-message?id=" + that.id+'&index=0' 727 + url: "/pages/index/all-message?id=" + that.goods_id + '&index=1'
730 }) 728 })
731 } else { 729 } else {
732 uni.navigateTo({ 730 uni.navigateTo({
733 - url: "/pages/index/all-message?id=" + that.goods_id+'&index=1' 731 + url: "/pages/index/all-message?id=" + that.id + '&index=0'
734 }) 732 })
735 } 733 }
736 } 734 }
@@ -740,13 +738,21 @@ @@ -740,13 +738,21 @@
740 }, 738 },
741 messageClick() { 739 messageClick() {
742 if (this.token) { 740 if (this.token) {
  741 + let goodsId = null
  742 + if (this.id == undefined || this.id == 'undefined') {
  743 + goodsId = this.goods_id
  744 + console.log(goodsId,'idddddddd11111111')
  745 + } else {
  746 + goodsId = this.id
  747 + console.log(goodsId,'idddddddd22222222')
  748 + }
  749 + console.log(goodsId,'idddddddd')
743 uni.navigateTo({ 750 uni.navigateTo({
744 - url: "/pages/index/all-message?id=" + this.goods_id 751 + url: "/pages/index/all-message?id=" + goodsId
745 }) 752 })
746 } else { 753 } else {
747 this.login() 754 this.login()
748 } 755 }
749 -  
750 }, 756 },
751 messageLists() { 757 messageLists() {
752 console.log(this.id, this.goods_id, 'idddd') 758 console.log(this.id, this.goods_id, 'idddd')
@@ -755,7 +761,7 @@ @@ -755,7 +761,7 @@
755 request.get('/api/msg/allMsg', { 761 request.get('/api/msg/allMsg', {
756 // goods_id: this.id== || this.goods_id 762 // goods_id: this.id== || this.goods_id
757 goods_id: this.id == undefined || this.id == 'undefined' ? this.goods_id : this.id, 763 goods_id: this.id == undefined || this.id == 'undefined' ? this.goods_id : this.id,
758 - is_good:this.id == undefined || this.id == 'undefined' ?1 :0, 764 + is_good: this.id == undefined || this.id == 'undefined' ? 1 : 0,
759 }).then(res => { 765 }).then(res => {
760 console.log(res.data.info, 'ressss') 766 console.log(res.data.info, 'ressss')
761 this.messageList = res.data.info 767 this.messageList = res.data.info
1 <template> 1 <template>
2 <view class="container"> 2 <view class="container">
3 <!-- 操作演示start --> 3 <!-- 操作演示start -->
4 - <view class="demoBox" v-if="demo"> 4 + <view class="demoBox" v-if="false">
5 <view class=""> 5 <view class="">
6 <image src="http://muying.qiniu.broing.cn/uploads/20210621/a374e24f9e49e985dd0d6bdb09ee77c8.png" mode="" 6 <image src="http://muying.qiniu.broing.cn/uploads/20210621/a374e24f9e49e985dd0d6bdb09ee77c8.png" mode=""
7 class="img" mode="widthFix" v-if="imgIndex==1"></image> 7 class="img" mode="widthFix" v-if="imgIndex==1"></image>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </view> 32 </view>
33 </view> 33 </view>
34 <!-- 操作演示end --> 34 <!-- 操作演示end -->
35 - <view class="" v-if="!demo"> 35 + <view class="">
36 <image :src="IndexImg" style="width: 100%;display: none;" mode=""></image> 36 <image :src="IndexImg" style="width: 100%;display: none;" mode=""></image>
37 <view class="" 37 <view class=""
38 style="position: fixed;top: 0;left: 0;height:176rpx;width: 100%;z-index: 99999;overflow: hidden;background-color: #fff;"> 38 style="position: fixed;top: 0;left: 0;height:176rpx;width: 100%;z-index: 99999;overflow: hidden;background-color: #fff;">
@@ -1128,10 +1128,6 @@ @@ -1128,10 +1128,6 @@
1128 .demoBox { 1128 .demoBox {
1129 width: 100%; 1129 width: 100%;
1130 height: 100%; 1130 height: 100%;
1131 - /* overflow: hidden; */  
1132 - /* display: flex;  
1133 - align-items: flex-end;  
1134 - margin-bottom: -40rpx; */  
1135 } 1131 }
1136 1132
1137 .img { 1133 .img {
@@ -36,7 +36,10 @@ @@ -36,7 +36,10 @@
36 <image src="/static/image/Frame_9@2x.png" mode=""></image> 36 <image src="/static/image/Frame_9@2x.png" mode=""></image>
37 <text class="goodsJFs">{{item.num}}积分</text> 37 <text class="goodsJFs">{{item.num}}积分</text>
38 </view> 38 </view>
39 - <view class="goodsBtn" @click="apply(item.id)"> 39 + <view class="goodsBtn" @click="apply(item.id)" v-if="item.number>0">
  40 + 立即兑换
  41 + </view>
  42 + <view class="goodsBtn goodsBtn1" @click="noApply" v-else >
40 立即兑换 43 立即兑换
41 </view> 44 </view>
42 </view> 45 </view>
@@ -112,7 +115,12 @@ @@ -112,7 +115,12 @@
112 url: "/pages/activity/exchange-detail?id="+id 115 url: "/pages/activity/exchange-detail?id="+id
113 }); 116 });
114 }, 117 },
115 - 118 + noApply(){
  119 + uni.showToast({
  120 + title:'暂无库存',
  121 + icon:'none'
  122 + })
  123 + },
116 //跳转发布需求 124 //跳转发布需求
117 OnMaiProject() { 125 OnMaiProject() {
118 uni.navigateTo({ 126 uni.navigateTo({
@@ -244,4 +252,7 @@ @@ -244,4 +252,7 @@
244 left: 30rpx; 252 left: 30rpx;
245 top: 22px; 253 top: 22px;
246 } 254 }
  255 + .nogoodsBtn{
  256 + background-color: #d9d9d9 !important;
  257 + }
247 </style> 258 </style>
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
109 }) 109 })
110 }, 110 },
111 send() { 111 send() {
112 - if (this.wechat == null) { 112 + if (this.wechat == 'null ') {
113 uni.showToast({ 113 uni.showToast({
114 title: '请先设置微信号', 114 title: '请先设置微信号',
115 icon: 'none' 115 icon: 'none'
@@ -359,7 +359,7 @@ @@ -359,7 +359,7 @@
359 title: '请选择新旧程度', 359 title: '请选择新旧程度',
360 icon: 'none' 360 icon: 'none'
361 }) 361 })
362 - } else if (this.wechat == null) { 362 + } else if (this.wechat == 'null ') {
363 uni.showToast({ 363 uni.showToast({
364 title: '请先设置微信号', 364 title: '请先设置微信号',
365 icon: 'none' 365 icon: 'none'