diff --git a/api/requesta.js b/api/requesta.js new file mode 100644 index 0000000..12b6162 --- /dev/null +++ b/api/requesta.js @@ -0,0 +1,15 @@ +import request from "@/utils/requesta.js"; + +export function getCityCloundShop(data) { + return request.get("city/get_cloud_shop", data); +} +export function cloudWarehouse(data) { + return request.get("store/product/cloudWarehouse", data); +} +/** + * 供销市场标签 + * @returns {*} + */ +export function supMenuApi(data) { + return request.get('intention/v2/cate', data); +} \ No newline at end of file diff --git a/components/mentioned.vue b/components/mentioned.vue index b0a0814..12f0495 100644 --- a/components/mentioned.vue +++ b/components/mentioned.vue @@ -18,28 +18,33 @@ ￥{{item.spu && item.spu.price}} 立即购买 - + - + - - + + + + - - + + \ No newline at end of file diff --git a/components/plantConSwiper/index.vue b/components/plantConSwiper/index.vue index ea15751..b1a9da0 100644 --- a/components/plantConSwiper/index.vue +++ b/components/plantConSwiper/index.vue @@ -1,8 +1,8 @@ @@ -56,8 +56,7 @@ videoContext: '' }; }, - created() { - }, + created() {}, watch: { }, @@ -83,7 +82,7 @@ // #ifdef APP-PLUS this.isPlay = false this.videoContext = uni.createVideoContext('myVideo', this); - this.$nextTick(()=>{ + this.$nextTick(() => { this.videoContext.play(); }) // #endif @@ -102,13 +101,15 @@ height: 710rpx; position: relative; } + .product-bg swiper { width: 100%; height: 100%; position: relative; } + .product-bg .slide-image { - width: 100%; + width: 100vw; height: 100%; border-radius: 16rpx; } @@ -166,4 +167,4 @@ width: 100%; height: 100%; } - + \ No newline at end of file diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index 8dea21b..1b8648d 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -142,10 +142,12 @@ this.$emit('change', e) this.street = e.value[1].name this.$nextTick(() => { - this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code); - + this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); + }) - + + + }, changeHandler(e) { const { diff --git a/components/zbpSwiperb.vue b/components/zbpSwiperb.vue new file mode 100644 index 0000000..d0949dc --- /dev/null +++ b/components/zbpSwiperb.vue @@ -0,0 +1,353 @@ + + + + + \ No newline at end of file diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue index afb0697..b7cdbb1 100644 --- a/pages/nongKe/cloud_entrepot/index.vue +++ b/pages/nongKe/cloud_entrepot/index.vue @@ -177,7 +177,6 @@ height="400.09rpx"> 暂无商品 - @@ -244,17 +243,19 @@ + + + + - 暂无商家 - + 当前区域暂无云仓 - - @@ -266,7 +267,7 @@ import { cloudWarehouse, getCityCloundShop - } from '@/api/api.js' + } from '@/api/requesta.js' import { Toast } from '@/libs/uniApi'; @@ -335,7 +336,7 @@ } }, onLoad(e) { - this.cartFn() + // this.cartFn() this.appInfo = this.$appInfo.safeAreaInsets this.winHeight = this.$appInfo.windowHeight this.street_code = e.street @@ -344,7 +345,7 @@ // console.log(this.appInfo, "手机信息") }, onShow() { - this.cartFn() + // this.cartFn() }, // 分页 onReachBottom() { @@ -364,6 +365,12 @@ if (res.data.list[0].product_id == this.goodsList[0].product_id) { this.status = "nomore" this.flag = false + } else { + if (res.data.list.length == 0) { + this.status = "nomore" + return + } + this.goodsList = this.goodsList.concat(res.data.list) } }) // this.getList().then(res => { diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 8e24527..1a8578b 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -37,7 +37,7 @@ - asdasd + 热搜: 小张副食 + @@ -202,7 +202,8 @@ 暂无评论，快去抢沙发吧~ - +
{{followDetail.count_start}} - + {{replyData.all}} - + - 商品 (2) + 商品 ({{followDetail.relevance.length}}) @@ -265,8 +267,8 @@ - + @@ -275,10 +277,15 @@ - + - + + + + + @@ -336,6 +343,7 @@ }, data() { return { + flag: false, open_grass: openPlantGrass, followDetail: null, commList: [], //评论列表 @@ -400,7 +408,7 @@ }, FToggle() { this.$refs.bindmobile1.open() - + }, // 后退 returns() { @@ -712,10 +720,12 @@ /*查看提到的宝贝*/ openMore(item) { this.$refs.mentioned.showPopup() + this.flag = true }, close() { this.$refs.mentioned.closePopup() this.$refs.bindmobile.close() + this.flag = false } }, onReachBottom() { @@ -1280,28 +1290,30 @@ font-size: 32rpx; } } -.input_count1{ - - height: 70rpx; - padding-top: 15rpx; - - - /deep/.count1{ - padding-left: 20rpx; - width: 617rpx; + + .input_count1 { + height: 70rpx; - background: #F4F4F4; - margin: 0 auto; - - border-radius: 35px 35px 35px 35px; + padding-top: 15rpx; + + + /deep/.count1 { + padding-left: 20rpx; + width: 617rpx; + height: 70rpx; + background: #F4F4F4; + margin: 0 auto; + + border-radius: 35px 35px 35px 35px; + } + } -} .release_bar { align-items: center; width: 100%; background: #ffffff; - + padding: 15rpx 20rpx; position: fixed; left: 0; @@ -1403,4 +1415,24 @@ font-size: 26rpx; } } + + .send1 { + font-size: 26rpx; + color: #ffffff; + // padding: 12rpx 45rpx; + background-image: linear-gradient(126deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); + border-radius: 30rpx; + text-align: center; + width: 150rpx; + line-height: 70rpx; + margin-left: 20rpx; + + // height: ; + } + + // 禁止滚动 + .off_scoll { + height: 100vh; + overflow: hidden; + } \ No newline at end of file diff --git a/utils/requesta.js b/utils/requesta.js new file mode 100644 index 0000000..8aa7a8f --- /dev/null +++ b/utils/requesta.js @@ -0,0 +1,76 @@ +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- +import { + HTTP_REQUEST_URL, + HEADER, + TOKENNAME +} from '@/config/app'; +import { + checkLogin +} from '../libs/login'; +import store from '../store'; + + + +/** + * 发送请求 + */ +function baseRequest(url, method, data, { + noAuth = false, + noVerify = false +}) { + let Url = HTTP_REQUEST_URL, + header = HEADER; + + + + if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; + + return new Promise((reslove, reject) => { + uni.request({ + url: Url + '/api/' + url, + method: method || 'GET', + header: header, + data: data || {}, + success: (res) => { + // #ifdef APP-PLUS + // console.log('app', Url + '/api/' + url, res.data); + // #endif + if (noVerify) + reslove(res.data, res); + else if (res.data.status == 200) + reslove(res.data, res); + else if ([410000, 410001, 410002, 40000].indexOf(res.data.status) !== -1) { + + reject(res.data); + } else if (res.data.status == 501) { + uni.reLaunch({ + url: '/pages/error/index' + }) + reject(res.data); + } else + reject(res.data.message || '系统错误'); + }, + fail: (message) => { + reject('请求失败'); + } + }) + }); +} + +const request = {}; + +['options', 'get', 'post', 'put', 'head', 'delete', 'trace', 'connect'].forEach((method) => { + request[method] = (api, data, opt) => baseRequest(api, method, data, opt || {}) +}); + + + +export default request; \ No newline at end of file