倪静楠 / muying · 提交

转到一个项目

作者 倪静楠
提交 886be5efcf83a793ead401fe00baca353a31dd68 1 个父辈 c0e0d1c2

6/24

内嵌 并排对比
正在显示 25 个修改的文件 包含 1042 行增加 和 603 行删除
@@ -38,10 +38,12 @@ @@ -38,10 +38,12 @@
38 }, 38 },
39 onShow: function() { 39 onShow: function() {
40 console.log('App Show'); 40 console.log('App Show');
  41 +
41 }, 42 },
42 onHide: function() { 43 onHide: function() {
43 console.log('App Hide', ' 退出’'); 44 console.log('App Hide', ' 退出’');
44 uni.setStorageSync('changeAddessShow', true) 45 uni.setStorageSync('changeAddessShow', true)
  46 +
45 }, 47 },
46 }; 48 };
47 </script> 49 </script>
@@ -349,6 +349,9 @@ @@ -349,6 +349,9 @@
349 align-items: center; 349 align-items: center;
350 justify-content: center; 350 justify-content: center;
351 border-radius: 16rpx 16rpx 0rpx 0rpx; 351 border-radius: 16rpx 16rpx 0rpx 0rpx;
  352 + display: flex;
  353 + align-items: center;
  354 + justify-content: center;
352 } 355 }
353 356
354 .goodsPic image { 357 .goodsPic image {
@@ -376,7 +379,14 @@ @@ -376,7 +379,14 @@
376 box-sizing: border-box; 379 box-sizing: border-box;
377 font-weight: 600; 380 font-weight: 600;
378 } 381 }
379 - 382 +.goodsPrices {
  383 + margin-top: 18rpx;
  384 + font-size: 32rpx;
  385 + color: #fff !important;
  386 + padding: 0 18rpx;
  387 + box-sizing: border-box;
  388 + font-weight: 600;
  389 +}
