diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index 941ae5c..dc15f5e 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -31,7 +31,7 @@ indicator-active-color="#fff"> - + @@ -115,9 +115,6 @@ }, mounted() { - uni.$on('add', (res) => { - this.street = res.split(',')[0] - }) this.$bus.$on('value-updated', (newValue) => { // 更新组件的值 this.street = newValue.split(',')[0] @@ -142,17 +139,12 @@ this.$emit('selectPlce', e) this.$emit('change', e) this.street = e.value[1].name - // this.$nextTick(() => { - // uni.$emit('add', e.value[1].name + ',' + e.value[1].code) - // this.$bus.$emit('value-updated', - // e.value[1].name + ',' + - // e.value[1].code); - // }) + this.$nextTick(() => { + this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code); + + }) - uni.$emit('add', e.value[1].name + ',' + e.value[1].code) - this.$bus.$emit('value-updated', - e.value[1].name + ',' + - e.value[1].code); + }, changeHandler(e) { diff --git a/pages.json b/pages.json index 9922779..1142d9f 100644 --- a/pages.json +++ b/pages.json @@ -216,6 +216,16 @@ "navigationStyle": "custom" } + }, + { + "path": "supply_chain/suppliers", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#e93323", + "navigationStyle": "custom" + } + }, { "path": "supply_chain/maps", "style": { diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue index 9cf093b..cdd6ad6 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -559,9 +559,10 @@ limit: this.sotreParam.limit, order: this.sotreParam.order, category_id: this.sotreParam.category_id, - type_id: 10 + type_id: this.sotreParam.type_id } + console.log(this.sotreParam.category_id) if (this.latitude) { serachData.location = this.latitude + ',' + this.longitude } @@ -576,7 +577,7 @@ this.storeList = this.storeList.concat(res.data.list) this.count = res.data.count this.loading = false - console.log(this.storeList); + }) }, // 店铺排序 @@ -682,6 +683,7 @@ }, // 组件确定 confirm2(data) { + let arr1 = [], arr2 = [] if (data.storeTypeArr.length == 0) { diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 503b70d..ef7c1dc 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -16,10 +16,10 @@ - - - + + 更多功能 {{editFlag?'完成':'编辑'}} @@ -57,6 +57,7 @@ + @@ -168,6 +169,10 @@ this.getUserInfo() uni.stopPullDownRefresh() }, + beforeDestroy () { + // 销毁监听事件 + this.$bus.$off('value-updated') + }, mounted() { if (this.street.length <= 0) { this.appLocation() @@ -333,11 +338,11 @@ }, confirm(e) { this.street = e.value[1].name - uni.setStorageSync('ADRESS_LOCATION', - e.value[1].name + ',' + e.value[1].name + ',' + - - e.value[1].code - ) + + this.$nextTick(() => { + this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code); + + }) this.showPicker = false }, appLocation() { @@ -357,7 +362,10 @@ let town = res.data.address_reference.town.title let street_id = res.data.address_reference.town.id this.street = res.data.address_component.street - uni.$emit('add', this.street + ',' + street_id) + this.$nextTick(() => { + this.$bus.$emit('value-updated',this.street + ',' +street_id); + + }) }).catch(err => { uni.showToast({ diff --git a/pages/index/index.vue b/pages/index/index.vue index d228d46..7f25d1b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -44,22 +44,22 @@ - + - + - + {{item.title}} + mode="aspectFit" class="g_img"> {{item.author && item.author.nickname}} @@ -85,14 +85,14 @@ - + {{item.title}} + mode="aspectFit" class="g_img"> {{item.author && item.author.nickname}} @@ -401,11 +401,11 @@ confirm(e) { this.street = e.value[1].name - uni.setStorageSync('ADRESS_LOCATION', - e.value[1].name + ',' + - e.value[1].code - ) - uni.$emit('init', 1); + + this.$nextTick(() => { + this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code); + + }) this.showPicker = false }, changeHandler(e) { @@ -543,10 +543,12 @@ }).then(res => { let town = res.data.address_reference.town.title let street_id = res.data.address_reference.town.id - this.street = res.data.address_component.street - uni.$emit('add',town+','+street_id) + this.$nextTick(() => { + this.$bus.$emit('value-updated',this.street + ',' +street_id); + + }) }).catch(err => { uni.showToast({ title: err, diff --git a/pages/nongKe/supply_chain/suppliers.vue b/pages/nongKe/supply_chain/suppliers.vue new file mode 100644 index 0000000..d6dc7e4 --- /dev/null +++ b/pages/nongKe/supply_chain/suppliers.vue @@ -0,0 +1,1144 @@ + + + + + \ No newline at end of file diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index ea7e567..de5301f 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -1,103 +1,105 @@ \ No newline at end of file +/deep/.color-lump { + display: none; +} + +page { + background: #f4f7fe; + + // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%); +} + +.location { + background-color: #f6f6f6; + width: 680rpx; + height: 150rpx; + position: absolute; + top: 0; + z-index: 9999; + border-radius: 20rpx; + left: 50%; + margin-left: -340rpx; + margin-top: 80rpx; + padding-left: 20rpx; + + .locationa { + font-size: 28rpx; + color: #000; + font-weight: 500; + margin-top: 30rpx; + margin-bottom: 15rpx; + } + + .locationb { + font-size: 20rpx; + color: #5a5a5a; + } +} + +.Circle_friends { + position: relative; + padding: 0 0 87.72rpx 0; +} + +.sitebox { + animation-name: fadeIn; + animation-duration: 3s; + animation-fill-mode: forwards; +} + +@keyframes fadeIn { + from { + opacity: 0; + } + + to { + opacity: 1; + } +} + +.site-box { + width: 100%; + /* #ifdef MP || APP-PLUS */ + height: 160rpx; + /* #endif */ + /* #ifdef H5 */ + height: 120rpx; + /* #endif */ + margin-bottom: 26.32rpx; + position: absolute; + top: 0rpx; + position: fixed; + z-index: 999; + /* #ifdef MP || APP-PLUS */ + padding-top: 75rpx; + /* #endif */ + /* #ifdef H5 */ + padding-top: 25rpx; + /* #endif */ + // background-color: #e5e5e5; + + padding-right: 20rpx; + + // 位置 + .place_wrapper { + color: #fff; + margin-right: 24.56rpx; + font-size: 30rpx; + + opacity: 0; + + .town_name { + margin-left: 21rpx; + } + } + + .iconfont { + opacity: 0; + font-size: 30rpx; + font-size: 35.09rpx; + } +} + +.circle_friends_wrapper { + position: relative; + + z-index: 2; +} + +/deep/.u-tabs__wrapper__nav__line { + width: 46rpx; +} + +/deep/.u-tabs__wrapper__nav__item { + padding: 0 0px; + padding-right: 10rpx; +} + +.search_wrapper { + width: 694.74rpx; + margin: 0 auto; +} + +.tabs_wrapper { + width: 720rpx; + margin: 0 auto; + margin-bottom: 21.05rpx; + // margin-left: -20rpx; +} + +.empty_wrapper { + display: flex; + align-items: center; + justify-content: center; +} + +.article_box { + height: 100%; + width: 694.74rpx; + margin: 0 auto; + background-color: #fff; + border-radius: 16rpx; + padding: 0 24.56rpx; + box-sizing: border-box; + + .title-box { + height: 87.72rpx; + + text { + font-size: 28.07rpx; + } + } + + .article-item { + display: flex; + // height: 175.44rpx; + justify-content: space-between; + border-bottom: 1px solid #f0f0f0; + padding: 21.05rpx 0; + + .text { + flex: 1; + height: 122.81rpx; + margin-right: 17.54rpx; + font-size: 24rpx; + color: #999; + display: flex; + flex-direction: column; + justify-content: space-between; + + .name { + font-size: 26.32rpx; + color: #282828; + } + } + + .pictrue { + width: 175.44rpx; + height: 122.81rpx; + + image { + width: 100%; + height: 100%; + border-radius: 8px; + } + } + } +} + +.tabs_wrapper { + width: 723rpx; + margin: 0rpx auto; + margin-bottom: 21.05rpx; + + .title { + font-size: 31.58rpx; + font-weight: bold; + + &::before { + content: ""; + display: inline-block; + width: 3px; + height: 31.58rpx; + background-color: #f84221; + margin-right: 7.02rpx; + } + } +} + +.list { + display: flex; + padding: 12rpx; + justify-content: space-between; + + .list-m { + width: 356rpx; + height: 235rpx; + position: relative; + + .list-title { + display: flex; + position: absolute; + top: 20rpx; + + .list-titlea { + margin-left: 14rpx; + width: 96rpx; + height: 117rpx; + margin-right: 11rpx; + position: relative; + + .titlea-con { + position: absolute; + top: 20rpx; + color: #f4f7fe; + + .titlea { + margin-top: 12rpx; + margin-left: 12rpx; + font-size: 16rpx; + font-family: PingFang SC-Semibold, PingFang SC; + } + + .titleb { + margin-top: 6rpx; + font-size: 37rpx; + font-family: PingFang SC-Semibold, PingFang SC; + font-weight: 600; + color: #ffffff; + margin-left: 20rpx; + } + } + + image { + width: 100%; + height: 100%; + } + } + + .list-titleb { + .titlea { + font-size: 37rpx; + font-family: PingFang SC-Semibold, PingFang SC; + font-weight: 600; + color: #ffffff; + margin-top: 10rpx; + } + + .titleb { + font-size: 33rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + } + } + } + + .list-title-info { + // width: 98rpx; + height: 30rpx; + background: #ffffff; + padding: 2rpx 2rpx; + display: flex; + font-size: 10rpx; + font-size: 18rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #ff6b00; + border-radius: 19rpx 19rpx 19rpx 19rpx; + position: absolute; + bottom: 14rpx; + left: 50%; + margin-left: -49rpx; + padding-left: 15rpx; + + .title-infoimg { + width: 18rpx; + height: 18rpx; + margin: auto 0; + + image { + width: 100%; + height: 100%; + } + } + } + + image { + width: 100%; + height: 100%; + } + } +} + +.list-con { + display: flex; + justify-content: space-between; + margin-top: -10rpx; + padding: 12rpx; + + .list-con-left { + width: 357rpx; + height: 482rpx; + position: relative; + + .list-con-title { + position: absolute; + top: 0; + z-index: 10; + padding-left: 14rpx; + + .con-titlea { + font-size: 37rpx; + font-family: PingFang SC-Semibold, PingFang SC; + font-weight: 600; + color: #ffffff; + margin-top: 10rpx; + } + + .con-titleb { + margin-top: 5rpx; + font-size: 33rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + } + } + + image { + width: 100%; + height: 100%; + } + } + + .list-con-right { + width: 356rpx; + + .con-right { + width: 356rpx; + height: 235rpx; + position: relative; + + .list-con-title { + position: absolute; + top: 0; + z-index: 10; + padding-left: 14rpx; + + .con-titlea { + font-size: 37rpx; + font-family: PingFang SC-Semibold, PingFang SC; + font-weight: 600; + color: #ffffff; + margin-top: 10rpx; + } + + .con-titleb { + margin-top: 5rpx; + font-size: 33rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + } + } + + image { + width: 100%; + height: 100%; + } + } + } +} + +.list-bon { + width: 724rpx; + height: 128rpx; + margin: 0 auto; + margin-bottom: 12rpx; + + image { + width: 100%; + height: 100%; + } +} + +.goodslist { + margin: 0 auto; + width: 725rpx; +} + diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue index 49705d1..8e4b81b 100644 --- a/pages/users/online_warehousing/index.vue +++ b/pages/users/online_warehousing/index.vue @@ -49,17 +49,27 @@ ￥{{items.cart_info.productAttr.price}} x {{items.product_num}} - - + + + + 已导入 + + + + 立即导入 + +