diff --git a/main.js b/main.js index 72e5195..2ecd1bb 100644 --- a/main.js +++ b/main.js @@ -32,18 +32,32 @@ export function createApp() { const userInfo = uni.getStorageSync('userInfo') || {}; const logoName = uni.getStorageSync('logoName') || '' const logoImage = uni.getStorageSync('logoImage') || '' + + let path = '/pages/index/index' + + if(userInfo.id){ + path += '?shareId=' + (userInfo.id || '') + } + return { title: '欢迎体验'+(logoName), - path: '/pages/index/index?shareId=' + (userInfo.id || ''), + path, imageUrl: logoImage } }, //分享到朋友圈 onShareTimeline() { const userInfo = uni.getStorageSync('userInfo') || {}; + + let path = '' + + if(userInfo.id){ + query = 'shareId=' + (userInfo.id || '') + } + return { title: '欢迎体验'+(logoName), - query: 'shareId=' + (userInfo.id || ''), + query, imageUrl: logoImage } } diff --git a/pages/component/recycle.vue b/pages/component/recycle.vue index 5298e2d..644efc6 100644 --- a/pages/component/recycle.vue +++ b/pages/component/recycle.vue @@ -1681,7 +1681,7 @@ export default { justify-content: space-between; align-items: center; flex-wrap: nowrap; - gap: 10rpx; + gap: 5rpx; margin-top: 10rpx; } @@ -1700,7 +1700,7 @@ export default { font-size: 36rpx; color: #ff7a0e; font-weight: bold; - margin: 0 4rpx; + margin: 0 0rpx; white-space: nowrap; } @@ -2037,6 +2037,7 @@ export default { flex-direction: column; justify-content: center; min-width: 0; + } .panel-item-name { font-size: 30rpx; @@ -2064,7 +2065,7 @@ export default { display: flex; align-items: center; margin-left: 20rpx; - margin-right: 30rpx; + // margin-right: 30rpx; flex-shrink: 0; } .panel-quantity-control button { @@ -2779,9 +2780,9 @@ export default { align-items: center; flex-shrink: 0; white-space: nowrap; - gap: 16rpx; // 增大间距 + gap: 0rpx; // 增大间距 button { - width: 72rpx; // 增大按钮 + width: 30rpx; // 增大按钮 height: 72rpx; padding: 0; margin: 0; diff --git a/pages/index/index.vue b/pages/index/index.vue index 5f3a851..5bd077d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -79,6 +79,7 @@ onLoad(query) { if (query.shareId) { uni.setStorageSync('shareId', query.shareId) + this.handleAgreePrivacy() } this.getConfigData() },