380 .userInfo { 390 .userInfo {
381 margin-top: 18rpx; 391 margin-top: 18rpx;
382 display: flex; 392 display: flex;
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 129
130 .meBot { 130 .meBot {
131 width: 686rpx; 131 width: 686rpx;
132 - height: 438rpx; 132 + /* height: 438rpx; */
133 background-color: #FFFFFF; 133 background-color: #FFFFFF;
134 /* margin-bottom:20rpx; */ 134 /* margin-bottom:20rpx; */
135 /* margin: 0 32rpx; */ 135 /* margin: 0 32rpx; */
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
51 }) 51 })
52 }, 52 },
53 cancelAttend(id) { 53 cancelAttend(id) {
  54 + let that=this
54 uni.showModal({ 55 uni.showModal({
55 title: '提示', 56 title: '提示',
56 content: '确定不再关注?', 57 content: '确定不再关注?',
@@ -59,7 +60,7 @@ @@ -59,7 +60,7 @@
59 request.get('/api/follow/addGuan', { 60 request.get('/api/follow/addGuan', {
60 guan_id: id 61 guan_id: id
61 }).then(res => { 62 }).then(res => {
62 - this.listData() 63 + that.listData()
63 }).catch(err => {}) 64 }).catch(err => {})
64 } 65 }
65 } 66 }
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <view class="issueBottom" v-if="index == 0"> 11 <view class="issueBottom" v-if="index == 0">
12 <view class="issueBottomNav" v-for="(item,index) in dataList" :key="index" @click="GoGoodDetail(item.goods.goods_id)"> 12 <view class="issueBottomNav" v-for="(item,index) in dataList" :key="index" @click="GoGoodDetail(item.goods.goods_id)">
13 <view class="issueBottomImg"> 13 <view class="issueBottomImg">
14 - <image :src="item.goods.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode=""></image> 14 + <image :src="item.goods.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode="aspectFill"></image>
15 </view> 15 </view>
16 <view class="issueBottomRight"> 16 <view class="issueBottomRight">
17 <view class="issueBottomRightText"> 17 <view class="issueBottomRightText">
@@ -32,9 +32,9 @@ @@ -32,9 +32,9 @@
32 </view> 32 </view>
33 </view> 33 </view>
34 <view class="issueBottom" v-if="index == 1"> 34 <view class="issueBottom" v-if="index == 1">
35 - <view class="issueBottomNav" v-for="(item,index) in dataList" :key="index" @click="GoGoodDetail(item.need.id)"> 35 + <view class="issueBottomNav" v-for="(item,index) in dataList" :key="index" @click="GoGoodDetailss(item.need.id)">
36 <view class="issueBottomImg"> 36 <view class="issueBottomImg">
37 - <image :src="item.need.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode=""></image> 37 + <image :src="item.need.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode="aspectFill"></image>
38 </view> 38 </view>
39 <view class="issueBottomRight"> 39 <view class="issueBottomRight">
40 <view class="issueBottomRightText"> 40 <view class="issueBottomRightText">
@@ -150,13 +150,16 @@ @@ -150,13 +150,16 @@
150 request.get('/api/collect/delNeed', { 150 request.get('/api/collect/delNeed', {
151 need_id: id 151 need_id: id
152 }).then(res => { 152 }).then(res => {
153 - that.dataList=that.dataList.splice(index,1)  
154 - that.need() 153 + if(res.code==1){
  154 + uni.showToast({
  155 + title:'删除成功'
  156 + })
  157 + that.need()
  158 + }
  159 +
155 }).catch(err => { 160 }).catch(err => {
156 161
157 }) 162 })
158 - that.dataList=that.dataList.splice(index,1)  
159 - that.need()  
160 } 163 }
161 164
162 } 165 }
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class="issueBottomNav" v-for="(item,index) in dataList" :key="index" 12 <view class="issueBottomNav" v-for="(item,index) in dataList" :key="index"
13 @click="goGoodsDetail(item.goods_id)"> 13 @click="goGoodsDetail(item.goods_id)">
14 <view class="issueBottomImg"> 14 <view class="issueBottomImg">
15 - <image :src="item.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode=""> 15 + <image :src="item.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode="aspectFill">
16 </image> 16 </image>
17 </view> 17 </view>
18 <view class="issueBottomRight"> 18 <view class="issueBottomRight">
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <view class="issueBottom" v-if="index == 1"> 36 <view class="issueBottom" v-if="index == 1">
37 <view class="issueBottomNav" v-for="(item,index) in dataList1" :key="index" @click="goNeedsDetail(item.id)"> 37 <view class="issueBottomNav" v-for="(item,index) in dataList1" :key="index" @click="goNeedsDetail(item.id)">
38 <view class="issueBottomImg"> 38 <view class="issueBottomImg">
39 - <image :src="item.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode=""> 39 + <image :src="item.images[0]" style="width: 200rpx;height: 200rpx;border-radius: 16rpx;" mode="aspectFill">
40 </image> 40 </image>
41 </view> 41 </view>
42 <view class="issueBottomRight"> 42 <view class="issueBottomRight">
@@ -144,7 +144,6 @@ @@ -144,7 +144,6 @@
144 goods_id: id 144 goods_id: id
145 }).then(res => { 145 }).then(res => {
146 if (res.code == 1) { 146 if (res.code == 1) {
147 - that.dataList.splice(index, 1)  
148 that.listData() 147 that.listData()
149 } 148 }
150 }).catch(err => { 149 }).catch(err => {
@@ -165,7 +164,6 @@ @@ -165,7 +164,6 @@
165 request.get('/api/personal/delNeed', { 164 request.get('/api/personal/delNeed', {
166 id: id 165 id: id
167 }).then(res => { 166 }).then(res => {
168 - that.dataList.splice(index, 1)  
169 that.listData1() 167 that.listData1()
170 }).catch(err => { 168 }).catch(err => {
171 169
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 </view> 131 </view>
132 <view class="meBotontt" @click="userDeal"> 132 <view class="meBotontt" @click="userDeal">
133 <view class="meBotontPic"> 133 <view class="meBotontPic">
134 - <image src="../../../static/image/kefu_icon_1@2x.png" 134 + <image src="../../../static/image/Document@2x.png"
135 style="width: 32rpx;height: 32rpx;margin-right: 14rpx;" mode=""></image> 135 style="width: 32rpx;height: 32rpx;margin-right: 14rpx;" mode=""></image>
136 </view> 136 </view>
137 <view class="meBotontText "> 137 <view class="meBotontText ">
@@ -155,19 +155,6 @@ @@ -155,19 +155,6 @@
155 mode=""></image> 155 mode=""></image>
156 </view> 156 </view>
157 </view> 157 </view>
158 - <view class="meBotontt kefuBorder" @click="onSetWechat">  
159 - <view class="meBotontPic">  
160 - <image src="../../../static/image/kefu_icon_1@2x.png"  
161 - style="width: 32rpx;height: 32rpx;margin-right: 14rpx;" mode=""></image>  
162 - </view>  
163 - <view class="meBotontText ">  
164 - <text class="meBotText">设置微信号</text>  
165 - </view>  
166 - <view class="meBotontImg">  
167 - <image src="../../../static/image/gengduo_icon_5@2x.png" style="width: 32rpx;height: 32rpx;"  
168 - mode=""></image>  
169 - </view>  
170 - </view>  
171 </view> 158 </view>
172 </view> 159 </view>
173 <view class="meFa"> 160 <view class="meFa">
@@ -410,16 +397,6 @@ @@ -410,16 +397,6 @@
410 397
411 }) 398 })
412 }, 399 },
413 - //设置微信号  
414 - onSetWechat() {  
415 - if (this.token) {  
416 - uni.navigateTo({  
417 - url: '/myPackage/pages/me/set-wechat'  
418 - })  
419 - } else {  
420 - this.login()  
421 - }  
422 - },  
423 //积分 400 //积分
424 jifens() { 401 jifens() {
425 request.get('/api/personal/jifen', {}).then(res => { 402 request.get('/api/personal/jifen', {}).then(res => {
1 <template> 1 <template>
2 <view class="perCon"> 2 <view class="perCon">
3 - <view class="perTop" @click="uploadImg"> 3 + <view class="perTop" @click="uploadImg">
4 <view class="petTopText"> 4 <view class="petTopText">
5 <text class="petTx">头像</text> 5 <text class="petTx">头像</text>
6 </view> 6 </view>
7 <view class="petTopImg"> 7 <view class="petTopImg">
8 <image :src="userData.avatar" v-if="fileList.length==0"></image> 8 <image :src="userData.avatar" v-if="fileList.length==0"></image>
9 - <image :src="fileList[fileList.length-1]" mode="" v-if="fileList.length!==0" style="border-radius: 50%;"></image> 9 + <image :src="fileList[fileList.length-1]" mode="" v-if="fileList.length!==0"
  10 + style="border-radius: 50%;"></image>
10 </view> 11 </view>
11 <view class="petTopPic"> 12 <view class="petTopPic">
12 <image src="../../static/image/gengduo_icon_5@2x.png"></image> 13 <image src="../../static/image/gengduo_icon_5@2x.png"></image>
13 </view> 14 </view>
14 </view> 15 </view>
15 - <view class="perTop" @click="onUserName"> 16 + <view class="perTop" @click="onUserName">
16 <view class="petTopText"> 17 <view class="petTopText">
17 <text class="petTx">昵称</text> 18 <text class="petTx">昵称</text>
18 </view> 19 </view>
@@ -24,7 +25,7 @@ @@ -24,7 +25,7 @@
24 <image src="../../static/image/gengduo_icon_5@2x.png"></image> 25 <image src="../../static/image/gengduo_icon_5@2x.png"></image>
25 </view> 26 </view>
26 </view> 27 </view>
27 - <view class="perTop" @click="onUserInfo"> 28 + <view class="perTop" @click="onUserInfo">
28 <view class="petTopText"> 29 <view class="petTopText">
29 <text class="petTx">简介</text> 30 <text class="petTx">简介</text>
30 </view> 31 </view>
@@ -36,15 +37,25 @@ @@ -36,15 +37,25 @@
36 <image src="../../static/image/gengduo_icon_5@2x.png"></image> 37 <image src="../../static/image/gengduo_icon_5@2x.png"></image>
37 </view> 38 </view>
38 </view> 39 </view>
39 - <view class="perTop" @click="onUserPhone"> 40 + <view class="perTop" @click="onUserPhone">
40 <view class="petTopText"> 41 <view class="petTopText">
41 <text class="petTx">手机号</text> 42 <text class="petTx">手机号</text>
42 </view> 43 </view>
43 <view class="petTopImg"> 44 <view class="petTopImg">
44 <text class="petTopUserName" v-if="inputPhone==null">{{userData.mobile}}</text> 45 <text class="petTopUserName" v-if="inputPhone==null">{{userData.mobile}}</text>
45 <text class="petTopUserName" v-if="inputPhone!=null">{{inputPhone}}</text> 46 <text class="petTopUserName" v-if="inputPhone!=null">{{inputPhone}}</text>
46 - <!-- <text class="petTopUserName" >{{inputInfo}}</text> -->  
47 - <!-- <text class="petTopUserName" v-if="inputPhone!=null">{{mobile}}</text> --> 47 + </view>
  48 + <view class="petTopPic">
  49 + <image src="../../static/image/gengduo_icon_5@2x.png"></image>
  50 + </view>
  51 + </view>
  52 + <view class="perTop" @click="onUserWechat">
  53 + <view class="petTopText">
  54 + <text class="petTx">微信号</text>
  55 + </view>
  56 + <view class="petTopImg">
  57 + <text class="petTopUserName" v-if="inputWechat==null">{{userData.wechat_id}}</text>
  58 + <text class="petTopUserName" v-if="inputWechat!=null">{{inputWechat}}</text>
48 </view> 59 </view>
49 <view class="petTopPic"> 60 <view class="petTopPic">
50 <image src="../../static/image/gengduo_icon_5@2x.png"></image> 61 <image src="../../static/image/gengduo_icon_5@2x.png"></image>
@@ -69,7 +80,8 @@ @@ -69,7 +80,8 @@
69 <text class="setName">设置昵称</text> 80 <text class="setName">设置昵称</text>
70 </view> 81 </view>
71 <view class="HiddenInput"> 82 <view class="HiddenInput">
72 - <input class="InputName" type="text" value="" placeholder="请输入" v-model="inputName" @input="bindInput"/> 83 + <input class="InputName" type="text" value="" placeholder="请输入" v-model="inputName"
  84 + @input="bindInput" />
73 </view> 85 </view>
74 <view class="HiddenOkQu"> 86 <view class="HiddenOkQu">
75 <view class="HiddenCancel" @click="onCancel "> 87 <view class="HiddenCancel" @click="onCancel ">
@@ -87,7 +99,8 @@ @@ -87,7 +99,8 @@
87 <text class="setName">设置简介</text> 99 <text class="setName">设置简介</text>
88 </view> 100 </view>
89 <view class="HiddenInput"> 101 <view class="HiddenInput">
90 - <input class="InputName" type="text" value="inputInfo" placeholder="请输入" v-model="inputInfo" @input="bindInputinfo"/> 102 + <input class="InputName" type="text" value="inputInfo" placeholder="请输入" v-model="inputInfo"
  103 + @input="bindInputinfo" />
91 </view> 104 </view>
92 <view class="HiddenOkQu"> 105 <view class="HiddenOkQu">
93 <view class="HiddenCancel" @click="onCancel "> 106 <view class="HiddenCancel" @click="onCancel ">
@@ -105,7 +118,8 @@ @@ -105,7 +118,8 @@
105 <text class="setName">设置手机号</text> 118 <text class="setName">设置手机号</text>
106 </view> 119 </view>
107 <view class="HiddenInput"> 120 <view class="HiddenInput">
108 - <input class="InputName" type="text" value="" placeholder="请输入" v-model="inputPhone" @input="bindInputPhone"/> 121 + <input class="InputName" type="text" value="" placeholder="请输入" v-model="inputPhone"
  122 + @input="bindInputPhone" />
109 </view> 123 </view>
110 <view class="HiddenOkQu"> 124 <view class="HiddenOkQu">
111 <view class="HiddenCancel" @click="onCancel"> 125 <view class="HiddenCancel" @click="onCancel">
@@ -117,11 +131,30 @@ @@ -117,11 +131,30 @@
117 </view> 131 </view>
118 </view> 132 </view>
119 </view> 133 </view>
120 - <view class="saveBtn" @click="confirm">  
121 - <view class="saveText">  
122 - 保存  
123 - </view>  
124 - </view> 134 + <view class="zhezhao" v-if="isShowWechat">
  135 + <view class="Hidden">
  136 + <view class="HiddenText">
  137 + <text class="setName">设置微信号</text>
  138 + </view>
  139 + <view class="HiddenInput">
  140 + <input class="InputName" type="text" value="" placeholder="请输入" v-model="inputWechat"
  141 + @input="bindInputWechat" />
  142 + </view>
  143 + <view class="HiddenOkQu">
  144 + <view class="HiddenCancel" @click="onCancel">
  145 + <text class="cancel">取消</text>
  146 + </view>
  147 + <view class="HiddenSave" @click="onSave">
  148 + <text class="save">保存</text>
  149 + </view>
  150 + </view>
  151 + </view>
  152 + </view>
  153 + <view class="saveBtn" @click="confirm">
  154 + <view class="saveText">
  155 + 保存
  156 + </view>
  157 + </view>
125 </view> 158 </view>
126 </template> 159 </template>
127 160
@@ -132,15 +165,17 @@ @@ -132,15 +165,17 @@
132 data() { 165 data() {
133 return { 166 return {
134 isShow: false, 167 isShow: false,
135 - isShowInfo:false,  
136 - isShowPhone:false,  
137 - userData:'',  
138 - inputName:null,  
139 - inputInfo:null,  
140 - inputPhone:null,  
141 - fileList:[],  
142 - urlImg:[],  
143 - ajxtrue:false, //手机号 168 + isShowInfo: false,
  169 + isShowPhone: false,
  170 + isShowWechat: false,
  171 + userData: '',
  172 + inputName: null,
  173 + inputInfo: null,
  174 + inputPhone: null,
  175 + inputWechat: null,
  176 + fileList: [],
  177 + urlImg: [],
  178 + ajxtrue: false, //手机号
144 } 179 }
145 }, 180 },
146 created() { 181 created() {
@@ -148,79 +183,87 @@ @@ -148,79 +183,87 @@
148 }, 183 },
149 methods: { 184 methods: {
150 //个人资料 185 //个人资料
151 - userInfo(){  
152 - request.get('/api/personal/chaKan',{  
153 - user_id:uni.getStorageSync('userInfo').id  
154 - }).then(res=>{  
155 - this.userData=res.data.info[0]  
156 - this.inputName=res.data.info[0].nickname  
157 - this.inputInfo=res.data.info[0].content  
158 - this.inputPhone=res.data.info[0].mobile  
159 - }).catch(err=>{  
160 - 186 + userInfo() {
  187 + request.get('/api/personal/chaKan', {
  188 + user_id: uni.getStorageSync('userInfo').id
  189 + }).then(res => {
  190 + this.userData = res.data.info[0]
  191 + this.inputName = res.data.info[0].nickname
  192 + this.inputInfo = res.data.info[0].content
  193 + this.inputPhone = res.data.info[0].mobile
  194 + this.inputWechat=res.data.info[0].wechat_id
  195 + console.log(res, 'res个人资料')
  196 + }).catch(err => {
  197 +
161 }) 198 })
162 }, 199 },
163 //点击头像 200 //点击头像
164 - uploadImg(){  
165 - let that =this 201 + uploadImg() {
  202 + let that = this
166 uni.chooseImage({ 203 uni.chooseImage({
167 - success: (chooseImageRes) => {  
168 - const tempFilePaths = chooseImageRes.tempFilePaths;  
169 - const uploadTask = uni.uploadFile({  
170 - url: 'https://ketao.shequtaoapp.com/api/common/upload',  
171 - filePath: tempFilePaths[0],  
172 - name: 'file',  
173 - formData: {  
174 - 'user': 'test'  
175 - },  
176 - header: {  
177 - 'token': uni.getStorageSync('token') || ''  
178 - },  
179 - success: (uploadFileRes) => {  
180 - let uploadList =JSON.parse(uploadFileRes.data).data  
181 - that.fileList.push(uploadList.url)  
182 - that.urlImg.push(uploadList.save_path)  
183 - }  
184 - });  
185 - }  
186 - }); 204 + success: (chooseImageRes) => {
  205 + const tempFilePaths = chooseImageRes.tempFilePaths;
  206 + const uploadTask = uni.uploadFile({
  207 + url: 'https://ketao.shequtaoapp.com/api/common/upload',
  208 + filePath: tempFilePaths[0],
  209 + name: 'file',
  210 + formData: {
  211 + 'user': 'test'
  212 + },
  213 + header: {
  214 + 'token': uni.getStorageSync('token') || ''
  215 + },
  216 + success: (uploadFileRes) => {
  217 + let uploadList = JSON.parse(uploadFileRes.data).data
  218 + that.fileList.push(uploadList.url)
  219 + that.urlImg.push(uploadList.save_path)
  220 + }
  221 + });
  222 + }
  223 + });
187 }, 224 },
188 //点击昵称 225 //点击昵称
189 onUserName() { 226 onUserName() {
190 this.isShow = true 227 this.isShow = true
191 }, 228 },
192 - onUserPhone(){  
193 - this.isShowPhone=true 229 + onUserPhone() {
  230 + this.isShowPhone = true
194 }, 231 },
195 - bindInput(e){ 232 + bindInput(e) {
196 console.log(e) 233 console.log(e)
197 - this.inputName=e.detail.value 234 + this.inputName = e.detail.value
  235 + },
  236 + bindInputPhone(e) {
  237 + this.inputPhone = e.detail.value
198 }, 238 },
199 - bindInputPhone(e){  
200 - this.inputPhone=e.detail.value 239 + bindInputWechat(e){
  240 + this.inputWechat=e.detail.value
201 }, 241 },
202 //手机号 242 //手机号
203 - onUserPhone(){  
204 - this.isShowPhone=true 243 + onUserPhone() {
  244 + this.isShowPhone = true
  245 + },
  246 + //微信号
  247 + onUserWechat() {
  248 + this.isShowWechat = true
205 }, 249 },
206 //点击简介 250 //点击简介
207 onUserInfo() { 251 onUserInfo() {
208 - this.isShowInfo= true 252 + this.isShowInfo = true
209 }, 253 },
210 - bindInputinfo(e){  
211 - this.inputInfo=e.detail.value 254 + bindInputinfo(e) {
  255 + this.inputInfo = e.detail.value
212 }, 256 },
213 //点击取消 257 //点击取消
214 onCancel() { 258 onCancel() {
215 this.isShow = false 259 this.isShow = false
216 - this.isShowInfo=false  
217 - this.isShowPhone=false 260 + this.isShowInfo = false
  261 + this.isShowPhone = false
  262 + this.inputWechat=this.userData.wechat_id
  263 + this.inputPhone=this.userData.mobile
218 }, 264 },
219 //点击保存 265 //点击保存
220 onSave() { 266 onSave() {
221 - this.isShow = false  
222 - this.isShowInfo=false  
223 - this.isShowPhone=false  
224 this.confirm() 267 this.confirm()
225 }, 268 },
226 //点击会员 269 //点击会员
@@ -248,39 +291,50 @@ @@ -248,39 +291,50 @@
248 // // console.log('验证成功', that.ajxtrue) 291 // // console.log('验证成功', that.ajxtrue)
249 // } 292 // }
250 // }, 293 // },
251 - confirm(){  
252 - if(this.inputName==''){ 294 + confirm() {
  295 + if (this.inputName == '') {
253 uni.showToast({ 296 uni.showToast({
254 - title:'请输入昵称',  
255 - icon:'none' 297 + title: '请输入昵称',
  298 + icon: 'none'
256 }) 299 })
257 - }else if(this.inputPhone.length>11){ 300 + } else if (this.inputPhone.length > 11 || this.inputPhone == '') {
258 uni.showToast({ 301 uni.showToast({
259 - title:'请输入正确的手机号',  
260 - icon:'none' 302 + title: '请输入正确的手机号',
  303 + icon: 'none'
  304 + })
  305 + } else if(this.inputWechat==''){
  306 + uni.showToast({
  307 + title: '请输入正确的微信号',
  308 + icon: 'none'
261 }) 309 })
262 } 310 }
263 else { 311 else {
264 - request.get('/api/personal/xiuGai',{  
265 - avatar:this.urlImg[this.urlImg.length-1]?(this.urlImg[this.urlImg.length-1]).toString():'',  
266 - nickname:this.inputName,  
267 - content:this.inputInfo,  
268 - mobile:this.inputPhone  
269 - }).then(res=>{ 312 + request.get('/api/personal/xiuGai', {
  313 + avatar: this.urlImg[this.urlImg.length - 1] ? (this.urlImg[this.urlImg.length - 1])
  314 + .toString() : '',
  315 + nickname: this.inputName,
  316 + content: this.inputInfo,
  317 + mobile: this.inputPhone,
  318 + wechat_id:this.inputWechat
  319 + }).then(res => {
  320 + this.isShow = false
  321 + this.isShowInfo = false
  322 + this.isShowPhone = false
  323 + this.isShowWechat=false
270 uni.showToast({ 324 uni.showToast({
271 - title:'更新成功' 325 + title: '更新成功'
272 }) 326 })
273 - setTimeout(()=>{ 327 + setTimeout(() => {
274 uni.navigateBack({ 328 uni.navigateBack({
275 - delta:1 329 + delta: 1
276 }) 330 })
277 - },1500)  
278 -  
279 - }).catch(err=>{  
280 - 331 + }, 1500)
  332 +
  333 + }).catch(err => {
  334 +
281 }) 335 })
282 } 336 }
283 - 337 +
284 } 338 }
285 } 339 }
286 } 340 }
@@ -289,20 +343,22 @@ @@ -289,20 +343,22 @@
289 <style> 343 <style>
290 @import url("/common/personal.css"); 344 @import url("/common/personal.css");
291 @import url("/common/uni.css"); 345 @import url("/common/uni.css");
292 - .saveBtn{ 346 +
  347 + .saveBtn {
293 position: fixed; 348 position: fixed;
294 bottom: 0; 349 bottom: 0;
295 left: 0; 350 left: 0;
296 padding: 32rpx; 351 padding: 32rpx;
297 box-sizing: border-box; 352 box-sizing: border-box;
298 } 353 }
299 - .saveText{ 354 +
  355 + .saveText {
300 width: 686rpx; 356 width: 686rpx;
301 height: 88rpx; 357 height: 88rpx;
302 line-height: 88rpx; 358 line-height: 88rpx;
303 text-align: center; 359 text-align: center;
304 font-size: 28rpx; 360 font-size: 28rpx;
305 - background-color:#FF814A; 361 + background-color: #FF814A;
306 color: #fff; 362 color: #fff;
307 border-radius: 54rpx; 363 border-radius: 54rpx;
308 } 364 }
@@ -58,6 +58,13 @@ @@ -58,6 +58,13 @@
58 "navigationBarTitleText": "搜索", 58 "navigationBarTitleText": "搜索",
59 "enablePullDownRefresh": false 59 "enablePullDownRefresh": false
60 } 60 }
  61 + }, {
  62 + "path": "pages/index/demo",
  63 + "style": {
  64 + "navigationStyle": "custom",
  65 + "navigationBarTitleText": "",
  66 + "enablePullDownRefresh": false
  67 + }
61 }, 68 },
62 { 69 {
63 "path": "pages/index/board-detail", 70 "path": "pages/index/board-detail",
@@ -65,7 +72,7 @@ @@ -65,7 +72,7 @@
65 "navigationBarTitleText": "详情", 72 "navigationBarTitleText": "详情",
66 "enablePullDownRefresh": false 73 "enablePullDownRefresh": false
67 } 74 }
68 - },{ 75 + }, {
69 "path": "pages/index/public-page", 76 "path": "pages/index/public-page",
70 "style": { 77 "style": {
71 "navigationBarTitleText": "科欧社区淘", 78 "navigationBarTitleText": "科欧社区淘",
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 //分享 91 //分享
92 onShareAppMessage: function(e) { 92 onShareAppMessage: function(e) {
93 let title = '近邻交易，闲置不再闲置' 93 let title = '近邻交易，闲置不再闲置'
94 - let imgUrls="../../static/image/shareImg.png" 94 + let imgUrls="http://muying.qiniu.broing.cn/img_share@2x.png"
95 return { 95 return {
96 title: title, 96 title: title,
97 path: "/pages/activity/exchange-detail?id=" + this.id + '&userId=' + uni.getStorageSync('userInfo').id, 97 path: "/pages/activity/exchange-detail?id=" + this.id + '&userId=' + uni.getStorageSync('userInfo').id,
@@ -32,7 +32,10 @@ @@ -32,7 +32,10 @@
32 <rich-text :nodes="content"></rich-text> 32 <rich-text :nodes="content"></rich-text>
33 </view> 33 </view>
34 <view class="btnBj"> 34 <view class="btnBj">
35 - <view class="btn" @click="immediately"> 35 + <view class="btn" @click="immediately" v-if="goodsData.is_expire==0">
  36 + 立即报名
  37 + </view>
  38 + <view class="btn btn1" @click="noTime" v-else>
36 立即报名 39 立即报名
37 </view> 40 </view>
38 </view> 41 </view>
@@ -89,6 +92,13 @@ @@ -89,6 +92,13 @@
89 } 92 }
90 93
91 }, 94 },
  95 + //不能报名
  96 + noTime(){
  97 + uni.showToast({
  98 + title:'该活动无法报名！',
  99 + icon:'none'
  100 + })
  101 + },
92 //活动详情 102 //活动详情
93 detail() { 103 detail() {
94 request.get('/api/active/activeList', { 104 request.get('/api/active/activeList', {
@@ -245,4 +255,7 @@ @@ -245,4 +255,7 @@
245 font-size: 32rpx; 255 font-size: 32rpx;
246 color: #fff; 256 color: #fff;
247 } 257 }
  258 + .btn1 {
  259 + background: #d5d5d5;
  260 + }
248 </style> 261 </style>
@@ -150,9 +150,10 @@ @@ -150,9 +150,10 @@
150 this.listData(this.id) 150 this.listData(this.id)
151 } else {} 151 } else {}
152 152
153 - }).catch(errr => { 153 + }).catch(err => {
  154 + console.log(err,'err')
154 uni.showToast({ 155 uni.showToast({
155 - title: '发布者不能给自己留言', 156 + title: err,
156 icon: 'none' 157 icon: 'none'
157 }) 158 })
158 }) 159 })
@@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
2 <view class="content" @click="concelPIC"> 2 <view class="content" @click="concelPIC">
3 <view class="topcontent" v-if="Number(index)==2&&goodDatas.goods_name!=null"> 3 <view class="topcontent" v-if="Number(index)==2&&goodDatas.goods_name!=null">
4 <view class="leftBox"> 4 <view class="leftBox">
5 - <image :src="goodDatas.images" mode="" style="width:104rpx;height: 104rpx;border-radius: 8rpx;"></image> 5 + <image :src="goodDatas.images" mode="" style="width:104rpx;height: 104rpx;border-radius: 8rpx;"
  6 + mode="aspectFill"></image>
6 <view class="" style="margin-left: 20rpx;font-size: 28rpx;"> 7 <view class="" style="margin-left: 20rpx;font-size: 28rpx;">
7 {{goodDatas.goods_name}} 8 {{goodDatas.goods_name}}
8 <view class="" style="font-size: 28rpx;color:#EE0A24;"> 9 <view class="" style="font-size: 28rpx;color:#EE0A24;">
@@ -34,7 +35,7 @@ @@ -34,7 +35,7 @@
34 :class="item.type==1&&item.datetime?'leftContent1':item.type==1&&!item.datetime?'leftContent':item.type==0&&item.datetime?'rightContent1':'rightContent'" 35 :class="item.type==1&&item.datetime?'leftContent1':item.type==1&&!item.datetime?'leftContent':item.type==0&&item.datetime?'rightContent1':'rightContent'"
35 style="position: relative;"> 36 style="position: relative;">
36 <view class="" v-if="item.flag==0"> 37 <view class="" v-if="item.flag==0">
37 - {{item.content}} 38 + <text selectable="true">{{item.content}}</text>
38 </view> 39 </view>
39 <view class="" v-else> 40 <view class="" v-else>
40 <image :src="item.content" class="chatImage" @click="previewImg(item.content)" 41 <image :src="item.content" class="chatImage" @click="previewImg(item.content)"
@@ -43,12 +44,10 @@ @@ -43,12 +44,10 @@
43 <!-- <view class="" 44 <!-- <view class=""
44 style="width: 20rpx;height: 20rpx;background-color: #fff;transform: rotate(45deg);position: absolute;top: 36rpx;left: -10rpx;z-index: -1;" 45 style="width: 20rpx;height: 20rpx;background-color: #fff;transform: rotate(45deg);position: absolute;top: 36rpx;left: -10rpx;z-index: -1;"
45 v-if="item.type==1"> 46 v-if="item.type==1">
46 -  
47 </view> 47 </view>
48 <view class="" 48 <view class=""
49 style="width: 20rpx;height: 20rpx;background-color: #FF834D;transform: rotate(45deg);position: absolute;top: 36rpx;right: -10rpx;z-index: -1;" 49 style="width: 20rpx;height: 20rpx;background-color: #FF834D;transform: rotate(45deg);position: absolute;top: 36rpx;right: -10rpx;z-index: -1;"
50 v-if="item.type==0"> 50 v-if="item.type==0">
51 -  
52 </view> --> 51 </view> -->
53 </view> 52 </view>
54 53
@@ -66,7 +65,9 @@ @@ -66,7 +65,9 @@
66 @click="goUser(item.user_id)"></image> 65 @click="goUser(item.user_id)"></image>
67 <view :class="item.type==0?'leftContent':'rightContent'" style="position: relative;"> 66 <view :class="item.type==0?'leftContent':'rightContent'" style="position: relative;">
68 <view class="" v-if="item.flag==0"> 67 <view class="" v-if="item.flag==0">
69 - {{item.content}} 68 + <text selectable="true">
  69 + {{item.content}}
  70 + </text>
70 </view> 71 </view>
71 <view class="" v-else> 72 <view class="" v-else>
72 <image :src="item.content" class="chatImage" @click="previewImg(item.content)" 73 <image :src="item.content" class="chatImage" @click="previewImg(item.content)"
@@ -219,7 +220,7 @@ @@ -219,7 +220,7 @@
219 title: '发送成功', 220 title: '发送成功',
220 icon: 'none' 221 icon: 'none'
221 }) 222 })
222 - this.inputText = res.data.wechat_id 223 + this.inputText = '您可以添加我的微信，微信号:' + res.data.wechat_id
223 this.send() 224 this.send()
224 } else { 225 } else {
225 uni.showToast({ 226 uni.showToast({
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
3 <view class=""> 3 <view class="">
4 <scroll-view scroll-x="true" class="scroll"> 4 <scroll-view scroll-x="true" class="scroll">
5 <view class="scrollItems"> 5 <view class="scrollItems">
6 - <view :class="indexs==index?'active Item':'Item'" v-for="(item,index) in list" :key="index" @click="selectItem(item.id,index)"> 6 + <view :class="indexs==index?'active Item':'Item'" v-for="(item,index) in list" :key="index"
  7 + @click="selectItem(item.id,index)">
7 {{item.name}} 8 {{item.name}}
8 </view> 9 </view>
9 </view> 10 </view>
@@ -14,52 +15,56 @@ @@ -14,52 +15,56 @@
14 <view>距离</view> 15 <view>距离</view>
15 <image src="../../static/image/paixu_icon@2x.png" mode=""></image> 16 <image src="../../static/image/paixu_icon@2x.png" mode=""></image>
16 </view> 17 </view>
17 - <view class="tabBox" @click="jlsort"> 18 + <view class="tabBox" @click="jlsort">
18 <view>价格</view> 19 <view>价格</view>
19 <image src="../../static/image/paixu_icon@2x.png" mode=""></image> 20 <image src="../../static/image/paixu_icon@2x.png" mode=""></image>
20 </view> 21 </view>
21 </view> 22 </view>
22 - <view class="" v-show="tabIndex == 0" style="display: flex; justify-content: space-between;flex-wrap: wrap;padding: 32rpx;">  
23 - <view class="goodsBox" v-for="(item,index) in goodsList" :key="index" style="width: 330rpx; background: #fff; margin-bottom: 24rpx;position: relative;padding-bottom:20rpx;"  
24 - @click="goDetail(item.goods_id)"> 23 + <view class="" v-show="tabIndex == 0"
  24 + style="display: flex; justify-content: space-between;flex-wrap: wrap;padding: 32rpx;">
  25 + <view class="goodsBox" v-for="(item,index) in goodsList" :key="index"
  26 + style="width: 330rpx; background: #fff; margin-bottom: 24rpx;position: relative;padding-bottom:20rpx;"
  27 + @click="goDetail(item.goods_id,item.title,item.ad_id)">
25 <view class="goodsPic"> 28 <view class="goodsPic">
26 - <image :src="item.images[0]" mode="" class="goodImg"></image> 29 + <image :src="item.images[0]||item.title_image" mode="" class="goodImg"></image>
27 </view> 30 </view>
28 <view class="goodsDel"> 31 <view class="goodsDel">
29 - {{item.goods_name}} 32 + {{item.goods_name?item.goods_name:item.title}}
30 </view> 33 </view>
31 - <view class="goodsPrice"> 34 + <view :class="item.price?'goodsPrice':'goodsPrices'">
32 <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text> 35 <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text>
33 {{item.price}} 36 {{item.price}}
34 </view> 37 </view>
35 <view class="userInfo"> 38 <view class="userInfo">
36 <view class="userLeft"> 39 <view class="userLeft">
37 <view class="userHead"> 40 <view class="userHead">
38 - <image :src="item.user.avatar" mode="" class="userHead"></image> 41 + <image :src="item.user.avatar||logo" mode="" class="userHead"></image>
39 </view> 42 </view>
40 <view class="userName"> 43 <view class="userName">
41 - {{item.user.nickname}} 44 + {{item.user.nickname||'科欧社区淘'}}
42 </view> 45 </view>
43 </view> 46 </view>
44 <view class="userRight"> 47 <view class="userRight">
45 - <image src="/static/image/zuanshi_icon_1@2x.png" mode="" style="width: 20rpx;height: 20rpx;margin-right: 10rpx;"></image>  
46 - {{item.user.grade_status==0?'L0':item.user.grade_status==1?'L1':item.user.grade_status==2?'L2':item.user.grade_status==3?'L3':item.user.grade_status==4?'L4':'L5'}} 48 + <image src="/static/image/zuanshi_icon_1@2x.png" mode=""
  49 + style="width: 20rpx;height: 20rpx;margin-right: 10rpx;"></image>
  50 + {{item.user.grade_status==0?'L0':item.user.grade_status==1?'L1':item.user.grade_status==2?'L2':item.user.grade_status==3?'L3':item.user.grade_status==4?'L4':item.user.grade_status==5?'L5':'广告'}}
47 </view> 51 </view>
48 </view> 52 </view>
49 <view class="addressMask"> 53 <view class="addressMask">
50 <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image> 54 <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image>
51 - <view class="maskAddress" style="max-width: 104rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">  
52 - {{item.address}} 55 + <view class="maskAddress"
  56 + style="max-width: 104rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
  57 + {{item.address||''}}
53 </view> 58 </view>
54 - <view class="maskAddress"> 59 + <view class="maskAddress" v-if="item!=null">
55 {{item.dis}}km 60 {{item.dis}}km
56 </view> 61 </view>
57 </view> 62 </view>
58 </view> 63 </view>
59 </view> 64 </view>
60 - <view class="" style="text-align: center;margin-top: 100rpx;color: grey;" v-if="goodsList.length==0">  
61 - 暂无更多数据  
62 - </view> 65 + <view class="" style="text-align: center;margin-top: 100rpx;color: grey;" v-if="goodsList.length==0">
  66 + 暂无更多数据
  67 + </view>
63 </view> 68 </view>
64 69
65 </template> 70 </template>
@@ -69,34 +74,52 @@ @@ -69,34 +74,52 @@
69 export default { 74 export default {
70 onLoad(options) { 75 onLoad(options) {
71 this.classifyId = options.classifyId 76 this.classifyId = options.classifyId
72 - this.indexs=options.index  
73 - this.id=options.id 77 + this.indexs = options.index
  78 + this.id = options.id
74 this.classifList() 79 this.classifList()
75 this.classifyChange('', 1) 80 this.classifyChange('', 1)
  81 + this.getBoardList()
76 }, 82 },
77 data() { 83 data() {
78 return { 84 return {
79 classifyId: '', //分类id 85 classifyId: '', //分类id
80 id: '', //二级分类 86 id: '', //二级分类
81 - indexs:'', 87 + indexs: '',
82 priceTypes: 1, 88 priceTypes: 1,
83 jlTypes: 1, 89 jlTypes: 1,
84 list: [], 90 list: [],
85 active: 1, 91 active: 1,
86 - goodsList: [] 92 + goodsList: [],
  93 + boardIndex: 0, //广告index
  94 + boardList: [], //广告列表
  95 + logo: '../../static/image/logo.jpg'
87 } 96 }
88 }, 97 },
89 - created() {  
90 - }, 98 + created() {},
91 methods: { 99 methods: {
  100 + //广告
  101 + //广告列表
  102 + getBoardList() {
  103 + let that = this
  104 + request.post('/api/index/adList', {
  105 + lat2: uni.getStorageSync('lat'),
  106 + lng2: uni.getStorageSync('lot')
  107 + // lat2: '39.15935',
  108 + // lng2: '117.23785'
  109 + }).then(res => {
  110 + this.boardList = res.data
  111 + }).catch(err => {
  112 +
  113 + })
  114 + },
92 jlsort() { 115 jlsort() {
93 let jlType = Number(this.jlTypes) == 1 ? '2' : '1' 116 let jlType = Number(this.jlTypes) == 1 ? '2' : '1'
94 - this.jlTypes=jlType 117 + this.jlTypes = jlType
95 this.classifyChange(jlType, '') 118 this.classifyChange(jlType, '')
96 }, 119 },
97 priceSort() { 120 priceSort() {
98 let priceType = Number(this.priceTypes) == 1 ? '2' : '1' 121 let priceType = Number(this.priceTypes) == 1 ? '2' : '1'
99 - this.priceTypes=priceType 122 + this.priceTypes = priceType
100 this.classifyChange('', priceType) 123 this.classifyChange('', priceType)
101 }, 124 },
102 //分类 125 //分类
@@ -110,6 +133,9 @@ @@ -110,6 +133,9 @@
110 }) 133 })
111 }, 134 },
112 classifyChange(jvType, priceType) { 135 classifyChange(jvType, priceType) {
  136 + uni.showLoading({
  137 + title:'加载中'
  138 + })
113 request.get('/api/push/erLei', { 139 request.get('/api/push/erLei', {
114 lat2: uni.getStorageSync('lat'), 140 lat2: uni.getStorageSync('lat'),
115 lng2: uni.getStorageSync('lot'), 141 lng2: uni.getStorageSync('lot'),
@@ -117,31 +143,68 @@ @@ -117,31 +143,68 @@
117 p: jvType, 143 p: jvType,
118 q: priceType 144 q: priceType
119 }).then(res => { 145 }).then(res => {
  146 + if(res.code==1){
  147 + uni.hideLoading()
  148 + }
120 this.goodsList = res.data.info 149 this.goodsList = res.data.info
  150 + this.goodsList.forEach((item, index) => {
  151 + if ((index + 1) % 7 == 0) {
  152 + if (this.boardIndex == this.boardList.length) {
  153 + this.boardIndex = 0
  154 + }
  155 + this.goodsList.splice(index - 1, 0, this.boardList[this.boardIndex])
  156 + this.boardIndex += 1
  157 + }
  158 + })
121 }).catch(err => { 159 }).catch(err => {
122 160
123 }) 161 })
124 }, 162 },
125 - selectItem(id,index) { 163 + selectItem(id, index) {
126 this.id = id 164 this.id = id
127 - this.indexs=index  
128 - this.jlTypes='' 165 + this.indexs = index
  166 + this.jlTypes = ''
129 request.get('/api/push/erLei', { 167 request.get('/api/push/erLei', {
130 lat2: uni.getStorageSync('lat'), 168 lat2: uni.getStorageSync('lat'),
131 lng2: uni.getStorageSync('lot'), 169 lng2: uni.getStorageSync('lot'),
132 - sort2_id:id, 170 + sort2_id: id,
133 p: this.priceTypes, 171 p: this.priceTypes,
134 q: this.jlTypes 172 q: this.jlTypes
135 }).then(res => { 173 }).then(res => {
136 this.goodsList = res.data.info 174 this.goodsList = res.data.info
  175 + // if ((index + 1) % 6) {
  176 + // console.log(index + 1, 'index+1')
  177 + // if (this.boardIndex == this.boardList.length) {
  178 + // this.boardIndex = 0
  179 + // }
  180 + // this.goodsList.splice(index + 1, 0, this.boardList[this.boardIndex])
  181 + // this.boardIndex += 1
  182 + // }
  183 + var typeData = [];
  184 + for (var i = 0, len = this.goodsList.length; i < len; i += 6) {
  185 + typeData.push(types.slice(i, i + 3));
  186 + }
  187 + typeData.forEach(item => {
  188 + item.push('66')
  189 + });
  190 + types = [].concat.apply([], typeData);
  191 + console.log(typeData, 'types')
137 }).catch(err => { 192 }).catch(err => {
138 - 193 +
139 }) 194 })
140 }, 195 },
141 - goDetail(id){  
142 - uni.navigateTo({  
143 - url:'/pages/index/good-details?goos_id='+id+'&lat='+uni.getStorageSync('lat')+'&lot='+uni.getStorageSync('lot')  
144 - }) 196 + goDetail(id, title, boardId) {
  197 + if (title) {
  198 + uni.navigateTo({
  199 + url: '/pages/index/board-detail?id=' + boardId
  200 + })
  201 + } else {
  202 + uni.navigateTo({
  203 + url: '/pages/index/good-details?goos_id=' + id + '&lat=' + uni.getStorageSync('lat') +
  204 + '&lot=' + uni.getStorageSync('lot')
  205 + })
  206 + }
  207 +
145 } 208 }
146 } 209 }
147 } 210 }
@@ -151,9 +214,11 @@ @@ -151,9 +214,11 @@
151 @import url("/common/uni.css"); 214 @import url("/common/uni.css");
152 @import url("/common/index.css"); 215 @import url("/common/index.css");
153 @import url("/common/classify-detail.css"); 216 @import url("/common/classify-detail.css");
154 - .active{  
155 - color:#FF9D66;  
156 - } 217 +
  218 + .active {
  219 + color: #FF9D66;
  220 + }
  221 +
