Commit 2cd0b0f44af9680f2afbd090aa4c9fdaa058ca3a
1 parent
c00dd2818b
Exists in
master
bug修复
Showing
4 changed files
with
226 additions
and
169 deletions
Show diff stats
src/pages/cart/cart.vue
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | <view class="cardHeader"> |
| 9 | 9 | <view |
| 10 | 10 | v-bind:class="pIsoPen? 'partentChecked' : 'partentCheck'" |
| 11 | - @click="pClick" | |
| 11 | + @click="pClick" | |
| 12 | 12 | > |
| 13 | 13 | <span class="correct"></span> |
| 14 | 14 | </view> |
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 | > |
| 27 | 27 | <view |
| 28 | 28 | v-bind:class="cartList[index].isChecked? 'partentChecked':'partentCheck'" |
| 29 | - @click="childClick(cartList[index],index)" | |
| 29 | + @click="childClick(cartList[index],index)" | |
| 30 | 30 | > |
| 31 | 31 | <span class="correct"></span> |
| 32 | 32 | </view> |
| ... | ... | @@ -46,18 +46,25 @@ |
| 46 | 46 | class="goodName" |
| 47 | 47 | @tap="toGoods(item.pid,item.sk_id)" |
| 48 | 48 | >{{item.p_name}}</view> |
| 49 | - <view class="describ" @click="showBottom(3,item.pid,item.sk_id,item.mp_id,item.cart_id,index)"> | |
| 50 | - <view class="desL"> | |
| 51 | - <view class="people"> | |
| 52 | - 使用人：{{item.peopleName}} | |
| 53 | - </view> | |
| 54 | - <view class="skuInfo"> | |
| 55 | - {{item.sku_name}} | |
| 56 | - </view> | |
| 57 | - </view> | |
| 58 | - <view class="desR"> | |
| 59 | - <image src="../../static/right.png" mode="aspectFit" style="width: 18rpx;height: 18rpx;"></image> | |
| 60 | - </view> | |
| 49 | + <view | |
| 50 | + class="describ" | |
| 51 | + @click="showBottom(3,item.pid,item.sk_id,item.mp_id,item.cart_id,index)" | |
| 52 | + > | |
| 53 | + <view class="desL"> | |
| 54 | + <view class="people"> | |
| 55 | + 使用人：{{item.peopleName}} | |
| 56 | + </view> | |
| 57 | + <view class="skuInfo"> | |
| 58 | + {{item.sku_name}} | |
| 59 | + </view> | |
| 60 | + </view> | |
| 61 | + <view class="desR"> | |
| 62 | + <image | |
| 63 | + src="../../static/right.png" | |
| 64 | + mode="aspectFit" | |
| 65 | + style="width: 18rpx;height: 18rpx;" | |
| 66 | + ></image> | |
| 67 | + </view> | |
| 61 | 68 | </view> |
| 62 | 69 | <view class="priceBox"> |
| 63 | 70 | <view class="price">￥{{item.nowPrice*item.num}}</view> |
| ... | ... | @@ -86,87 +93,101 @@ |
| 86 | 93 | <view class="footer"> |
| 87 | 94 | <view class="footerLeft">实付金额:<text>￥{{totalPrice}}</text></view> |
| 88 | 95 | <view class="footerRight"> |
| 89 | - <view class="paybtn" @click="toComfirmOrder">立即结算</view> | |
| 96 | + <view | |
| 97 | + class="paybtn" | |
| 98 | + @click="toComfirmOrder" | |
| 99 | + >立即结算</view> | |
| 90 | 100 | </view> |
| 91 | 101 | </view> |
| 92 | - <BottomSheet v-if="isShowBottom" :isCart="isCart" @addCart="addCart" :sk_id="sk_id" :propMpId="mp_id" @chooseCartModi="chooseCartModi" :cart_id="cart_id" | |
| 93 | - :index="cartIndex" | |
| 94 | - :pid="pid" :goodInfo="goodInfo" :isShowBottom="isShowBottom" @closeBottom="closeBottom"></BottomSheet> | |
| 102 | + <BottomSheet | |
| 103 | + v-if="isShowBottom" | |
| 104 | + :isCart="isCart" | |
| 105 | + @addCart="addCart" | |
| 106 | + :sk_id="sk_id" | |
| 107 | + :propMpId="mp_id" | |
| 108 | + @chooseCartModi="chooseCartModi" | |
| 109 | + :cart_id="cart_id" | |
| 110 | + :index="cartIndex" | |
| 111 | + :pid="pid" | |
| 112 | + :goodInfo="goodInfo" | |
| 113 | + :isShowBottom="isShowBottom" | |
| 114 | + @closeBottom="closeBottom" | |
| 115 | + ></BottomSheet> | |
| 95 | 116 | </view> |
| 96 | 117 | </template> |
| 97 | 118 | |
| 98 | 119 | <script> |
| 99 | 120 | |
| 100 | 121 | import store from '@/store' |
| 101 | -import BottomSheet from '../../components/BottomSheet/BottomSheet.vue'; | |
| 102 | -export default { | |
| 103 | - components:{ | |
| 104 | - BottomSheet, | |
| 105 | - }, | |
| 122 | +import BottomSheet from '../../components/BottomSheet/BottomSheet.vue' | |
| 123 | +export default { | |
| 124 | + components: { | |
| 125 | + BottomSheet, | |
| 126 | + }, | |
| 106 | 127 | data() { |
| 107 | 128 | return { |
| 108 | - pid:Number, | |
| 109 | - isCart:Number, | |
| 110 | - sk_id:String, | |
| 111 | - mp_id:String, | |
| 112 | - isShowBottom : false, //底部弹窗开关 | |
| 113 | - cart_id:Number, | |
| 114 | - maxCount: 20, | |
| 115 | - cartIndex:Number, | |
| 116 | - cartList:[] | |
| 129 | + pid: Number, | |
| 130 | + isCart: Number, | |
| 131 | + sk_id: String, | |
| 132 | + mp_id: String, | |
| 133 | + isShowBottom: false, // 底部弹窗开关 | |
| 134 | + cart_id: Number, | |
| 135 | + maxCount: 20, | |
| 136 | + cartIndex: Number, | |
| 137 | + cartList: [], | |
| 117 | 138 | } |
| 118 | 139 | }, |
| 119 | 140 | computed: { |
| 120 | - pIsoPen (){ | |
| 121 | - if (this.cartList.length > 0){ | |
| 122 | - return this.cartList.find(item => !item.isChecked) ? false : true; | |
| 123 | - } | |
| 124 | - return false | |
| 125 | - }, | |
| 126 | - goodInfo () { | |
| 141 | + pIsoPen () { | |
| 142 | + if (this.cartList.length > 0) { | |
| 143 | + return !this.cartList.find(item => !item.isChecked) | |
| 144 | + } | |
| 145 | + return false | |
| 146 | + }, | |
| 147 | + goodInfo () { | |
| 127 | 148 | return this.$store.state.read.goodInfo |
| 128 | - }, | |
| 129 | - totalPrice() { | |
| 130 | - let totalPrice = 0 | |
| 131 | - this.cartList.forEach((item)=>{ | |
| 132 | - if(item.isChecked){ | |
| 133 | - totalPrice += item.nowPrice * item.num; | |
| 149 | + }, | |
| 150 | + totalPrice() { | |
| 151 | + let totalPrice = 0 | |
| 152 | + this.cartList.forEach((item) => { | |
| 153 | + if (item.isChecked) { | |
| 154 | + totalPrice += item.nowPrice * item.num | |
| 134 | 155 | } |
| 135 | - }) | |
| 136 | - return totalPrice | |
| 137 | - } | |
| 138 | - }, | |
| 156 | + }) | |
| 157 | + return totalPrice | |
| 158 | + }, | |
| 159 | + }, | |
| 139 | 160 | onShow() { |
| 140 | - this.cartList = this.$store.state.cart.cartList; | |
| 161 | + this.cartList = this.$store.state.cart.cartList | |
| 141 | 162 | }, |
| 142 | 163 | onLoad: async function() { |
| 143 | 164 | await this.$store.dispatch('cart/getCartList', { |
| 144 | 165 | uid: this.$store.state.user.userInfo.uid, // 用户id |
| 145 | 166 | }) |
| 146 | - | |
| 147 | - this.cartList = this.$store.state.cart.cartList; | |
| 148 | - this.cartList.forEach((item)=>{ | |
| 167 | + | |
| 168 | + this.cartList = this.$store.state.cart.cartList | |
| 169 | + this.cartList.forEach((item) => { | |
| 149 | 170 | item.isChecked = false |
| 150 | - }) | |
| 171 | + }) | |
| 151 | 172 | }, |
| 152 | 173 | methods: { |
| 153 | - //全选按钮 | |
| 154 | - pClick(){ | |
| 155 | - let pStatus = this.cartList.find(item => !item.isChecked) ? false : true | |
| 156 | - let oldList = this.cartList; | |
| 157 | - oldList.forEach((item, index)=>{ | |
| 174 | + // 全选按钮 | |
| 175 | + pClick() { | |
| 176 | + const pStatus = !this.cartList.find(item => !item.isChecked) | |
| 177 | + const oldList = this.cartList | |
| 178 | + oldList.forEach((item, index) => { | |
| 158 | 179 | item.isChecked = !pStatus |
| 159 | - this.cartList.splice(index,1, item) | |
| 180 | + this.cartList.splice(index, 1, item) | |
| 160 | 181 | }) |
| 161 | 182 | }, |
| 162 | - //单选按钮 | |
| 163 | - childClick(type,index){ | |
| 183 | + // 单选按钮 | |
| 184 | + childClick(type, index) { | |
| 164 | 185 | this.cartList[index].isChecked = !this.cartList[index].isChecked |
| 165 | - //vue没有办法监听数组内部值的变化，所以需要通过这个方法去触发 | |
| 166 | - this.cartList.splice(index,1, this.cartList[index]) | |
| 186 | + // vue没有办法监听数组内部值的变化，所以需要通过这个方法去触发 | |
| 187 | + this.cartList.splice(index, 1, this.cartList[index]) | |
| 167 | 188 | }, |
| 168 | - //修改购物车 | |
| 169 | - chooseCartModi(mp_id,sk_id,price,pid,num,cart_id,index){ | |
| 189 | + // 修改购物车 | |
| 190 | + chooseCartModi(mp_id, sk_id, price, pid, num, cart_id, index) { | |
| 170 | 191 | // console.log('modi',mp_id,sk_id,price,pid,num,cart_id) |
| 171 | 192 | store.dispatch('cart/modiCart', { |
| 172 | 193 | uid: this.$store.state.user.userInfo.uid, |
| ... | ... | @@ -177,57 +198,57 @@ export default { |
| 177 | 198 | pid: pid, |
| 178 | 199 | num: num, |
| 179 | 200 | cart_id: cart_id, |
| 180 | - args: { | |
| 201 | + args: { | |
| 181 | 202 | index: index, |
| 182 | - }, | |
| 183 | - }) | |
| 184 | - this.$nextTick(function(){ | |
| 185 | - store.dispatch('cart/getCartList', { | |
| 186 | - uid: this.$store.state.user.userInfo.uid, // 用户id | |
| 187 | - }).then(()=>{ | |
| 188 | - this.cartList = this.$store.state.cart.cartList; | |
| 189 | - }) | |
| 203 | + }, | |
| 204 | + }) | |
| 205 | + this.$nextTick(function() { | |
| 206 | + store.dispatch('cart/getCartList', { | |
| 207 | + uid: this.$store.state.user.userInfo.uid, // 用户id | |
| 208 | + }).then(() => { | |
| 209 | + this.cartList = this.$store.state.cart.cartList | |
| 210 | + }) | |
| 190 | 211 | }) |
| 191 | 212 | }, |
| 192 | - //底部弹窗开关 | |
| 193 | - showBottom(isCart,pid,skId,mp_id,cart_id,index){ | |
| 213 | + // 底部弹窗开关 | |
| 214 | + showBottom(isCart, pid, skId, mp_id, cart_id, index) { | |
| 194 | 215 | store.dispatch('read/fetch', { |
| 195 | - pid, | |
| 196 | - sk_id: skId, | |
| 197 | - }).then(()=>{ | |
| 216 | + pid, | |
| 217 | + sk_id: skId, | |
| 218 | + }).then(() => { | |
| 198 | 219 | this.cartIndex = index |
| 199 | - this.sk_id = skId; | |
| 200 | - this.pid = pid; | |
| 201 | - this.mp_id = mp_id; | |
| 202 | - this.isCart = isCart; | |
| 203 | - this.cart_id = cart_id; | |
| 204 | - this.isShowBottom = true; | |
| 220 | + this.sk_id = skId | |
| 221 | + this.pid = pid | |
| 222 | + this.mp_id = mp_id | |
| 223 | + this.isCart = isCart | |
| 224 | + this.cart_id = cart_id | |
| 225 | + this.isShowBottom = true | |
| 205 | 226 | }) |
| 206 | 227 | }, |
| 207 | - closeBottom(){ | |
| 208 | - this.isShowBottom = false; | |
| 228 | + closeBottom() { | |
| 229 | + this.isShowBottom = false | |
| 209 | 230 | }, |
| 210 | - toGoods(id, sk_id) { | |
| 231 | + toGoods(id, skId) { | |
| 211 | 232 | uni.navigateTo({ |
| 212 | - url: '../frameDetail/frameDetail?pid=' + id + '&sk_id=' + sk_id, | |
| 233 | + url: '../details/details?pid=' + id + '&sk_id=' + skId, | |
| 213 | 234 | success: res => {}, |
| 214 | 235 | fail: () => {}, |
| 215 | 236 | complete: () => {}, |
| 216 | 237 | }) |
| 217 | 238 | }, |
| 218 | - toComfirmOrder(){ | |
| 219 | - this.$store.state.cart.checkedCartLst = this.cartList.filter(item => item.isChecked) | |
| 220 | - if(this.$store.state.cart.checkedCartLst.length>0){ | |
| 221 | - uni.navigateTo({ | |
| 222 | - url:`../confirmOrder/confirmOrder?isCart=true`, | |
| 223 | - }) | |
| 224 | - }else{ | |
| 225 | - uni.showToast({ | |
| 226 | - title:'您还没有选择宝贝哦~', | |
| 227 | - icon:'none' | |
| 228 | - }) | |
| 229 | - } | |
| 230 | - }, | |
| 239 | + toComfirmOrder() { | |
| 240 | + this.$store.state.cart.checkedCartLst = this.cartList.filter(item => item.isChecked) | |
| 241 | + if (this.$store.state.cart.checkedCartLst.length > 0) { | |
| 242 | + uni.navigateTo({ | |
| 243 | + url: '../confirmOrder/confirmOrder?isCart=true', | |
| 244 | + }) | |
| 245 | + } else { | |
| 246 | + uni.showToast({ | |
| 247 | + title: '您还没有选择宝贝哦~', | |
| 248 | + icon: 'none', | |
| 249 | + }) | |
| 250 | + } | |
| 251 | + }, | |
| 231 | 252 | counter(index, isadd, item) { |
| 232 | 253 | // console.log('item=====>', item) |
| 233 | 254 | // console.log('num=====>', item.num) |
| ... | ... | @@ -258,7 +279,7 @@ export default { |
| 258 | 279 | this.desDisabled = true |
| 259 | 280 | } else { |
| 260 | 281 | this.desDisabled = false |
| 261 | - | |
| 282 | + | |
| 262 | 283 | store.dispatch('cart/modiCart', { |
| 263 | 284 | uid: this.$store.state.user.userInfo.uid, |
| 264 | 285 | openid: this.$store.state.user.userInfo.openid, |
| ... | ... | @@ -276,14 +297,13 @@ export default { |
| 276 | 297 | this.desDisabled = true |
| 277 | 298 | } |
| 278 | 299 | } |
| 279 | - | |
| 280 | 300 | }, |
| 281 | 301 | delCart(cart_id, index) { |
| 282 | 302 | cart_id = parseInt(cart_id) |
| 283 | 303 | uni.showModal({ |
| 284 | 304 | title: '是否删除该商品', |
| 285 | 305 | success: function (res) { |
| 286 | - if (res.confirm) { | |
| 306 | + if (res.confirm) { | |
| 287 | 307 | store.dispatch('cart/delCart', { |
| 288 | 308 | uid: this.$store.state.user.userInfo.uid, |
| 289 | 309 | openid: this.$store.state.user.userInfo.openid, |
| ... | ... | @@ -292,7 +312,7 @@ export default { |
| 292 | 312 | }) |
| 293 | 313 | } |
| 294 | 314 | }.bind(this), |
| 295 | - }) | |
| 315 | + }) | |
| 296 | 316 | // this.cartList.splice(index,1) |
| 297 | 317 | }, |
| 298 | 318 | }, |
| ... | ... | @@ -407,7 +427,7 @@ export default { |
| 407 | 427 | align-items: flex-start; |
| 408 | 428 | justify-content: space-between; |
| 409 | 429 | min-height: 240rpx; |
| 410 | - width: 100%; | |
| 430 | + width: 100%; | |
| 411 | 431 | .goodName { |
| 412 | 432 | display: -webkit-box; |
| 413 | 433 | -webkit-box-orient: vertical; |
| ... | ... | @@ -420,23 +440,21 @@ export default { |
| 420 | 440 | .describ { |
| 421 | 441 | width: 100%; |
| 422 | 442 | min-height: 80rpx; |
| 423 | - background: #F9F9F9; | |
| 424 | - border-radius: 2px; | |
| 443 | + background: #f9f9f9; | |
| 444 | + border-radius: 2px; | |
| 425 | 445 | box-sizing: border-box; |
| 426 | 446 | padding: 10rpx; |
| 427 | 447 | font-size: 20rpx; |
| 428 | 448 | letter-spacing: -0.23px; |
| 429 | 449 | color: #999999; |
| 430 | - display: flex; | |
| 431 | - justify-content: space-between; | |
| 432 | - align-items: center; | |
| 433 | - .desL{ | |
| 434 | - | |
| 435 | - view{ | |
| 436 | - margin: 10rpx 0 10rpx 0 ; | |
| 437 | - } | |
| 438 | - } | |
| 439 | - | |
| 450 | + display: flex; | |
| 451 | + justify-content: space-between; | |
| 452 | + align-items: center; | |
| 453 | + .desL { | |
| 454 | + view { | |
| 455 | + margin: 10rpx 0 10rpx 0; | |
| 456 | + } | |
| 457 | + } | |
| 440 | 458 | } |
| 441 | 459 | .priceBox { |
| 442 | 460 | display: flex; |
| ... | ... | @@ -519,9 +537,9 @@ export default { |
| 519 | 537 | } |
| 520 | 538 | } |
| 521 | 539 | /* 隐藏滚动条 */ |
| 522 | - ::-webkit-scrollbar { | |
| 523 | - width: 0; | |
| 524 | - height: 0; | |
| 525 | - color: transparent; | |
| 526 | - } | |
| 527 | -</style> | |
| 528 | 540 | \ No newline at end of file |
| 541 | +::-webkit-scrollbar { | |
| 542 | + width: 0; | |
| 543 | + height: 0; | |
| 544 | + color: transparent; | |
| 545 | +} | |
| 546 | +</style> | ... | ... |
src/pages/details/details.vue
| ... | ... | @@ -371,10 +371,9 @@ export default { |
| 371 | 371 | } else { |
| 372 | 372 | myName = '【' + myName + '】' |
| 373 | 373 | } |
| 374 | - const uid = uni.getStorageSync('uid') | |
| 375 | 374 | return { |
| 376 | 375 | title: 'Hi，' + myName + '送你300元来试戴最新潮流眼镜！', // 默认是小程序的名称(可以写slogan等) |
| 377 | - path: '/pages/index/detail/index?uid=' + uid + '&sid=0&pid=' + this.pid, | |
| 376 | + path: '/pages/details/details?sid=0&pid=' + this.pid, | |
| 378 | 377 | imageUrl: this.skuList[0].pic, // 不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4 |
| 379 | 378 | success: function (res) { |
| 380 | 379 | if (res.errMsg === 'shareAppMessage:ok') { |
| ... | ... | @@ -461,6 +460,7 @@ export default { |
| 461 | 460 | .swiperImage { |
| 462 | 461 | width: 684rpx; |
| 463 | 462 | height: 480rpx; |
| 463 | + text-align: center; | |
| 464 | 464 | image { |
| 465 | 465 | max-width: 100%; |
| 466 | 466 | max-height: 100%; | ... | ... |
src/pages/index/index.vue
| ... | ... | @@ -198,6 +198,32 @@ export default { |
| 198 | 198 | showDrawer(e) { |
| 199 | 199 | this.$refs[e].open() |
| 200 | 200 | }, |
| 201 | + // 朋友圈设置页面 | |
| 202 | + onShareAppMessage() { | |
| 203 | + let myName = this.$store.state.user.userInfo.nickName | |
| 204 | + if (myName === '' || myName.length < 1 || myName === '匿名用户' || typeof myName === 'undefined') { | |
| 205 | + myName = '【神秘人】' | |
| 206 | + } else { | |
| 207 | + myName = '【' + myName + '】' | |
| 208 | + } | |
| 209 | + return { | |
| 210 | + title: 'Hi，' + myName + '送你300元来试戴最新潮流眼镜！', // 默认是小程序的名称(可以写slogan等) | |
| 211 | + path: '/pages/index/index', | |
| 212 | + // imageUrl: '/static/img/details/d1.png', // 不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4 | |
| 213 | + success: function (res) { | |
| 214 | + if (res.errMsg === 'shareAppMessage:ok') { | |
| 215 | + console.log('分享成功！', res) | |
| 216 | + } | |
| 217 | + }, | |
| 218 | + fail: function (res) { | |
| 219 | + if (res.errMsg === 'shareAppMessage:fail cancel') { | |
| 220 | + console.log('fail', '放弃分享') | |
| 221 | + } else if (res.errMsg === 'shareAppMessage:fail') { | |
| 222 | + console.log('fail', '分享失败') | |
| 223 | + } | |
| 224 | + }, | |
| 225 | + } | |
| 226 | + }, | |
| 201 | 227 | getList() { |
| 202 | 228 | store.dispatch('index/list') |
| 203 | 229 | this.isLoading = false // TODO:::这里不知道怎么改，请同学帮忙写一下。 | ... | ... |
src/pages/user/user.vue
| ... | ... | @@ -36,16 +36,16 @@ |
| 36 | 36 | <button @tap="chatOur(2)">客服2</button> |
| 37 | 37 | </view> |
| 38 | 38 | </uni-popup> |
| 39 | -<!-- <scroll-view | |
| 39 | + <!-- <scroll-view | |
| 40 | 40 | enable-flex |
| 41 | 41 | @scrolltolower="handleScrolltolower" |
| 42 | 42 | scroll-y |
| 43 | 43 | style="height: 1000px;" |
| 44 | 44 | > --> |
| 45 | - <view | |
| 46 | - v-if="isAuth" | |
| 47 | - class="content" | |
| 48 | - > | |
| 45 | + <view | |
| 46 | + v-if="isAuth" | |
| 47 | + class="content" | |
| 48 | + > | |
| 49 | 49 | <view class="userInfo"> |
| 50 | 50 | <view class="info"> |
| 51 | 51 | <image |
| ... | ... | @@ -135,13 +135,16 @@ |
| 135 | 135 | </view> |
| 136 | 136 | <image src="../../static/right.png" mode="aspectFit"></image> |
| 137 | 137 | </view> --> |
| 138 | - <view class="item"> | |
| 138 | + <view | |
| 139 | + @tap="toAddress" | |
| 140 | + class="item" | |
| 141 | + > | |
| 139 | 142 | <image |
| 140 | 143 | src="../../static/address-icon.png" |
| 141 | 144 | mode="aspectFit" |
| 142 | 145 | ></image> |
| 143 | 146 | <view class="left"> |
| 144 | - <text @tap="toAddress">地址管理</text> | |
| 147 | + <text>地址管理</text> | |
| 145 | 148 | <image |
| 146 | 149 | class="image2" |
| 147 | 150 | src="../../static/right.png" |
| ... | ... | @@ -150,26 +153,32 @@ |
| 150 | 153 | </view> |
| 151 | 154 | |
| 152 | 155 | </view> |
| 153 | - <view class="item"> | |
| 156 | + <view | |
| 157 | + @tap="introduce" | |
| 158 | + class="item" | |
| 159 | + > | |
| 154 | 160 | <image |
| 155 | 161 | src="../../static/img/user/introduce.png" |
| 156 | 162 | mode="aspectFit" |
| 157 | 163 | ></image> |
| 158 | 164 | <view class="left"> |
| 159 | - <text @tap="introduce">系统介绍</text> | |
| 165 | + <text>系统介绍</text> | |
| 160 | 166 | <image |
| 161 | 167 | src="../../static/right.png" |
| 162 | 168 | mode="aspectFit" |
| 163 | 169 | ></image> |
| 164 | 170 | </view> |
| 165 | 171 | </view> |
| 166 | - <view class="item"> | |
| 172 | + <view | |
| 173 | + @tap="joinUs" | |
| 174 | + class="item" | |
| 175 | + > | |
| 167 | 176 | <image |
| 168 | 177 | src="../../static/img/user/joinUs.png" |
| 169 | 178 | mode="aspectFit" |
| 170 | 179 | ></image> |
| 171 | 180 | <view class="left"> |
| 172 | - <text @tap="joinUs">加入我们</text> | |
| 181 | + <text>加入我们</text> | |
| 173 | 182 | <image |
| 174 | 183 | src="../../static/right.png" |
| 175 | 184 | mode="aspectFit" |
| ... | ... | @@ -198,26 +207,30 @@ |
| 198 | 207 | </view> |
| 199 | 208 | <!-- 商品列表 --> |
| 200 | 209 | <view class="goods-list"> |
| 201 | -<!-- <scroll-view | |
| 210 | + <!-- <scroll-view | |
| 202 | 211 | enable-flex |
| 203 | 212 | @scrolltolower="handleScrolltolower" |
| 204 | 213 | scroll-y |
| 205 | 214 | class="product-list" |
| 206 | 215 | > --> |
| 207 | - <view class="product-list"> | |
| 216 | + <view class="product-list"> | |
| 208 | 217 | <view |
| 209 | 218 | class="product" |
| 210 | 219 | v-for="(item, index) in userRecommandList" |
| 211 | 220 | :key="index" |
| 212 | 221 | > |
| 213 | - <Card :goods="item" :scrollTop="scrollTop" :viewHeight="viewHeight"></Card> | |
| 222 | + <Card | |
| 223 | + :goods="item" | |
| 224 | + :scrollTop="scrollTop" | |
| 225 | + :viewHeight="viewHeight" | |
| 226 | + ></Card> | |
| 214 | 227 | </view> |
| 215 | - </view> | |
| 228 | + </view> | |
| 216 | 229 | <!-- </scroll-view> --> |
| 217 | 230 | <view class="loading-text">{{loadingText}}</view> |
| 218 | 231 | </view> |
| 219 | 232 | </view> |
| 220 | - </view> | |
| 233 | + </view> | |
| 221 | 234 | <view |
| 222 | 235 | v-else |
| 223 | 236 | class="auth" |
| ... | ... | @@ -232,7 +245,7 @@ |
| 232 | 245 | @getuserinfo="onGotUserInfo" |
| 233 | 246 | >授权登陆</button> |
| 234 | 247 | </view> |
| 235 | - <!-- </scroll-view> --> | |
| 248 | + <!-- </scroll-view> --> | |
| 236 | 249 | </view> |
| 237 | 250 | </template> |
| 238 | 251 | |
| ... | ... | @@ -244,21 +257,21 @@ import UniPopup from '@/components/UniPopup/uni-popup.vue' |
| 244 | 257 | export default { |
| 245 | 258 | components: { |
| 246 | 259 | Card, |
| 247 | - UniPopup | |
| 260 | + UniPopup, | |
| 248 | 261 | }, |
| 249 | 262 | data() { |
| 250 | 263 | return { |
| 251 | 264 | isAuth: true, // 是否显示授权页面, |
| 252 | 265 | pagesnum: 1, // 分页请求初始值 |
| 253 | - whichTap: 0 ,// 弹窗渲染选择条件 | |
| 266 | + whichTap: 0, // 弹窗渲染选择条件 | |
| 254 | 267 | loadingText: '到底了', |
| 255 | 268 | scrollTop: 0, |
| 256 | 269 | viewHeight: uni.getSystemInfoSync().windowHeight, |
| 257 | 270 | } |
| 258 | 271 | }, |
| 259 | - onPageScroll({scrollTop}) { | |
| 272 | + onPageScroll({ scrollTop }) { | |
| 260 | 273 | // 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件 |
| 261 | - this.scrollTop = scrollTop; | |
| 274 | + this.scrollTop = scrollTop | |
| 262 | 275 | }, |
| 263 | 276 | onLoad() { |
| 264 | 277 | // 判断是否授权 |
| ... | ... | @@ -270,12 +283,12 @@ export default { |
| 270 | 283 | } else { |
| 271 | 284 | this.isAuth = false |
| 272 | 285 | } |
| 273 | - } | |
| 286 | + }, | |
| 274 | 287 | }) |
| 275 | 288 | store.dispatch('userRecommand/getRecommandList', { |
| 276 | 289 | uid: this.$store.state.user.userInfo.uid, |
| 277 | 290 | openid: this.$store.state.user.userInfo.openid, |
| 278 | - page: this.pagesnum | |
| 291 | + page: this.pagesnum, | |
| 279 | 292 | }) |
| 280 | 293 | }, |
| 281 | 294 | onReachBottom() { |
| ... | ... | @@ -284,7 +297,7 @@ export default { |
| 284 | 297 | store.dispatch('userRecommand/getRecommandList', { |
| 285 | 298 | uid: this.$store.state.user.userInfo.uid, |
| 286 | 299 | openid: this.$store.state.user.userInfo.openid, |
| 287 | - page: this.pagesnum | |
| 300 | + page: this.pagesnum, | |
| 288 | 301 | }) |
| 289 | 302 | }, |
| 290 | 303 | computed: { |
| ... | ... | @@ -295,9 +308,9 @@ export default { |
| 295 | 308 | return this.$store.state.user.userInfo.headerphoto |
| 296 | 309 | }, |
| 297 | 310 | userRecommandList() { |
| 298 | - console.log('userRecommandList=====>',this.$store.state.userRecommand.recommandList) | |
| 311 | + console.log('userRecommandList=====>', this.$store.state.userRecommand.recommandList) | |
| 299 | 312 | return this.$store.state.userRecommand.recommandList |
| 300 | - } | |
| 313 | + }, | |
| 301 | 314 | }, |
| 302 | 315 | methods: { |
| 303 | 316 | // 弹窗 |
| ... | ... | @@ -308,11 +321,11 @@ export default { |
| 308 | 321 | chatOur(item) { |
| 309 | 322 | if (item === 1) { |
| 310 | 323 | uni.makePhoneCall({ |
| 311 | - phoneNumber: 13376189297 // 客服1 电话 | |
| 324 | + phoneNumber: 13376189297, // 客服1 电话 | |
| 312 | 325 | }) |
| 313 | 326 | } else { |
| 314 | 327 | uni.makePhoneCall({ |
| 315 | - phoneNumber: 18014995101 // 客服2 电话 | |
| 328 | + phoneNumber: 18014995101, // 客服2 电话 | |
| 316 | 329 | }) |
| 317 | 330 | } |
| 318 | 331 | }, |
| ... | ... | @@ -330,19 +343,19 @@ export default { |
| 330 | 343 | url: '../address/addressList', |
| 331 | 344 | success: res => {}, |
| 332 | 345 | fail: () => {}, |
| 333 | - complete: () => {} | |
| 346 | + complete: () => {}, | |
| 334 | 347 | }) |
| 335 | 348 | }, |
| 336 | 349 | introduce() { |
| 337 | 350 | uni.showModal({ |
| 338 | 351 | content: '这是一款眼镜及周边产品的销售平台，我们将帮您进行建立全球销售网络，欢迎入住。', |
| 339 | - showCancel: false | |
| 352 | + showCancel: false, | |
| 340 | 353 | }) |
| 341 | 354 | }, |
| 342 | 355 | joinUs() { |
| 343 | 356 | uni.showModal({ |
| 344 | 357 | content: '本平台欢迎全国各地的眼镜工厂、品牌、眼镜店加入。请联系我们申请注册账号', |
| 345 | - showCancel: false | |
| 358 | + showCancel: false, | |
| 346 | 359 | }) |
| 347 | 360 | }, |
| 348 | 361 | toMyOrder(status) { |
| ... | ... | @@ -350,15 +363,15 @@ export default { |
| 350 | 363 | url: `../myOrder/myOrder?status=${status}`, |
| 351 | 364 | success: res => {}, |
| 352 | 365 | fail: () => {}, |
| 353 | - complete: () => {} | |
| 366 | + complete: () => {}, | |
| 354 | 367 | }) |
| 355 | 368 | }, |
| 356 | 369 | toOpticsData() { |
| 357 | 370 | uni.navigateTo({ |
| 358 | - url: '../addOpticsData/addOpticsData' | |
| 371 | + url: '../addOpticsData/addOpticsData', | |
| 359 | 372 | }) |
| 360 | - } | |
| 361 | - } | |
| 373 | + }, | |
| 374 | + }, | |
| 362 | 375 | } |
| 363 | 376 | </script> |
| 364 | 377 | |
| ... | ... | @@ -376,7 +389,7 @@ export default { |
| 376 | 389 | background-color: #f2f2f2; |
| 377 | 390 | } |
| 378 | 391 | .userInfo { |
| 379 | - background-image: linear-gradient(270deg, #f79067 0%, #FF5F3B 66%); | |
| 392 | + background-image: linear-gradient(270deg, #f79067 0%, #ff5f3b 66%); | |
| 380 | 393 | width: 100%; |
| 381 | 394 | height: 240rpx; |
| 382 | 395 | color: #ffffff; |
| ... | ... | @@ -472,7 +485,7 @@ export default { |
| 472 | 485 | flex-direction: row; |
| 473 | 486 | justify-content: space-between; |
| 474 | 487 | align-items: center; |
| 475 | - border-bottom: 1px solid #F5F5F5; | |
| 488 | + border-bottom: 1px solid #f5f5f5; | |
| 476 | 489 | font-weight: bold; |
| 477 | 490 | font-size: 18px; |
| 478 | 491 | color: #333333; |
| ... | ... | @@ -538,7 +551,7 @@ export default { |
| 538 | 551 | align-items: center; |
| 539 | 552 | justify-content: space-between; |
| 540 | 553 | height: 72rpx; |
| 541 | - border-bottom: 1px solid #F2F2F2; | |
| 554 | + border-bottom: 1px solid #f2f2f2; | |
| 542 | 555 | image { |
| 543 | 556 | margin-right: 0; |
| 544 | 557 | height: 16px; |
| ... | ... | @@ -550,9 +563,9 @@ export default { |
| 550 | 563 | width: 40rpx; |
| 551 | 564 | height: 44rpx; |
| 552 | 565 | } |
| 553 | - .lastLeft{ | |
| 554 | - border-bottom: none; | |
| 555 | - } | |
| 566 | + .lastLeft { | |
| 567 | + border-bottom: none; | |
| 568 | + } | |
| 556 | 569 | } |
| 557 | 570 | } |
| 558 | 571 | .recommend { | ... | ... |