diff --git a/components/goods-list.vue b/components/goods-list.vue new file mode 100644 index 0000000..e5040d0 --- /dev/null +++ b/components/goods-list.vue @@ -0,0 +1,964 @@ + + + + + diff --git a/components/share/DefaultSharePage.vue b/components/share/DefaultSharePage.vue index e5aa4a3..5f25ef2 100644 --- a/components/share/DefaultSharePage.vue +++ b/components/share/DefaultSharePage.vue @@ -23,7 +23,7 @@ .default-share-page { position: relative; - width: 100%; - height: 100%; + width: 600rpx; + height: 1296rpx; + // height: 100%; display: flex; flex-direction: column; align-items: center; @@ -181,8 +182,9 @@ export default { position: absolute; top: 0; left: 0; - width: 100%; - height: 100%; + width: 600rpx; + height: 1296rpx; + // height: 100%; z-index: 1; } @@ -228,8 +230,11 @@ export default { padding: 12rpx; box-sizing: border-box; position: absolute; - bottom: 460rpx; - right: 130rpx; + // bottom: 460rpx; + left: 374rpx; + top: 708rpx; + // right: 130rpx; + z-index: 10; } @@ -270,10 +275,11 @@ export default { } .member-code-outer { position: absolute; - bottom: 160rpx; - width: 300rpx; + top: 1086rpx; + left: 246rpx; + // width: 300rpx; text-align: center; - background: rgb(217, 24, 25); + // background: rgb(217, 24, 25); border-radius: 20rpx; z-index: 10; } diff --git a/pages/index/index.vue b/pages/index/index.vue index f7cdf29..576377e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -28,7 +28,7 @@ - + - - +
@@ -179,6 +106,7 @@ import { formatCurrency } from '@/util/index.js' import { mapGetters } from 'vuex' import RegionSelect from '@/components/region-select/index.vue' import RaisedTabbar from '@/components/raised-tabbar.vue' +import GoodsList from '@/components/goods-list.vue' export default { components: { noticePopup, @@ -187,6 +115,7 @@ export default { getTree, areaProductList, RegionSelect, + GoodsList, }, filters: { seles(value) { diff --git a/pages/mine/share/index.vue b/pages/mine/share/index.vue index 875aa22..4836993 100644 --- a/pages/mine/share/index.vue +++ b/pages/mine/share/index.vue @@ -204,9 +204,9 @@ export default { } .fullscreen-image { - width: 100vw; + width: 100%; height: 100%; - object-fit: cover; + margin: 0; padding: 0; border: none; diff --git a/pages/specialArea/list.vue b/pages/specialArea/list.vue index a763039..0847d86 100644 --- a/pages/specialArea/list.vue +++ b/pages/specialArea/list.vue @@ -46,7 +46,7 @@ >{{ item.classifyName }} - + 0) { let arr = [] if (options.childArea) { - this.specialArea = options.childArea + this.specialArea = this.specialAreaProp || options.childArea // this.diff = 1 } else { JSON.parse(options.children).forEach(item => { @@ -306,7 +311,7 @@ export default { this.diff = options.diff } } else { - this.specialArea = options.specialArea + this.specialArea = this.specialAreaProp || options.specialArea } this.titLabel = options.label @@ -349,6 +354,7 @@ export default { }, onShow() { this.newShareMember = uni.getStorageSync('User')?.loginType !== 0 + console.log(this.newShareMember, '...this.newShareMember') let that = this uni.$on('returnData', function (data) { that.specialArea = data.value diff --git a/static/images/share-bg.jpg b/static/images/share-bg.jpg index 9a6b03b..90d0302 100644 Binary files a/static/images/share-bg.jpg and b/static/images/share-bg.jpg differ