157 .scroll { 222 .scroll {
158 padding: 24rpx 32rpx; 223 padding: 24rpx 32rpx;
159 font-size: 28rpx; 224 font-size: 28rpx;
@@ -171,4 +236,8 @@ @@ -171,4 +236,8 @@
171 /* padding: 24rpx 32rpx; */ 236 /* padding: 24rpx 32rpx; */
172 min-width: 150rpx; 237 min-width: 150rpx;
173 } 238 }
  239 +
  240 + .goodsPrices {
  241 + color: #fff !important;
  242 + }
174 </style> 243 </style>
  1 +<template>
  2 + <view class="content">
  3 + <view class="imgBox">
  4 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/3c5365b28ce34d8a40844bd50cd3bfb9.png" mode=""
  5 + class="img" mode="widthFix" v-if="index==1"></image>
  6 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/ea6192f56861b55304eeefae6cb80db6.png" mode=""
  7 + class="img" mode="widthFix" v-if="index==2"></image>
  8 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/65d339232a2b077c22d057dd84defbec.png" mode=""
  9 + class="img" mode="widthFix" v-if="index==3"></image>
  10 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/a374e24f9e49e985dd0d6bdb09ee77c8.png" mode=""
  11 + class="img" mode="widthFix" v-if="index==4"></image>
  12 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/bafe2810d884fbfd13592c0c50b311ac.png" mode=""
  13 + class="img" mode="widthFix" v-if="index==5"></image>
  14 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/e988294593944ee314cd6a59976907c9.png" mode=""
  15 + class="img" mode="widthFix" v-if="index==6"></image>
  16 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/856869f0413ceb5931a53015dbe3dc1f.png" mode=""
  17 + class="img" mode="widthFix" v-if="index==7"></image>
  18 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/9aa43baab9b429d6aaaf0a35ef933403.png" mode=""
  19 + class="img" mode="widthFix" v-if="index==8"></image>
  20 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/6273b6d62cc0704c72336fbe610b2d80.png" mode=""
  21 + class="img" mode="widthFix" v-if="index==9"></image>
  22 + </view>
  23 + <view class="btnBox">
  24 + <view class="" @click="compile" v-if="index==9">
  25 + 完成
  26 + </view>
  27 + <view class="" @click="bottomClick" v-else>
  28 + 下一步
  29 + </view>
  30 + </view>
  31 + </view>
  32 +</template>
  33 +
  34 +<script>
  35 + export default {
  36 + data() {
  37 + return {
  38 + index: 1
  39 + }
  40 + },
  41 + methods: {
  42 + bottomClick() {
  43 + this.index += 1
  44 + },
  45 + compile() {
  46 + // uni.redirectTo({
  47 + // url:''
  48 + // })
  49 + }
  50 + }
  51 +
  52 + }
  53 +</script>
  54 +
  55 +<style>
  56 + .imgBox {
  57 + /* width: 100%;
  58 + height: 100%; */
  59 + }
  60 +
  61 + .img {
  62 + width: 750rpx;
  63 + /* height:1624rpx; */
  64 + }
  65 +
  66 + .btnBox {
  67 + position: fixed;
  68 + top: 50%;
  69 + left: 42%;
  70 + z-index: 5;
  71 + color: #fff;
  72 + padding: 10rpx 48rpx;
  73 + box-sizing: border-box;
  74 + border: 2rpx solid #fff;
  75 + border-radius: 48rpx;
  76 + /* width: 200rpx; */
  77 + }
  78 +</style>
