diff --git a/components/cartData.vue b/components/cartData.vue index 274aa39..062505f 100644 --- a/components/cartData.vue +++ b/components/cartData.vue @@ -8,12 +8,12 @@ - + 全选 - + 清空 @@ -23,7 +23,7 @@ - + diff --git a/pages/index/index.vue b/pages/index/index.vue index 9fe3e7b..ab461d7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -20,7 +20,7 @@ - + @@ -93,22 +93,22 @@ ], menuList: [ { - path: '' + path: '/subPackages/techan/index?idIndex=0' }, { - path: '' + path: '/subPackages/techan/index?idIndex=1' }, { - path: '' + path: '/subPackages/techan/index?idIndex=2' }, { - path: '' + path: '/subPackages/techan/index?idIndex=3' }, { - path: '' + path: '/subPackages/techan/index?idIndex=4' }, { - path: '' + path: '/subPackages/techan/index?idIndex=5' } ], handwrittenList: [ @@ -150,6 +150,11 @@ }, 1000); }, methods: { + goTeChan (item) { + uni.navigateTo({ + url: item.path + }) + }, // 瀑布流 getColumnItems(columnIndex) { const columnItems = []; diff --git a/subPackages/letter/detail.vue b/subPackages/letter/detail.vue index fef619c..6bf3489 100644 --- a/subPackages/letter/detail.vue +++ b/subPackages/letter/detail.vue @@ -14,14 +14,15 @@ {{detail.title}} - + {{detail.author}} - - {{detail.view}} - - {{detail.view}} + + + {{handleNum(detail.star)}} + + {{handleNum(detail.view)}} @@ -46,7 +47,19 @@ } this.detail = res.data; }); - } + }, + methods: { + likeAricle (item) { + + }, + handleNum (num) { + if (num<=0) { return 0 } + if (num>=1000) { + return (num/1000).toFixed(1)+'k' + } + return num + }, + }, } @@ -97,7 +110,7 @@ image { width: 48rpx; height: 48rpx; - border-radius: 50%; + // border-radius: 50%; margin-right: 12rpx; } } diff --git a/subPackages/letter/index.vue b/subPackages/letter/index.vue index 50cc418..aac75e0 100644 --- a/subPackages/letter/index.vue +++ b/subPackages/letter/index.vue @@ -7,17 +7,18 @@ {{item.title}} - {{item.title}} + {{item.subtitle}} - + {{item.author}} - - {{item.view}} - - {{item.view}} + + + {{handleNum(item.star)}} + + {{handleNum(item.view)}} @@ -33,18 +34,18 @@ return { list: [], finished: false, - headImg: '' + headImg: 'https://cgc.js-dyyj.com/uploads/20250513/b9f5f5b2b90d8df29247c6aa4f452eaa.png' } }, onReady() { - this.getHeadImg('shuhui').then(res => {this.headImg = res}) + // this.getHeadImg('shuhui').then(res => {this.headImg = res}) this.getArticleByType() }, methods: { // 游记攻略 getArticleByType() { this.Post({ - type_id: 46, + type_id: 1, offset: this.list.length, limit: 10 },'/api/Article/getArticleByType').then(res => { @@ -53,11 +54,16 @@ } this.list = [...this.list, ...res.data] }) + }, + likeAricle (item) { + }, handleNum (num) { + if (num<=0) { return 0 } if (num>=1000) { return (num/1000).toFixed(1)+'k' - } + } + return num }, }, //下拉触底事件 @@ -83,7 +89,7 @@ } .article-container{ - margin-top: -15rpx; + margin-top: -22rpx; width: 100%; background: #FFFFFF; border-radius: 24rpx ; @@ -123,10 +129,10 @@ color: #848484; image { - width: 26rpx; - height: 26rpx; + width: 32rpx; + height: 32rpx; margin-right: 6rpx; - vertical-align: text-bottom; + vertical-align: middle; } } } diff --git a/subPackages/techan/detail.vue b/subPackages/techan/detail.vue index 6c47d8a..1c91b9e 100644 --- a/subPackages/techan/detail.vue +++ b/subPackages/techan/detail.vue @@ -64,13 +64,11 @@ - 购物车 - - 加入购物车 @@ -83,8 +81,7 @@ - 购物车 diff --git a/subPackages/techan/index.vue b/subPackages/techan/index.vue index 91dd487..c3357b7 100644 --- a/subPackages/techan/index.vue +++ b/subPackages/techan/index.vue @@ -101,7 +101,7 @@ - + @@ -184,14 +184,16 @@ // 导航栏参数 height: 0, statusBarHeight: 0, - headImg: null, + headImg: "https://cgc.js-dyyj.com/uploads/20250513/f8b255f965efcd71b6843e4b72c3f1f3.png", typeParam: [ - {id: 60, title: ''},{id: 59, title: ''},{id: 60, title: ''}, - {id: 1, title: ''},{id: 1, title: ''},{id: 1, title: ''}, - {id: 1, title: ''},{id: 1, title: ''},{id: 1, title: ''}, - {id: 1, title: ''},{id: 1, title: ''},{id: 1, title: ''}, - {id: 1, title: ''},{id: 1, title: ''},{id: 1, title: ''}, + {id: 45, title: '味 | WEI'}, + {id: 46, title: '服 | FU'}, + {id: 47, title: '器 | QI'}, + {id: 48, title: '香 | XIANG'}, + {id: 49, title: '饰 | SHI'}, + {id: 50, title: '艺 | YI'}, + ], typeIndex: 0, list:[], @@ -211,7 +213,14 @@ } }, onLoad(options) { - this.getHeadImg("techan").then(res => {this.headImg = res}) + // this.getHeadImg("techan").then(res => {this.headImg = res}) + if (options.idIndex) { + try { + this.typeIndex = Number(options.idIndex) + } catch(e) { + this.typeIndex = 0 + } + } }, onReady() { diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue index 9d0f747..1bde981 100644 --- a/subPackages/techan/order.vue +++ b/subPackages/techan/order.vue @@ -461,15 +461,15 @@ export default { let postPrice = 0 let allPrice = 0 - if (this.info && Array.isArray(this.info.goods)) { this.info.goods.forEach(v=>{ allPrice += v.skuInfo.money*v.skuInfo.buyNum if (this.info.is_post == 1) { - postPrice+=v.post + postPrice+=(v.post || 0) } }) } + console.log(postPrice) this.allprice = allPrice + postPrice if (this.coupon) { if (this.coupon.percent == 0) {