@@ -221,7 +221,10 @@ @@ -221,7 +221,10 @@
221 <view class="iconfont icon-jubao1"></view> 221 <view class="iconfont icon-jubao1"></view>
222 举报 222 举报
223 </view> 223 </view>
224 - <view class="messageBtn" @click="messageClick"> 224 + <!-- <view class="messageBtn" @click="messageClick">
  225 + 留言
  226 + </view> -->
  227 + <view class="messageBtn" @click="mainMessage">
225 留言 228 留言
226 </view> 229 </view>
227 <view class="wantBtn messageBtn" @click="myWant"> 230 <view class="wantBtn messageBtn" @click="myWant">
@@ -366,8 +369,9 @@ @@ -366,8 +369,9 @@
366 onShareAppMessage: function(e) { 369 onShareAppMessage: function(e) {
367 let that = this 370 let that = this
368 // let title = '来到社区淘 闲置就近卖' 371 // let title = '来到社区淘 闲置就近卖'
369 - let name=that.detailData.goods_name==undefined?that.detailData.need_name:that.detailData.goods_name  
370 - let title = '￥' + that.detailData.price + '|' +name 372 + let name = that.detailData.goods_name == undefined ? that.detailData.need_name : that.detailData.goods_name
  373 + let title = '￥' + that.detailData.price + '|' + name
  374 + // let imgUrl = that.detailData.images[0]
371 let imgUrl = that.detailData.images[0] + '!share' 375 let imgUrl = that.detailData.images[0] + '!share'
372 return { 376 return {
373 title: title, 377 title: title,
@@ -615,8 +619,9 @@ @@ -615,8 +619,9 @@
615 }, 619 },
616 //私信 620 //私信
617 myWant() { 621 myWant() {
618 - if (this.token) {  
619 - if (this.mobile == '') { 622 + let that = this
  623 + if (that.token) {
  624 + if (that.mobile == '') {
620 uni.showModal({ 625 uni.showModal({
621 title: '提示', 626 title: '提示',
622 content: '请绑定手机号用于接收卖家/买家短信消息提醒', 627 content: '请绑定手机号用于接收卖家/买家短信消息提醒',
@@ -626,77 +631,67 @@ @@ -626,77 +631,67 @@
626 url: '/myPackage/pages/me/personal' 631 url: '/myPackage/pages/me/personal'
627 }) 632 })
628 } else if (res.cancel) { 633 } else if (res.cancel) {
629 - if (this.id == undefined || this.goods_id !== undefined) { 634 + if (that.id == undefined || that.goods_id !== undefined) {
630 request.get('/api/goods/want', { 635 request.get('/api/goods/want', {
631 - goods_id: this.goods_id 636 + goods_id: that.goods_id
632 }).then(res => { 637 }).then(res => {
633 638
634 }).catch(err => { 639 }).catch(err => {
635 640
636 }) 641 })
637 uni.navigateTo({ 642 uni.navigateTo({
638 - url: '/pages/index/chat?goods_id=' + this.goods_id + 643 + url: '/pages/index/chat?goods_id=' + that.goods_id +
639 '&index=2' 644 '&index=2'
640 }) 645 })
641 } else { 646 } else {
642 request.get('/api/goods/needChat', { 647 request.get('/api/goods/needChat', {
643 - id: this.id 648 + id: that.id
644 }).then(res => { 649 }).then(res => {
645 uni.showToast({ 650 uni.showToast({
646 title: '创建订单', 651 title: '创建订单',
647 icon: 'none' 652 icon: 'none'
648 }) 653 })
649 uni.navigateTo({ 654 uni.navigateTo({
650 - url: '/pages/index/chat?goods_id=' + this.id + 655 + url: '/pages/index/chat?goods_id=' + that.id +
651 '&index=2' 656 '&index=2'
652 }) 657 })
653 }).catch(err => { 658 }).catch(err => {
654 659
655 }) 660 })
656 } 661 }
657 - console.log('私信')  
658 } 662 }
659 } 663 }
660 }) 664 })
  665 + } else {
  666 + if (that.id == undefined || that.goods_id !== undefined) {
  667 + request.get('/api/goods/want', {
  668 + goods_id: that.goods_id
  669 + }).then(res => {
  670 +
  671 + }).catch(err => {
  672 +
  673 + })
  674 + uni.navigateTo({
  675 + url: '/pages/index/chat?goods_id=' + that.goods_id +
  676 + '&index=2'
  677 + })
  678 + } else {
  679 + request.get('/api/goods/needChat', {
  680 + id: that.id
  681 + }).then(res => {
  682 + uni.showToast({
  683 + title: '创建订单',
  684 + icon: 'none'
  685 + })
  686 + uni.navigateTo({
  687 + url: '/pages/index/chat?goods_id=' + that.id +
  688 + '&index=2'
  689 + })
  690 + }).catch(err => {
  691 +
  692 + })
  693 + }
661 } 694 }
662 - // if (this.wechat == null) {  
663 - // uni.showToast({  
664 - // title: '请先设置微信号',  
665 - // icon: 'none'  
666 - // })  
667 - // setTimeout(() => {  
668 - // uni.navigateTo({  
669 - // url: '/myPackage/pages/me/set-wechat'  
670 - // })  
671 - // }, 1000)  
672 - // } else {  
673 - // if (this.id == undefined || this.goods_id !== undefined) {  
674 - // request.get('/api/goods/want', {  
675 - // goods_id: this.goods_id  
676 - // }).then(res => {  
677 -  
678 - // }).catch(err => {  
679 -  
680 - // })  
681 - // uni.navigateTo({  
682 - // url: '/pages/index/chat?goods_id=' + this.goods_id + '&index=2'  
683 - // })  
684 - // } else {  
685 - // request.get('/api/goods/needChat', {  
686 - // id: this.id  
687 - // }).then(res => {  
688 - // uni.showToast({  
689 - // title: '创建订单',  
690 - // icon: 'none'  
691 - // })  
692 - // uni.navigateTo({  
693 - // url: '/pages/index/chat?goods_id=' + this.id + '&index=2'  
694 - // })  
695 - // }).catch(err => {  
696 -  
697 - // })  
698 - // }  
699 - // }  
700 } else { 695 } else {
701 this.login() 696 this.login()
702 } 697 }
@@ -704,21 +699,44 @@ @@ -704,21 +699,44 @@
704 }, 699 },
705 //留言 700 //留言
706 mainMessage() { 701 mainMessage() {
707 - if (this.token) {  
708 - if (this.id) {  
709 - uni.navigateTo({  
710 - url: "/pages/index/all-message?id=" + this.id 702 + let that = this
  703 + if (that.token) {
  704 + if (that.mobile == '') {
  705 + uni.showModal({
  706 + title: '提示',
  707 + content: '请绑定手机号用于接收卖家/买家短信消息提醒',
  708 + success: function(res) {
  709 + if (res.confirm) {
  710 + uni.navigateTo({
  711 + url: '/myPackage/pages/me/personal'
  712 + })
  713 + } else if (res.cancel) {
  714 + if (that.id) {
  715 + uni.navigateTo({
  716 + url: "/pages/index/all-message?id=" + that.id
  717 + })
  718 + } else {
  719 + uni.navigateTo({
  720 + url: "/pages/index/all-message?id=" + that.goods_id
  721 + })
  722 + }
  723 + }
  724 + }
711 }) 725 })
712 } else { 726 } else {
713 - uni.navigateTo({  
714 - url: "/pages/index/all-message?id=" + this.goods_id  
715 - }) 727 + if (that.id) {
  728 + uni.navigateTo({
  729 + url: "/pages/index/all-message?id=" + that.id
  730 + })
  731 + } else {
  732 + uni.navigateTo({
  733 + url: "/pages/index/all-message?id=" + that.goods_id
  734 + })
  735 + }
716 } 736 }
717 -  
718 } else { 737 } else {
719 - this.login() 738 + that.login()
720 } 739 }
721 -  
722 }, 740 },
723 messageClick() { 741 messageClick() {
724 if (this.token) { 742 if (this.token) {
@@ -736,7 +754,7 @@ @@ -736,7 +754,7 @@
736 // console.log(this.id == 'undefined' ? this.goods_id + 'goods' : this.id + 'id', '参数') 754 // console.log(this.id == 'undefined' ? this.goods_id + 'goods' : this.id + 'id', '参数')
737 request.get('/api/msg/allMsg', { 755 request.get('/api/msg/allMsg', {
738 // goods_id: this.id== || this.goods_id 756 // goods_id: this.id== || this.goods_id
739 - goods_id: this.id == undefined||this.id == 'undefined' ? this.goods_id : this.id 757 + goods_id: this.id == undefined || this.id == 'undefined' ? this.goods_id : this.id
740 }).then(res => { 758 }).then(res => {
741 console.log(res.data.info, 'ressss') 759 console.log(res.data.info, 'ressss')
742 this.messageList = res.data.info 760 this.messageList = res.data.info
@@ -774,7 +792,8 @@ @@ -774,7 +792,8 @@
774 //收藏 792 //收藏
775 collect() { 793 collect() {
776 if (this.token) { 794 if (this.token) {
777 - if (this.id == undefined) { 795 + if (this.id == undefined || this.id == 'undefined') {
  796 + console.log(this.goods_id, '收藏id')
778 request.get('/api/collect/addGoods', { 797 request.get('/api/collect/addGoods', {
779 goods_id: this.goods_id 798 goods_id: this.goods_id
780 }).then(res => { 799 }).then(res => {
@@ -790,6 +809,7 @@ @@ -790,6 +809,7 @@
790 809
791 }) 810 })
792 } else { 811 } else {
  812 + console.log(this.id, '收藏id')
793 request.get('/api/collect/addNeed', { 813 request.get('/api/collect/addNeed', {
794 need_id: this.id 814 need_id: this.id
795 }).then(res => { 815 }).then(res => {
1 <template> 1 <template>
2 <view class="container"> 2 <view class="container">
3 - <image :src="IndexImg" style="width: 100%;display: none;" mode=""></image>  
4 - <view class=""  
5 - style="position: fixed;top: 0;left: 0;height:176rpx;width: 100%;z-index: 99999;overflow: hidden;background-color: #fff;">  
6 - <image :src="IndexImg" mode="" style="width: 100%;display: none;"></image>  
7 - <view class=""  
8 - style="font-size:34rpx;color: #FF824D;position: absolute;top: 108rpx;left: 36rpx;max-width: 300rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"  
9 - @click="goSelectAddress">  
10 - {{addressText}}  
11 - <!-- <image src="/static/image/Frame_11@2x.png" mode="" style="width: 24rpx;height: 24rpx;"></image> -->  
12 - <view class="arrowWhite" style="position: fixed;top:62px;left: 320rpx;">  
13 - 3 + <!-- 操作演示start -->
  4 + <view class="demoBox" v-if="demo">
  5 + <view class="">
  6 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/a374e24f9e49e985dd0d6bdb09ee77c8.png" mode=""
  7 + class="img" mode="widthFix" v-if="imgIndex==1"></image>
  8 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/65d339232a2b077c22d057dd84defbec.png" mode=""
  9 + class="img" mode="widthFix" v-if="imgIndex==2"></image>
  10 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/e988294593944ee314cd6a59976907c9.png" mode=""
  11 + class="img" mode="widthFix" v-if="imgIndex==3"></image>
  12 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/ea6192f56861b55304eeefae6cb80db6.png" mode=""
  13 + class="img" mode="widthFix" v-if="imgIndex==4"></image>
  14 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/bafe2810d884fbfd13592c0c50b311ac.png" mode=""
  15 + class="img" mode="widthFix" v-if="imgIndex==5"></image>
  16 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/3c5365b28ce34d8a40844bd50cd3bfb9.png" mode=""
  17 + class="img" mode="widthFix" v-if="imgIndex==6"></image>
  18 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/856869f0413ceb5931a53015dbe3dc1f.png" mode=""
  19 + class="img" mode="widthFix" v-if="imgIndex==7"></image>
  20 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/9aa43baab9b429d6aaaf0a35ef933403.png" mode=""
  21 + class="img" mode="widthFix" v-if="imgIndex==8"></image>
  22 + <image src="http://muying.qiniu.broing.cn/uploads/20210621/6273b6d62cc0704c72336fbe610b2d80.png" mode=""
  23 + class="img" mode="widthFix" v-if="imgIndex==9"></image>
  24 + </view>
  25 + <view class="btnBox">
  26 + <view class="" @click="compile" v-if="imgIndex==9">
  27 + 完成
  28 + </view>
  29 + <view class="" @click="bottomClick" v-else>
  30 + 下一步
14 </view> 31 </view>
15 </view> 32 </view>
16 </view> 33 </view>
17 - <view class="all">  
18 - <view class="topBOX">  
19 - <view class="searchBox">  
20 - <view class="mapBox" @click="signIn">  
21 - <view class="picBox">  
22 - <image src="/static/image/qiandao_ico.png" mode=""></image>  
23 - </view>  
24 - <view class="mapText">  
25 - 签到 34 + <!-- 操作演示end -->
  35 + <view class="" v-if="!demo">
  36 + <image :src="IndexImg" style="width: 100%;display: none;" mode=""></image>
  37 + <view class=""
  38 + style="position: fixed;top: 0;left: 0;height:176rpx;width: 100%;z-index: 99999;overflow: hidden;background-color: #fff;">
  39 + <image :src="IndexImg" mode="" style="width: 100%;display: none;"></image>
  40 + <view class=""
  41 + style="font-size:34rpx;color: #FF824D;position: absolute;top: 108rpx;left: 36rpx;max-width: 300rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
  42 + @click="goSelectAddress">
  43 + {{addressText}}
  44 + </view>
  45 + </view>
  46 + <view class="all">
  47 + <view class="topBOX">
  48 + <view class="searchBox">
  49 + <view class="mapBox" @click="signIn">
  50 + <view class="picBox">
  51 + <image src="/static/image/qiandao_ico.png" mode=""></image>
  52 + </view>
  53 + <view class="mapText">
  54 + 签到
  55 + </view>
26 </view> 56 </view>
27 - </view>  
28 - <view class="inputCon">  
29 - <!-- <image src="../../static/image/search.png" mode=""></image> 57 + <view class="inputCon">
  58 + <!-- <image src="../../static/image/search.png" mode=""></image>
30 <input class="uni-input" placeholder="搜索" @focus='focus' v-model="inputValue" 59 <input class="uni-input" placeholder="搜索" @focus='focus' v-model="inputValue"
31 @input="bindInput" /> --> 60 @input="bindInput" /> -->
32 - <image src="/static/image/inputImg.png" mode="" class="inputImg" @click="goSearch"></image>  
33 - </view>  
34 - <view class="mapBox" @click="cangbao">  
35 - <view class="picBox">  
36 - <image src="/static/image/cangbaotu_ico.png" mode="" style="width: 36rpx;height: 36rpx;">  
37 - </image> 61 + <image src="/static/image/inputImg.png" mode="" class="inputImg" @click="goSearch"></image>
38 </view> 62 </view>
39 - <view class="mapText">  
40 - 藏宝图 63 + <view class="mapBox" @click="cangbao">
  64 + <view class="picBox">
  65 + <image src="/static/image/cangbaotu_ico.png" mode=""
  66 + style="width: 36rpx;height: 36rpx;">
  67 + </image>
  68 + </view>
  69 + <view class="mapText">
  70 + 藏宝图
  71 + </view>
41 </view> 72 </view>
42 </view> 73 </view>
43 </view> 74 </view>
44 - </view>  
45 - <view class="swiperBox">  
46 - <swiper class="swiper" :indicator-dots="indicatorDots" :duration="duration" :circular="true"  
47 - autoplay="true">  
48 - <swiper-item v-for="(item,index) in swiperList" :key="index"  
49 - @click="goGood(item.id_status,item.data_id)">  
50 - <image :src="item.image" mode="" class="swiper"></image>  
51 - </swiper-item>  
52 - </swiper>  
53 - </view>  
54 - <view class="classifyBox">  
55 - <view class="classifyPic" v-for="(item,index) in ClassifyList1" :key="index"  
56 - @click="goClass(index,item.id)" v-if="index<3">  
57 - <image :src="item.image" mode=""></image>  
58 - <text class="classifyText">{{item.name}}</text> 75 + <view class="swiperBox">
  76 + <swiper class="swiper" :indicator-dots="indicatorDots" :duration="duration" :circular="true"
  77 + autoplay="true">
  78 + <swiper-item v-for="(item,index) in swiperList" :key="index"
  79 + @click="goGood(item.id_status,item.data_id)">
  80 + <image :src="item.image" mode="" class="swiper"></image>
  81 + </swiper-item>
  82 + </swiper>
59 </view> 83 </view>
60 - <view class="classifyPic" @click="goClass(4,ClassifyList1[0].id)" v-if="ClassifyList1.length>0">  
61 - <image src="../../static/image/fenlei_icon_1@2x.png" mode=""></image>  
62 - <text class="classifyText">分类</text> 84 + <view class="classifyBox">
  85 + <view class="classifyPic" v-for="(item,index) in ClassifyList1" :key="index"
  86 + @click="goClass(index,item.id)" v-if="index<3">
  87 + <image :src="item.image" mode=""></image>
  88 + <text class="classifyText">{{item.name}}</text>
  89 + </view>
  90 + <view class="classifyPic" @click="goClass(4,ClassifyList1[0].id)" v-if="ClassifyList1.length>0">
  91 + <image src="../../static/image/fenlei_icon_1@2x.png" mode=""></image>
  92 + <text class="classifyText">分类</text>
  93 + </view>
63 </view> 94 </view>
64 - </view>  
65 - <view style="margin: 0 30rpx 0 34rpx;" v-if="listTypecont.length>0&&activeStatus==1">  
66 - <view class="pintuanBox">  
67 - <view class="pintuanTop">  
68 - <view class="topLeft" style="display: flex;align-items: center;">  
69 - <view class="pinIcon">  
70 - <image src="/static/image/pintuan_icon@2x.png" mode="aspectFill"></image> 95 + <view style="margin: 0 30rpx 0 34rpx;" v-if="listTypecont.length>0&&activeStatus==1">
  96 + <view class="pintuanBox">
  97 + <view class="pintuanTop">
  98 + <view class="topLeft" style="display: flex;align-items: center;">
  99 + <view class="pinIcon">
  100 + <image src="/static/image/pintuan_icon@2x.png" mode="aspectFill"></image>
  101 + </view>
  102 + <view class="pinText">
  103 + 积分活动
  104 + </view>
71 </view> 105 </view>
72 - <view class="pinText">  
73 - 积分活动 106 + <view class="topRight" style="display: flex;align-items: center;" @click="allClassify">
  107 + <view class="mainText">
  108 + 全部
  109 + </view>
  110 + <view class="arrow">
  111 + <image src="/static/image/gengduo_icon_3@2x.png" mode=""></image>
  112 + </view>
74 </view> 113 </view>
75 </view> 114 </view>
76 - <view class="topRight" style="display: flex;align-items: center;" @click="allClassify">  
77 - <view class="mainText">  
78 - 全部  
79 - </view>  
80 - <view class="arrow">  
81 - <image src="/static/image/gengduo_icon_3@2x.png" mode=""></image>  
82 - </view> 115 + <view class="pintuanBottom">
  116 + <scroll-view class="scrool-more" scroll-x="true" scroll-with-animation="true">
  117 + <view class="scrollItem" v-for="(item,index) in listTypecont" :key="index"
  118 + v-if="index<=4" @click="goDetail(item.id)">
  119 + <image :src="item.img" mode="" class="scrollPic" mode="scaleToFill"></image>
  120 + <text class="label-name">{{item.title }}</text>
  121 + </view>
  122 + </scroll-view>
83 </view> 123 </view>
84 </view> 124 </view>
85 - <view class="pintuanBottom">  
86 - <scroll-view class="scrool-more" scroll-x="true" scroll-with-animation="true">  
87 - <view class="scrollItem" v-for="(item,index) in listTypecont" :key="index" v-if="index<=4"  
88 - @click="goDetail(item.id)">  
89 - <image :src="item.img" mode="" class="scrollPic" mode="scaleToFill"></image>  
90 - <text class="label-name">{{item.title }}</text>  
91 - </view>  
92 - </scroll-view>  
93 - </view>  
94 - </view>  
95 125
96 - </view>  
97 - <!-- 广告 -->  
98 - <view class="imgBox">  
99 - <ad unit-id="adunit-4a228d17f674b0ee"></ad>  
100 - <!-- <image :src="boardImg" mode=""></image> -->  
101 - </view>  
102 - <view class="tabBox" style="margin: 0 30rpx;padding-bottom: 100rpx;">  
103 - <view class="inv-h-w">  
104 - <block v-for="(item,index) in tabList" :key="index">  
105 - <view :class="['inv-h',tabIndex== index?'inv-h-se':'']" @click="changeTab(index)">{{item}}  
106 - </view>  
107 - </block>  
108 </view> 126 </view>
109 - <view class="locationBtn" v-if="noAddress" @click="startLocations">  
110 - 开启定位 127 + <!-- 广告 -->
  128 + <view class="imgBox">
  129 + <ad unit-id="adunit-4a228d17f674b0ee"></ad>
  130 + <!-- <image :src="boardImg" mode=""></image> -->
111 </view> 131 </view>
112 - <view class="" v-if="!noAddress">  
113 - <view class="selectBox" style="display: flex;margin-top: 45rpx;">  
114 - <view class="classify" style="display: flex;margin-right:50rpx;align-items: center;">  
115 - <view class="jvliText">  
116 - 距离 132 + <view class="tabBox" style="margin: 0 30rpx;padding-bottom: 100rpx;">
  133 + <view class="inv-h-w">
  134 + <block v-for="(item,index) in tabList" :key="index">
  135 + <view :class="['inv-h',tabIndex== index?'inv-h-se':'']" @click="changeTab(index)">{{item}}
117 </view> 136 </view>
118 - <view class="picker" style="position: relative;">  
119 - <picker @change="bindPickerChange" :value="index" :range="array" class="picker">  
120 - <view class="uni-input pickerIner">{{array[index]}}</view>  
121 - <view class="image" style="position: absolute;top: 0;left: 150rpx;"> 137 + </block>
  138 + </view>
  139 + <view class="locationBtn" v-if="noAddress" @click="startLocations">
  140 + 开启定位
  141 + </view>
  142 + <view class="" v-if="!noAddress">
  143 + <view class="selectBox" style="display: flex;margin-top: 45rpx;">
  144 + <view class="classify" style="display: flex;margin-right:50rpx;align-items: center;">
  145 + <view class="jvliText">
  146 + 距离
  147 + </view>
  148 + <view class="picker" style="position: relative;">
  149 + <picker @change="bindPickerChange" :value="index" :range="array" class="picker">
  150 + <view class="uni-input pickerIner">{{array[index]}}</view>
  151 + <view class="image" style="position: absolute;top: 0;left: 150rpx;">
  152 + <image src="/static/image/fenlei_icon_3@2x.png" mode=""
  153 + style="width: 28rpx;height: 28rpx;"></image>
  154 + </view>
  155 + </picker>
  156 + <view class="picker">
  157 +
  158 + </view>
  159 + <view class="image">
122 <image src="/static/image/fenlei_icon_3@2x.png" mode="" 160 <image src="/static/image/fenlei_icon_3@2x.png" mode=""
123 style="width: 28rpx;height: 28rpx;"></image> 161 style="width: 28rpx;height: 28rpx;"></image>
124 </view> 162 </view>
125 - </picker>  
126 - <view class="picker">  
127 -  
128 - </view>  
129 - <view class="image">  
130 - <image src="/static/image/fenlei_icon_3@2x.png" mode=""  
131 - style="width: 28rpx;height: 28rpx;"></image>  
132 </view> 163 </view>
133 </view> 164 </view>
134 - </view>  
135 - <view class="classify" style="display: flex;align-items: center;">  
136 - <view class="jvliText">  
137 - 分类  
138 - </view>  
139 - <view class="picker" style="position: relative;">  
140 - <picker @change="bindPickerChange1" :value="index1" :range="classArray" class="picker">  
141 - <view class="uni-input pickerIner">{{classArray[index1]}}</view>  
142 - <view class="image" style="position: absolute;top: 0;left: 146rpx;"> 165 + <view class="classify" style="display: flex;align-items: center;">
  166 + <view class="jvliText">
  167 + 分类
  168 + </view>
  169 + <view class="picker" style="position: relative;">
  170 + <picker @change="bindPickerChange1" :value="index1" :range="classArray"
  171 + class="picker">
  172 + <view class="uni-input pickerIner">{{classArray[index1]}}</view>
  173 + <view class="image" style="position: absolute;top: 0;left: 146rpx;">
  174 + <image src="/static/image/fenlei_icon_3@2x.png" mode=""
  175 + style="width: 28rpx;height: 28rpx;"></image>
  176 + </view>
  177 + </picker>
  178 + <view class="">
  179 +
  180 + </view>
  181 + <view class="image">
143 <image src="/static/image/fenlei_icon_3@2x.png" mode="" 182 <image src="/static/image/fenlei_icon_3@2x.png" mode=""
144 style="width: 28rpx;height: 28rpx;"></image> 183 style="width: 28rpx;height: 28rpx;"></image>
145 </view> 184 </view>
146 - </picker>  
147 - <view class="">  
148 -  
149 - </view>  
150 - <view class="image">  
151 - <image src="/static/image/fenlei_icon_3@2x.png" mode=""  
152 - style="width: 28rpx;height: 28rpx;"></image>  
153 </view> 185 </view>
154 </view> 186 </view>
155 </view> 187 </view>
156 - </view>  
157 - <view class="" v-if="tabIndex==0&&goodsList.length==0"  
158 - style="padding: 50rpx;text-align: center;color: #969799;">  
159 - 暂无符合要求的商品  
160 - </view>  
161 - <view class="" v-if="tabIndex == 0"  
162 - style="display: flex; justify-content: space-between;flex-wrap: wrap;margin-top: 44rpx;">  
163 - <view :class="item.goods_id!=undefined||item.title!=undefined?'goodsBox':'goodsBox1'"  
164 - v-for="(item,index) in goodsList" :key="index" style=""  
165 - @click="goGoodDetailXz(item.goods_id,item.title,item.ad_id)">  
166 - <!-- <view class="" v-if="item.goods_id!=undefined||item.title!=undefined"> -->  
167 - <view class="goodsPic">  
168 - <image :src="item.images[0]||item.title_image" class="goodImg" mode="aspectFill">  
169 - </image>  
170 - </view>  
171 - <view class="goodsDel">  
172 - {{item.goods_name?item.goods_name:item.title}}  
173 - </view>  
174 - <view class="goodsPrice" v-if="item.price">  
175 - <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text>  
176 - {{item.price||''}}  
177 - </view>  
178 - <view class="userInfo">  
179 - <view class="userLeft">  
180 - <view class="userHead">  
181 - <image :src="item.user.avatar||logo" class="userHead"></image> 188 + <view class="" v-if="tabIndex==0&&goodsList.length==0"
  189 + style="padding: 50rpx;text-align: center;color: #969799;">
  190 + 暂无符合要求的商品
  191 + </view>
  192 + <view class="" v-if="tabIndex == 0"
  193 + style="display: flex; justify-content: space-between;flex-wrap: wrap;margin-top: 44rpx;">
  194 + <view :class="item.goods_id!=undefined||item.title!=undefined?'goodsBox':'goodsBox1'"
  195 + v-for="(item,index) in goodsList" :key="index" style=""
  196 + @click="goGoodDetailXz(item.goods_id,item.title,item.ad_id)">
  197 + <!-- <view class="" v-if="item.goods_id!=undefined||item.title!=undefined"> -->
  198 + <view class="goodsPic">
  199 + <image :src="item.images[0]||item.title_image" class="goodImg" mode="widthFix">
  200 + </image>
  201 + </view>
  202 + <view class="goodsDel">
  203 + {{item.goods_name?item.goods_name:item.title}}
  204 + </view>
  205 + <view :class="item.price?'goodsPrice':'goodsPrices'">
  206 + <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text>
  207 + {{item.price||''}}
  208 + </view>
  209 + <view class="userInfo">
  210 + <view class="userLeft">
  211 + <view class="userHead">
  212 + <image :src="item.user.avatar||logo" class="userHead"></image>
  213 + </view>
  214 + <view class="userName">
  215 + {{item.user.nickname||'科欧社区淘'}}
  216 + </view>
182 </view> 217 </view>
183 - <view class="userName">  
184 - {{item.user.nickname||'科欧社区淘'}} 218 + <view class="userRight" style="display: flex;align-items: center;">
  219 + <image src="/static/image/zuanshi_icon_1@2x.png" mode=""
  220 + style="width:20rpx;height: 17rpx;margin-right: 12rpx;"></image>
  221 + <view class="" style="font-size:18rpx;color: #fff;padding-bottom: 6rpx;">
  222 + {{item.user.grade_status==0?'L0':item.user.grade_status==1?'L1':item.user.grade_status==2?'L2':item.user.grade_status==3?'L3':item.user.grade_status==4?'L4':item.user.grade_status==5?'L5':'广告'}}
  223 + </view>
  224 +
185 </view> 225 </view>
186 </view> 226 </view>
187 - <view class="userRight" style="display: flex;align-items: center;">  
188 - <image src="/static/image/zuanshi_icon_1@2x.png" mode=""  
189 - style="width:20rpx;height: 17rpx;margin-right: 12rpx;"></image>  
190 - <view class="" style="font-size:18rpx;color: #fff;padding-bottom: 6rpx;">  
191 - {{item.user.grade_status==0?'L0':item.user.grade_status==1?'L1':item.user.grade_status==2?'L2':item.user.grade_status==3?'L3':item.user.grade_status==4?'L4':'L5'}} 227 + <view class="addressMask">
  228 + <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image>
  229 + <view class="maskAddress"
  230 + style="max-width: 192rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
  231 + {{item.address||''}}
  232 + </view>
  233 + <view class="maskAddress" v-if="item!=null">
  234 + {{item.distance.toFixed(1)}}km
192 </view> 235 </view>
193 -  
194 </view> 236 </view>
  237 + <!-- </view> -->
195 </view> 238 </view>
196 - <view class="addressMask">  
197 - <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image>  
198 - <view class="maskAddress"  
199 - style="max-width: 192rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">  
200 - {{item.address||''}} 239 + </view>
  240 + <view class="" v-if="tabIndex==1&&goodsList1.length==0"
  241 + style="padding: 50rpx;text-align: center;color: #969799;">
  242 + 暂无符合要求的商品
  243 + </view>
  244 + <view class="" v-if="tabIndex == 1"
  245 + style="display: flex; justify-content: space-between;flex-wrap: wrap;margin-top: 44rpx;">
  246 + <view :class="item.id!=undefined||item.title!=undefined?'goodsBox':'goodsBox1'"
  247 + v-for="(item,index) in goodsList1" :key="index"
  248 + @click="goGoodDetailFx(item.id,item.title,item.ad_id)">
  249 + <view class="goodsPic">
  250 + <image :src="item.images[0]||item.title_image" mode="" class="goodImg"
  251 + mode="widthFix"></image>
201 </view> 252 </view>
202 - <view class="maskAddress" v-if="item!=null">  
203 - {{item.distance.toFixed(1)}}km 253 + <view class="goodsDel">
  254 + {{item.need_name||item.title}}
204 </view> 255 </view>
205 - </view>  
206 - <!-- </view> -->  
207 - </view>  
208 - </view>  
209 - <view class="" v-if="tabIndex==1&&goodsList1.length==0"  
210 - style="padding: 50rpx;text-align: center;color: #969799;">  
211 - 暂无符合要求的商品  
212 - </view>  
213 - <view class="" v-if="tabIndex == 1"  
214 - style="display: flex; justify-content: space-between;flex-wrap: wrap;margin-top: 44rpx;">  
215 - <view :class="item.id!=undefined||item.title!=undefined?'goodsBox':'goodsBox1'" v-for="(item,index) in goodsList1" :key="index"  
216 - @click="goGoodDetailFx(item.id,item.title,item.ad_id)">  
217 - <view class="goodsPic">  
218 - <image :src="item.images[0]||item.title_image" mode="" class="goodImg"></image>  
219 - </view>  
220 - <view class="goodsDel">  
221 - {{item.need_name||item.title}}  
222 - </view>  
223 - <view class="goodsPrice" v-if="item.price">  
224 - <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text>  
225 - {{item.price||''}}  
226 - </view>  
227 - <view class="userInfo">  
228 - <view class="userLeft">  
229 - <view class="userHead">  
230 - <image :src="item.user.avatar||logo" mode="" class="userHead"></image>  
231 - </view>  
232 - <view class="userName">  
233 - {{item.user.nickname||'科欧社区淘'}}  
234 - </view>  
235 - 256 + <view :class="item.price?'goodsPrice':'goodsPrices'">
  257 + <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text>
  258 + {{item.price||''}}
236 </view> 259 </view>
237 - <view class="userRight" style="display: flex;align-items: center;"  
238 - v-if="item.grade_status">  
239 - <image src="/static/image/zuanshi_icon_1@2x.png" mode=""  
240 - style="width:20rpx;height: 17rpx;margin-right: 12rpx;"></image>  
241 - <view class="" style="font-size:18rpx;color: #fff;padding-bottom: 6rpx;">  
242 - {{item.user.grade_status==0?'L0':item.user.grade_status==1?'L1':item.grade_status==2?'L2':item.grade_status==3?'L3':item.grade_status==4?'L4':'L5'}} 260 + <view class="userInfo">
  261 + <view class="userLeft">
  262 + <view class="userHead">
  263 + <image :src="item.user.avatar||logo" mode="" class="userHead"></image>
  264 + </view>
  265 + <view class="userName">
  266 + {{item.user.nickname||'科欧社区淘'}}
  267 + </view>
  268 +
243 </view> 269 </view>
  270 + <view class="userRight" style="display: flex;align-items: center;"
  271 + v-if="item.grade_status">
  272 + <image src="/static/image/zuanshi_icon_1@2x.png" mode=""
  273 + style="width:20rpx;height: 17rpx;margin-right: 12rpx;"></image>
  274 + <view class="" style="font-size:18rpx;color: #fff;padding-bottom: 6rpx;">
  275 + {{item.user.grade_status==0?'L0':item.user.grade_status==1?'L1':item.grade_status==2?'L2':item.grade_status==3?'L3':item.grade_status==4?'L4':'L5'}}
  276 + </view>
244 277
  278 + </view>
245 </view> 279 </view>
246 - </view>  
247 - <view class="addressMask">  
248 - <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image>  
249 - <view class="maskAddress"  
250 - style="max-width: 192rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">  
251 - {{item.address||''}}  
252 - </view>  
253 - <view class="maskAddress" v-if="item!=null">  
254 - {{item.distance.toFixed(1)}}km 280 + <view class="addressMask">
  281 + <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image>
  282 + <view class="maskAddress"
  283 + style="max-width: 192rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
  284 + {{item.address||''}}
  285 + </view>
  286 + <view class="maskAddress" v-if="item!=null">
  287 + {{item.distance.toFixed(1)}}km
  288 + </view>
255 </view> 289 </view>
256 </view> 290 </view>
257 </view> 291 </view>
258 </view> 292 </view>
259 </view> 293 </view>
260 </view> 294 </view>
261 - </view>  
262 - <view class="meFa">  
263 - <van-popup :show="show" position="bottom"  
264 - custom-style="height: 322rpx;border-top-left-radius: 50rpx;border-top-right-radius: 50rpx;"  
265 - @close="onClose">  
266 - <view class="meFaShow">  
267 - <view class="OnBuyProject" @click="OnBuyProject">  
268 - <image src="../../static/image/maixianzhi_icon@2x.png" style="width: 180rpx;height: 180rpx;"  
269 - mode=""></image> 295 + <view class="meFa">
  296 + <van-popup :show="show" position="bottom"
  297 + custom-style="height: 322rpx;border-top-left-radius: 50rpx;border-top-right-radius: 50rpx;"
  298 + @close="onClose">
  299 + <view class="meFaShow">
  300 + <view class="OnBuyProject" @click="OnBuyProject">
  301 + <image src="../../static/image/maixianzhi_icon@2x.png" style="width: 180rpx;height: 180rpx;"
  302 + mode=""></image>
  303 + </view>
  304 + <view class="OnMaiProject" @click="OnMaiProject">
  305 + <image src="../../static/image/faxuqiu_icon_1@2x.png" style="width: 180rpx;height: 180rpx;"
  306 + mode=""></image>
  307 + </view>
270 </view> 308 </view>
271 - <view class="OnMaiProject" @click="OnMaiProject">  
272 - <image src="../../static/image/faxuqiu_icon_1@2x.png" style="width: 180rpx;height: 180rpx;"  
273 - mode=""></image> 309 + <view class="onFaClose" @click="onClose">
  310 + <text class="onClose">取消</text>
274 </view> 311 </view>
275 - </view>  
276 - <view class="onFaClose" @click="onClose">  
277 - <text class="onClose">取消</text>  
278 - </view>  
279 - </van-popup>  
280 - </view>  
281 - <ul class="bottom">  
282 - <li @click="goIndex">  
283 - <image src="../../static/image/xianzhi_icon_1@2x.png" style="width: 48rpx;height: 44rpx;" mode="">  
284 - </image>  
285 - <text class="botTextXZ">闲置</text>  
286 - </li>  
287 - <li @click="goActuvity">  
288 - <image src="../../static/image/huodong_icon_5@2x.png" style="width: 48rpx;height: 44rpx;" mode="">  
289 - </image>  
290 - <text class="botText">活动</text>  
291 - </li>  
292 - <li @click="goFa">  
293 - <view class="fabu">  
294 - <image src="../../static/image/fabu_icon_1@2x.png" style="width: 88rpx;height: 88rpx;" mode=""> 312 + </van-popup>
  313 + </view>
  314 + <ul class="bottom">
  315 + <li @click="goIndex">
  316 + <image src="../../static/image/xianzhi_icon_1@2x.png" style="width: 48rpx;height: 44rpx;" mode="">
295 </image> 317 </image>
296 - <text class="botTextFa">发布</text>  
297 - </view>  
298 - </li>  
299 - <li @click="goMessage" style="position: relative;">  
300 - <image src="../../static/image/xiaoxi_icon_5@2x.png" style="width: 48rpx;height: 44rpx;" mode="">  
301 - </image>  
302 - <text class="botText">消息</text>  
303 - <view class="num" v-if="messageNum!==0">  
304 - {{messageNum>99?'99+':messageNum}}  
305 - </view>  
306 - </li>  
307 - <li @click="goMe">  
308 - <image src="../../static/image/wode_icon_5@2x.png" style="width: 48rpx;height: 44rpx;" mode=""></image>  
309 - <text class="botText">我的</text>  
310 - </li>  
311 - </ul> 318 + <text class="botTextXZ">闲置</text>
  319 + </li>
  320 + <li @click="goActuvity">
  321 + <image src="../../static/image/huodong_icon_5@2x.png" style="width: 48rpx;height: 44rpx;" mode="">
  322 + </image>
  323 + <text class="botText">活动</text>
  324 + </li>
  325 + <li @click="goFa">
  326 + <view class="fabu">
  327 + <image src="../../static/image/fabu_icon_1@2x.png" style="width: 88rpx;height: 88rpx;" mode="">
  328 + </image>
  329 + <text class="botTextFa">发布</text>
  330 + </view>
  331 + </li>
  332 + <li @click="goMessage" style="position: relative;">
  333 + <image src="../../static/image/xiaoxi_icon_5@2x.png" style="width: 48rpx;height: 44rpx;" mode="">
  334 + </image>
  335 + <text class="botText">消息</text>
  336 + <view class="num" v-if="messageNum!==0">
  337 + {{messageNum>99?'99+':messageNum}}
  338 + </view>
  339 + </li>
  340 + <li @click="goMe">
  341 + <image src="../../static/image/wode_icon_5@2x.png" style="width: 48rpx;height: 44rpx;" mode="">
  342 + </image>
  343 + <text class="botText">我的</text>
  344 + </li>
  345 + </ul>
  346 + </view>
312 </view> 347 </view>
313 </template> 348 </template>
314 349
@@ -316,6 +351,10 @@ @@ -316,6 +351,10 @@
316 import request from '../../utils/request.js' 351 import request from '../../utils/request.js'
317 export default { 352 export default {
318 onLoad: function(options) { 353 onLoad: function(options) {
  354 + if (uni.getStorageSync('newUser') != 2) {
  355 + this.demo = true
  356 + uni.setStorageSync('newUser', 2)
  357 + }
319 uni.setStorageSync('pid', options.userId) 358 uni.setStorageSync('pid', options.userId)
320 if (options.address) { 359 if (options.address) {
321 this.addressText = options.address 360 this.addressText = options.address
@@ -326,7 +365,7 @@ @@ -326,7 +365,7 @@
326 if (uni.getStorageSync('token')) { 365 if (uni.getStorageSync('token')) {
327 this.token = true 366 this.token = true
328 } 367 }
329 - if (uni.getStorageSync('fristEnter')) { 368 + if (uni.getStorageSync('fristEnter') && !this.demo) {
330 this.getLocations() 369 this.getLocations()
331 this.jfavtivity() 370 this.jfavtivity()
332 this.goodsXz() 371 this.goodsXz()
@@ -334,31 +373,41 @@ @@ -334,31 +373,41 @@
334 } 373 }
335 setTimeout(() => { 374 setTimeout(() => {
336 this.goodsXz()(); //发现需要 375 this.goodsXz()(); //发现需要
337 -  
338 }, 500) 376 }, 500)
339 }, 377 },
340 onShow: function() { 378 onShow: function() {
  379 + if (uni.getStorageSync('newUser') != 2) {
  380 + this.demo = true
  381 + uni.setStorageSync('newUser', 2)
  382 + }
  383 + // this.appLoginWx()
  384 + this.swiper();
341 this.getBoardList() //广告列表 385 this.getBoardList() //广告列表
342 let that = this 386 let that = this
343 - if (uni.getStorageSync("City") == "") {  
344 - this.getLocations();  
345 - } else {  
346 - that.addressText = uni.getStorageSync("City")  
347 - }  
348 - setTimeout(() => {  
349 - this.swiper();  
350 - this.classifyData(); //分类  
351 - this.jfavtivity(); //拼团  
352 - this.board() //广告  
353 - this.jvliSelect(); //距离选择  
354 - this.classifylistss(); //分类选择  
355 - this.messageNums() //留言个数  
356 387
  388 + setTimeout(() => {
  389 + if (!this.demo) {
  390 + if (uni.getStorageSync("City") == "") {
  391 + this.getLocations();
  392 + } else {
  393 + this.addressText = uni.getStorageSync("City")
  394 + }
  395 + // setTimeout(() => {
  396 + this.classifyData(); //分类
  397 + this.jfavtivity(); //拼团
  398 + this.board() //广告
  399 + this.jvliSelect(); //距离选择
  400 + this.classifylistss(); //分类选择
  401 + this.messageNums() //留言个数
  402 + // }, 500)
  403 + }
357 }, 500) 404 }, 500)
358 405
359 }, 406 },
360 data() { 407 data() {
361 return { 408 return {
  409 + demo:false, //操作演示
  410 + imgIndex: 1, //演示图片index
362 nowlocationLat: '', //每次进入维度 411 nowlocationLat: '', //每次进入维度
363 nowlocationLot: '', //每次进入经度 412 nowlocationLot: '', //每次进入经度
364 nowlocationAddress: '', //每次进入详细位置 413 nowlocationAddress: '', //每次进入详细位置
@@ -399,6 +448,7 @@ @@ -399,6 +448,7 @@
399 goodsList1: [], 448 goodsList1: [],
400 show: false, 449 show: false,
401 messageNum: 0, //消息个数 450 messageNum: 0, //消息个数
  451 + boardIndex: 0, //广告index
402 boardList: [], //广告列表 452 boardList: [], //广告列表
403 logo: '../../static/image/logo.jpg' 453 logo: '../../static/image/logo.jpg'
404 } 454 }
@@ -409,7 +459,8 @@ @@ -409,7 +459,8 @@
409 //分享 459 //分享
410 onShareAppMessage: function(e) { 460 onShareAppMessage: function(e) {
411 let title = '近邻交易，闲置不再闲置' 461 let title = '近邻交易，闲置不再闲置'
412 - let imgUrl = "/static/image/shareImg.png" 462 + // let imgUrl = "http://muying.qiniu.broing.cn/img_share@2x.png!share"
  463 + let imgUrl = "http://muying.qiniu.broing.cn/img_share@2x.png"
413 return { 464 return {
414 title: title, 465 title: title,
415 path: '/pages/index/index?userId=' + uni.getStorageSync('userInfo').id, 466 path: '/pages/index/index?userId=' + uni.getStorageSync('userInfo').id,
@@ -437,6 +488,63 @@ @@ -437,6 +488,63 @@
437 } 488 }
438 }, 489 },
439 methods: { 490 methods: {
  491 + appLoginWx() {
  492 + let that = this
  493 + uni.getProvider({
  494 + service: 'oauth',
  495 + success: function(res) {
  496 + if (~res.provider.indexOf('weixin')) {
  497 + uni.login({
  498 + provider: 'weixin',
  499 + success: function(loginRes) {
  500 + uni.setStorageSync('code', loginRes.code)
  501 + that.checkUser()
  502 + },
  503 + fail: () => {
  504 +
  505 + }
  506 + });
  507 + }
  508 + }
  509 + });
  510 + },
  511 + //判断新老用户
  512 + checkUser() {
  513 + request.post('/api/common/checkUser', {
  514 + code: uni.getStorageSync('code')
  515 + }).then(res => {
  516 + console.log(res, 'res')
  517 + if (res.data.is_set == 1) {
  518 + this.demo = false
  519 + this.compile()
  520 + } else {
  521 + this.demo = true
  522 + }
  523 + }).catch(err => {})
  524 + },
  525 + //操作演示
  526 + bottomClick() {
  527 + this.imgIndex += 1
  528 + },
  529 + compile() {
  530 + let that = this
  531 + uni.setStorageSync('newUser', 2)
  532 + that.demo = false
  533 + if (uni.getStorageSync("City") == "" && !that.demo) {
  534 + that.getLocations();
  535 + } else {
  536 + that.addressText = uni.getStorageSync("City")
  537 + }
  538 + setTimeout(() => {
  539 + that.swiper();
  540 + that.classifyData(); //分类
  541 + that.jfavtivity(); //拼团
  542 + that.board() //广告
  543 + that.jvliSelect(); //距离选择
  544 + that.classifylistss(); //分类选择
  545 + that.messageNums() //留言个数
  546 + }, 500)
  547 + },
440 login() { 548 login() {
441 uni.redirectTo({ 549 uni.redirectTo({
442 url: "/pages/index/login" 550 url: "/pages/index/login"
@@ -596,6 +704,10 @@ @@ -596,6 +704,10 @@
596 uni.navigateTo({ 704 uni.navigateTo({
597 url: '/pages/index/public-page?id=' + dataId 705 url: '/pages/index/public-page?id=' + dataId
598 }) 706 })
  707 + } else if (status == 1) {
  708 + uni.redirectTo({
  709 + url: '/pages/activity/activity'
  710 + })
599 } 711 }
600 712
601 }, 713 },
@@ -633,6 +745,7 @@ @@ -633,6 +745,7 @@
633 classifylistss() { 745 classifylistss() {
634 request.get("/api/index/fen", {}) 746 request.get("/api/index/fen", {})
635 .then(res => { 747 .then(res => {
  748 + this.classArray = []
636 let list = res.data.info 749 let list = res.data.info
637 list.forEach((item, index) => { 750 list.forEach((item, index) => {
638 this.classArray.push(item.name) 751 this.classArray.push(item.name)
@@ -702,34 +815,36 @@ @@ -702,34 +815,36 @@
702 }) 815 })
703 }, 816 },
704 //闲置商品 817 //闲置商品
705 - goGoodDetailXz(ids,title,boardId) {  
706 - if(title){ 818 + goGoodDetailXz(ids, title, boardId) {
  819 + if (title) {
707 uni.navigateTo({ 820 uni.navigateTo({
708 - url:'/pages/index/board-detail?id='+boardId 821 + url: '/pages/index/board-detail?id=' + boardId
709 }) 822 })
710 -  
711 - }else{ 823 +
  824 + } else {
712 uni.navigateTo({ 825 uni.navigateTo({
713 - url: "/pages/index/good-details?goos_id=" + ids + '&index=1' + '&lat=' + uni.getStorageSync(  
714 - 'lat') + '&lot=' + uni.getStorageSync('lot') + '&userId=' + uni.getStorageSync(  
715 - 'userInfo').id 826 + url: "/pages/index/good-details?goos_id=" + ids + '&index=1' + '&lat=' + uni
  827 + .getStorageSync(
  828 + 'lat') + '&lot=' + uni.getStorageSync('lot') + '&userId=' + uni.getStorageSync(
  829 + 'userInfo').id
716 }) 830 })
717 } 831 }
718 - 832 +
719 }, 833 },
720 //发现需要 834 //发现需要
721 - goGoodDetailFx(ids,title,boardId) {  
722 - if(title){ 835 + goGoodDetailFx(ids, title, boardId) {
  836 + if (title) {
723 uni.navigateTo({ 837 uni.navigateTo({
724 - url:'/pages/index/board-detail?id='+boardId 838 + url: '/pages/index/board-detail?id=' + boardId
725 }) 839 })
726 - }else{ 840 + } else {
727 uni.navigateTo({ 841 uni.navigateTo({
728 - url: "/pages/index/good-details?id=" + ids + '&index=2' + '&lat=' + uni.getStorageSync('lat') + 842 + url: "/pages/index/good-details?id=" + ids + '&index=2' + '&lat=' + uni.getStorageSync(
  843 + 'lat') +
729 '&lot=' + uni.getStorageSync('lot') + '&userId=' + uni.getStorageSync('userInfo').id 844 '&lot=' + uni.getStorageSync('lot') + '&userId=' + uni.getStorageSync('userInfo').id
730 }) 845 })
731 } 846 }
732 - 847 +
733 }, 848 },
734 //全部分类 849 //全部分类
735 allClassify() { 850 allClassify() {
@@ -741,10 +856,10 @@ @@ -741,10 +856,10 @@
741 getBoardList() { 856 getBoardList() {
742 let that = this 857 let that = this
743 request.post('/api/index/adList', { 858 request.post('/api/index/adList', {
744 - // lat2: uni.getStorageSync('lat'),  
745 - // lng2: uni.getStorageSync('lot')  
746 - lat2: '39.15935',  
747 - lng2: '117.23785' 859 + lat2: uni.getStorageSync('lat'),
  860 + lng2: uni.getStorageSync('lot')
  861 + // lat2: '39.15935',
  862 + // lng2: '117.23785'
748 }).then(res => { 863 }).then(res => {
749 this.boardList = res.data 864 this.boardList = res.data
750 }).catch(err => { 865 }).catch(err => {
@@ -760,7 +875,7 @@ @@ -760,7 +875,7 @@
760 id: that.index ? that.arrayList[that.index].id : '', 875 id: that.index ? that.arrayList[that.index].id : '',
761 sort_id: that.index1 ? that.ClassifyList[that.index1].id : '', 876 sort_id: that.index1 ? that.ClassifyList[that.index1].id : '',
762 page: that.pageNum, 877 page: that.pageNum,
763 - rows: 7 878 + rows: 6
764 }) 879 })
765 .then(res => { 880 .then(res => {
766 // res.data.data.forEach((item,index)=>{ 881 // res.data.data.forEach((item,index)=>{
@@ -776,13 +891,15 @@ @@ -776,13 +891,15 @@
776 // } 891 // }
777 // } 892 // }
778 // }) 893 // })
779 - if (res.data.data.length == 7) {  
780 - if (that.boardList.length > 0) {  
781 - res.data.data.push(that.boardList[that.pageNum - 1]) 894 + if (res.data.data.length == 6) {
  895 + res.data.data.push(that.boardList[that.boardIndex])
  896 + that.boardIndex += 1
  897 + if (that.boardIndex >= that.boardList.length) {
  898 + that.boardIndex = 0
782 } 899 }
783 } else { 900 } else {
784 - let list = that.boardList.splice(0, that.pageNum - 1)  
785 - res.data.data.concat(list) 901 + // let list = that.boardList.splice(0, that.pageNum - 1)
  902 + // res.data.data.concat(list)
786 } 903 }
787 let list = that.pageNum == 1 ? res.data.data : that.goodsList.concat(res.data.data) 904 let list = that.pageNum == 1 ? res.data.data : that.goodsList.concat(res.data.data)
788 this.goodsList = list 905 this.goodsList = list
@@ -797,18 +914,22 @@ @@ -797,18 +914,22 @@
797 lat2: uni.getStorageSync('lat'), 914 lat2: uni.getStorageSync('lat'),
798 lng2: uni.getStorageSync('lot'), 915 lng2: uni.getStorageSync('lot'),
799 page: that.pageNums, 916 page: that.pageNums,
800 - rows: 7, 917 + rows: 6,
801 id: this.index ? that.arrayList[that.index].id : "", 918 id: this.index ? that.arrayList[that.index].id : "",
802 sort_id: that.index1 ? that.ClassifyList[that.index1].id : '', 919 sort_id: that.index1 ? that.ClassifyList[that.index1].id : '',
803 }) 920 })
804 .then(res => { 921 .then(res => {
805 - if (res.data.data.length == 7) { 922 + if (res.data.data.length == 6) {
806 if (that.boardList.length > 0) { 923 if (that.boardList.length > 0) {
807 - res.data.data.push(that.boardList[that.pageNums - 1]) 924 + res.data.data.push(that.boardList[that.boardIndex])
  925 + that.boardIndex += 1
  926 + if (that.boardIndex >= that.boardList.length) {
  927 + that.boardIndex = 0
  928 + }
808 } 929 }
809 } else { 930 } else {
810 - var lists = that.boardList.splice(0, that.pageNums - 1)  
811 - res.data.data.concat(lists) 931 + // var lists = that.boardList.splice(0, that.pageNums - 1)
  932 + // res.data.data.concat(lists)
812 } 933 }
813 console.log(res.data.data, 'goodlist') 934 console.log(res.data.data, 'goodlist')
814 let list = that.pageNums == 1 ? res.data.data : that.goodsList1.concat(res.data.data) 935 let list = that.pageNums == 1 ? res.data.data : that.goodsList1.concat(res.data.data)
@@ -819,12 +940,14 @@ @@ -819,12 +940,14 @@
819 }, 940 },
820 //跳转发布需求 941 //跳转发布需求
821 OnMaiProject() { 942 OnMaiProject() {
  943 + this.show = false
822 uni.navigateTo({ 944 uni.navigateTo({
823 url: '/pages/issue/publish' 945 url: '/pages/issue/publish'
824 }); 946 });
825 }, 947 },
826 //跳转卖闲置 948 //跳转卖闲置
827 OnBuyProject() { 949 OnBuyProject() {
  950 + this.show = false
828 uni.navigateTo({ 951 uni.navigateTo({
829 url: '/pages/issue/betray' 952 url: '/pages/issue/betray'
830 }); 953 });
@@ -924,7 +1047,7 @@ @@ -924,7 +1047,7 @@
924 1047
925 }) 1048 })
926 }, 1049 },
927 - 1050 +
928 } 1051 }
929 } 1052 }
930 </script> 1053 </script>
@@ -1000,4 +1123,32 @@ @@ -1000,4 +1123,32 @@
1000 max-width: 60rpx; 1123 max-width: 60rpx;
1001 padding: 0 6rpx; 1124 padding: 0 6rpx;
1002 } 1125 }
  1126 +
  1127 + /* 演示 */
  1128 + .demoBox {
  1129 + width: 100%;
  1130 + height: 100%;
  1131 + /* overflow: hidden; */
  1132 + /* display: flex;
  1133 + align-items: flex-end;
  1134 + margin-bottom: -40rpx; */
  1135 + }
  1136 +
  1137 + .img {
  1138 + width: 750rpx;
  1139 + display: block;
  1140 + /* height:1624rpx; */
  1141 + }
  1142 +
  1143 + .btnBox {
  1144 + position: absolute;
  1145 + top: 50%;
  1146 + left: 42%;
  1147 + z-index: 5;
  1148 + color: #fff;
  1149 + padding: 10rpx 48rpx;
  1150 + box-sizing: border-box;
  1151 + border: 2rpx solid #fff;
  1152 + border-radius: 48rpx;
  1153 + }
1003 </style> 1154 </style>
1 <template> 1 <template>
2 <view class="container" style="padding: 0;"> 2 <view class="container" style="padding: 0;">
3 <view class="inputBox"> 3 <view class="inputBox">
4 - <input class="uni-input" @input="onKeyInput" placeholder="请输入搜索内容" style="padding: 0 32rpx;" v-model="inputValue" /> 4 + <input class="uni-input" @input="onKeyInput" placeholder="请输入搜索内容" style="padding: 0 32rpx;"
  5 + v-model="inputValue" />
5 <text class='searchText' @click="search" style="margin-top: 10rpx;">搜索</text> 6 <text class='searchText' @click="search" style="margin-top: 10rpx;">搜索</text>
6 </view> 7 </view>
7 <view class="tabBox" style="margin-top: 26rpx;padding: 0 32rpx;"> 8 <view class="tabBox" style="margin-top: 26rpx;padding: 0 32rpx;">
@@ -29,47 +30,51 @@ @@ -29,47 +30,51 @@
29 </view> 30 </view>
30 </view> 31 </view>
31 </view> --> 32 </view> -->
32 - <view class="" style="display: flex; justify-content: space-between;flex-wrap: wrap;margin-top: 26rpx;">  
33 - <view class="goodsBox " v-for="(item,index) in goodsList" :key="index" @click="goDetail(item.goods_id)"> 33 + <view class="" style="display: flex; justify-content: space-between;flex-wrap: wrap;margin-top: 26rpx;">
  34 + <view class="goodsBox " v-for="(item,index) in goodsList" :key="index"
  35 + @click="goDetail(item.goods_id,item.title,item.ad_id)">
34 <view class="goodsPic"> 36 <view class="goodsPic">
35 - <image :src="item.images[0]" mode="" class="goodImg"></image> 37 + <image :src="item.images[0]||item.title_image" mode="" class="goodImg"></image>
36 </view> 38 </view>
37 <view class="goodsDel"> 39 <view class="goodsDel">
38 - {{item.goods_name}} 40 + {{item.goods_name?item.goods_name:item.title}}
39 </view> 41 </view>
40 - <view class="goodsPrice"> 42 + <view :class="item.price?'goodsPrice':'goodsPrices'">
41 <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text> 43 <text style="font-size: 24rpx;margin-right: -6rpx;">￥</text>
42 {{item.price}} 44 {{item.price}}
43 </view> 45 </view>
44 <view class="userInfo"> 46 <view class="userInfo">
45 <view class="userLeft"> 47 <view class="userLeft">
46 <view class="userHead"> 48 <view class="userHead">
47 - <image :src="item.avatar" mode="" class="userHead"></image> 49 + <image :src="item.avatar||logo" mode="" class="userHead"></image>
48 </view> 50 </view>
49 <view class="userName"> 51 <view class="userName">
50 - {{item.nickname}} 52 + {{item.nickname||'科欧社区淘'}}
51 </view> 53 </view>
52 </view> 54 </view>
53 <view class="userRight"> 55 <view class="userRight">
54 - <image src="/static/image/zuanshi_icon_1@2x.png" mode="" style="width:20rpx;height: 17rpx;margin-right: 12rpx;"></image>  
55 - {{item.grade_status==0?'L0':item.grade_status==1?'L1':item.grade_status==2?'L2':item.grade_status==3?'L3':item.grade_status==4?'L4':'L5'}} 56 + <image src="/static/image/zuanshi_icon_1@2x.png" mode=""
  57 + style="width:20rpx;height: 17rpx;margin-right: 12rpx;"></image>
  58 + {{item.grade_status==0?'L0':item.grade_status==1?'L1':item.grade_status==2?'L2':item.grade_status==3?'L3':item.grade_status==4?'L4':item.grade_status==5?'L5':'广告'}}
56 </view> 59 </view>
57 </view> 60 </view>
58 <view class="addressMask"> 61 <view class="addressMask">
59 <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image> 62 <image src="/static/image/dingwei_icon_1@2x.png" mode=""></image>
60 - <view class="maskAddress" style="max-width: 104rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> 63 + <view class="maskAddress"
  64 + style="max-width: 104rpx;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
  65 + v-if="item.address">
61 {{item.address}} 66 {{item.address}}
62 </view> 67 </view>
63 - <view class="maskAddress">  
64 - {{item.dis}}km 68 + <view class="maskAddress" v-if="item!=null">
  69 + {{item.dis==undefined?item.distance.toFixed(2):item.dis.toFixed(2)}}km
65 </view> 70 </view>
66 </view> 71 </view>
67 </view> 72 </view>
68 </view> 73 </view>
69 </view> 74 </view>
70 - <view class="" v-if="goodsList.length==0" style="text-align: center;margin-top: 100rpx;color:grey;">  
71 - 暂无更多搜索结果  
72 - </view> 75 + <view class="" v-if="goodsList.length==0" style="text-align: center;margin-top: 100rpx;color:grey;">
  76 + 暂无更多搜索结果
  77 + </view>
73 </view> 78 </view>
74 </template> 79 </template>
75 80
@@ -77,35 +82,53 @@ @@ -77,35 +82,53 @@
77 import request from "../../utils/request.js" 82 import request from "../../utils/request.js"
78 export default { 83 export default {
79 onLoad(options) { 84 onLoad(options) {
80 - this.inputValue = options.kw;  
81 - this.searchResult(); 85 + this.inputValue = options.kw
  86 + this.getBoardList()
  87 + this.searchResult()
82 }, 88 },
83 - data(){  
84 - return{  
85 - pageNum:1,  
86 - inputValue:'', 89 + data() {
  90 + return {
  91 + pageNum: 1,
  92 + inputValue: '',
87 //距离 93 //距离
88 // array: [], 94 // array: [],
89 // index: 0, 95 // index: 0,
90 - q:1, 96 + q: 1,
91 //分类 97 //分类
92 - classifyId:[],  
93 - classId:'', 98 + classifyId: [],
  99 + classId: '',
94 classArray: [], 100 classArray: [],
95 index1: '', 101 index1: '',
96 - goodsList: [] 102 + goodsList: [],
  103 + boardIndex: 0, //广告index
  104 + boardList: [], //广告列表
  105 + logo: '../../static/image/logo.jpg'
97 } 106 }
98 }, 107 },
99 onReachBottom: function() { 108 onReachBottom: function() {
100 this.pageNum = this.pageNum + 1 109 this.pageNum = this.pageNum + 1
101 - this.searchResult 110 + this.searchResult()
102 }, 111 },
103 methods: { 112 methods: {
  113 + //广告列表
  114 + getBoardList() {
  115 + let that = this
  116 + request.post('/api/index/adList', {
  117 + lat2: uni.getStorageSync('lat'),
  118 + lng2: uni.getStorageSync('lot')
  119 + // lat2: '39.15935',
  120 + // lng2: '117.23785'
  121 + }).then(res => {
  122 + this.boardList = res.data
  123 + }).catch(err => {
  124 +
  125 + })
  126 + },
104 //分类选择 127 //分类选择
105 classifylist() { 128 classifylist() {
106 request.get('/api/index/fen', {}) 129 request.get('/api/index/fen', {})
107 .then(res => { 130 .then(res => {
108 - this.classifyId=res.data.info 131 + this.classifyId = res.data.info
109 let list = res.data.info 132 let list = res.data.info
110 list.forEach((item, index) => { 133 list.forEach((item, index) => {
111 this.classArray.push(item.name) 134 this.classArray.push(item.name)
@@ -115,13 +138,13 @@ @@ -115,13 +138,13 @@
115 }); 138 });
116 }, 139 },
117 //距离选择 140 //距离选择
118 - jlSort(){  
119 - this.q=Number(this.q)==1?'2':'1',  
120 - this.searchResult() 141 + jlSort() {
  142 + this.q = Number(this.q) == 1 ? '2' : '1',
  143 + this.searchResult()
121 }, 144 },
122 bindPickerChange1: function(e) { 145 bindPickerChange1: function(e) {
123 this.index1 = e.target.value 146 this.index1 = e.target.value
124 - this.classId=this.classifyId[this.index1].id 147 + this.classId = this.classifyId[this.index1].id
125 this.searchResult() 148 this.searchResult()
126 }, 149 },
127 onKeyInput(e) { 150 onKeyInput(e) {
@@ -132,30 +155,51 @@ @@ -132,30 +155,51 @@
132 // uni.navigateTo({ 155 // uni.navigateTo({
133 // url: '/pages/index/search-result?kw=' + this.inputValue 156 // url: '/pages/index/search-result?kw=' + this.inputValue
134 // }) 157 // })
  158 + this.boardIndex = 0
135 this.searchResult() 159 this.searchResult()
136 }, 160 },
137 //搜索结果 161 //搜索结果
138 searchResult() { 162 searchResult() {
139 - request.post('/api/index/Search', {  
140 - page:this.pageNum,  
141 - rows:10,  
142 - kw: this.inputValue,  
143 - lat2: this.latitude,  
144 - lng2: this.longitude,  
145 - q:this.q,  
146 - sort_id:this.classId  
147 - }).then(res => {  
148 - let list = this.pageNum == 1 ? res.data.info: this.list.concat(res.data.info);  
149 - this.goodsList=list  
150 - console.log(res.data)  
151 - }).catch(err => { 163 + if (this.inputValue == '') {
  164 + uni.showToast({
  165 + title: '请输入搜索内容',
  166 + icon: 'none'
  167 + })
  168 + } else {
  169 + request.post('/api/index/Search', {
  170 + page: this.pageNum,
  171 + rows: 6,
  172 + kw: this.inputValue,
  173 + lat2: this.latitude,
  174 + lng2: this.longitude,
  175 + q: this.q,
  176 + sort_id: this.classId
  177 + }).then(res => {
  178 + if (res.data.info.length == 6) {
  179 + res.data.info.push(this.boardList[this.boardIndex])
  180 + this.boardIndex += 1
  181 + if (this.boardIndex >= this.boardList.length) {
  182 + this.boardIndex = 0
  183 + }
  184 + }
  185 + let list = this.pageNum == 1 ? res.data.info : this.goodsList.concat(res.data.info);
  186 + this.goodsList = list
  187 + }).catch(err => {
152 188
153 - }) 189 + })
  190 + }
154 }, 191 },
155 - goDetail(id){  
156 - uni.navigateTo({  
157 - url:'/pages/index/good-details?goos_id='+id  
158 - }) 192 + goDetail(id, title, boardId) {
  193 + if (title) {
  194 + uni.navigateTo({
  195 + url: '/pages/index/board-detail?id=' + boardId
  196 + })
  197 + } else {
  198 + uni.navigateTo({
  199 + url: '/pages/index/good-details?goos_id=' + id
  200 + })
  201 + }
  202 +
159 } 203 }
160 }, 204 },
161 created() { 205 created() {
@@ -179,4 +223,8 @@ @@ -179,4 +223,8 @@
179 border-radius: 16rpx 16rpx 0 0; 223 border-radius: 16rpx 16rpx 0 0;
180 position: relative; 224 position: relative;
181 } 225 }
  226 +
  227 + .goodsPrices {
  228 + color: #fff !important;
  229 + }
182 </style> 230 </style>
@@ -15,10 +15,9 @@ @@ -15,10 +15,9 @@
15 </view> 15 </view>
16 <view class="searchList"> 16 <view class="searchList">
17 <view class="searchItem" v-for="(item,index) in list" :key="index"> 17 <view class="searchItem" v-for="(item,index) in list" :key="index">
18 - <view class="result" @click="pitchItem(item.kw)"> 18 + <view class="result" @click="pitchItem(item.kw)" v-if="index<=15">
19 {{item.kw}} 19 {{item.kw}}
20 </view> 20 </view>
21 -  
22 </view> 21 </view>
23 </view> 22 </view>
24 </view> 23 </view>
@@ -44,7 +43,7 @@ @@ -44,7 +43,7 @@
44 //历史搜索 43 //历史搜索
45 history() { 44 history() {
46 request.get('/api/index/liShi', {}).then(res => { 45 request.get('/api/index/liShi', {}).then(res => {
47 - this.list = res.data.info 46 + this.list = res.data.info.reverse()
48 }).catch(err => { 47 }).catch(err => {
49 48
50 }) 49 })
@@ -225,7 +225,7 @@ @@ -225,7 +225,7 @@
225 //分享 225 //分享
226 onShareAppMessage: function(e) { 226 onShareAppMessage: function(e) {
227 let title = '近邻交易，闲置不再闲置' 227 let title = '近邻交易，闲置不再闲置'
228 - let imgUrls="../../static/image/shareImg.png"+'!share' 228 + let imgUrls="http://muying.qiniu.broing.cn/img_share@2x.png"
229 return { 229 return {
230 title: title, 230 title: title,
231 path: "/pages/index/user-page?id=" + this.id + '&userId=' + uni.getStorageSync('userInfo').id, 231 path: "/pages/index/user-page?id=" + this.id + '&userId=' + uni.getStorageSync('userInfo').id,
@@ -344,6 +344,11 @@ @@ -344,6 +344,11 @@
344 title: '请输入商品描述', 344 title: '请输入商品描述',
345 icon: 'none' 345 icon: 'none'
346 }) 346 })
  347 + } else if (that.urlImg.length == 0) {
  348 + uni.showToast({
  349 + title: '请上传商品图片',
  350 + icon: 'none'
  351 + })
347 } else if (that.latitude == '') { 352 } else if (that.latitude == '') {
348 uni.showToast({ 353 uni.showToast({
349 title: '请进行位置选择', 354 title: '请进行位置选择',
@@ -359,7 +359,7 @@ @@ -359,7 +359,7 @@
359 title: '请选择新旧程度', 359 title: '请选择新旧程度',
360 icon: 'none' 360 icon: 'none'
361 }) 361 })
362 - } else if (that.wechat == nul) { 362 + } else if (this.wechat == null) {
363 uni.showToast({ 363 uni.showToast({
364 title: '请先设置微信号', 364 title: '请先设置微信号',
365 icon: 'none' 365 icon: 'none'
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 </view> 85 </view>
86 <view class="mesNavRight"> 86 <view class="mesNavRight">
87 <image :src="item.goods.images[0]" 87 <image :src="item.goods.images[0]"
88 - style="width: 130rpx;height: 130rpx;border-radius: 16rpx;" mode=""></image> 88 + style="width: 130rpx;height: 130rpx;border-radius: 16rpx;" mode="aspectFill"></image>
89 </view> 89 </view>
90 </view> 90 </view>
91 91