diff --git a/App.vue b/App.vue index e0645a9..87cb497 100644 --- a/App.vue +++ b/App.vue @@ -10,7 +10,7 @@ // +---------------------------------------------------------------------- // #ifdef APP-PLUS let jpushModule = uni.requireNativePlugin("JG-JPush"); - const mp = uni.requireNativePlugin('uniMP'); + const mp = uni.requireNativePlugin('uniMP'); // #endif import { checkLogin @@ -76,19 +76,17 @@ onLaunch: function(option) { this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; this.globalData.uid = this.$store.state.app.uid; - - // #ifdef APP-PLUS - //监听uni小程序发送的事件 - mp.onUniMPEventReceive(ret=>{ - console.log('小程序事件: ', ret); - if(ret.event=='closeApp'){ - mp.closeUniMP(ret.fromAppid, (ret)=>{ - console.log('closeUniMP: '+JSON.stringify(ret)); - }); - } - }); - // #endif - + + //监听uni小程序发送的事件 + mp.onUniMPEventReceive(ret => { + console.log('小程序事件: ', ret); + if (ret.event == 'closeApp') { + mp.closeUniMP(ret.fromAppid, (ret) => { + console.log('closeUniMP: ' + JSON.stringify(ret)); + }); + } + }); + let that = this; // #ifdef MP if (HTTP_REQUEST_URL == '') { @@ -231,6 +229,20 @@ }, 1500) // #endif }, + mounted() { + uni.onTabBarMidButtonTap((e) => { + // console.log("点击了", e); + uni.switchTab({ + url: '/pages/plant_release/index' + }) + // uni.navigateTo({ + // url: '/pages/plant_release/index' + // }) + + }); + uni.setTabBarItem((e) => { console.log("点击了", e)}); + }, + methods: { /** * 语音播报 diff --git a/pages.json b/pages.json index 54bcf41..54f013d 100644 --- a/pages.json +++ b/pages.json @@ -216,7 +216,7 @@ "navigationStyle": "custom" } - }, + }, { "path": "supply_chain/suppliers", "style": { @@ -278,6 +278,22 @@ "navigationStyle": "custom" } + }, { + "path": "food/index", + "style": { + "navigationBarTitleText": "当地美食", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + + }, { + "path": "tourism/index", + "style": { + "navigationBarTitleText": "特色文旅", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + } ] }, @@ -1497,6 +1513,7 @@ "selectedColor": "#E93323", "borderStyle": "white", "backgroundColor": "#ffffff", + "fontSize": "25rpx", "list": [{ "pagePath": "pages/index/index", "iconPath": "static/tabbar_icon/a.png", @@ -1513,10 +1530,12 @@ "pagePath": "pages/plant_release/index", "iconPath": "static/tabbar_icon/d.png", "selectedIconPath": "static/tabbar_icon/d-a.png", - "text": "发布" + "text": "发布", + "visible":false }, { "pagePath": "pages/supply_chains/supply_chains", + "iconPath": "static/tabbar_icon/c.png", "selectedIconPath": "static/tabbar_icon/c-a.png", "text": "供应" @@ -1529,7 +1548,7 @@ } ], "midButton": { - "width": "138rpx", + "width": "78rpx", "height": "126rpx", "iconWidth": "78rpx", "pagePath": "pages/plant_release/index", diff --git a/pages/activity/combination_details/index.vue b/pages/activity/combination_details/index.vue index b84ce84..e69de29 100644 --- a/pages/activity/combination_details/index.vue +++ b/pages/activity/combination_details/index.vue @@ -1,1969 +0,0 @@ - - - diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 9725ddd..61b8d74 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -31,7 +31,7 @@ :show="jurisdiction" mode="permission" :text="emptyText" - icon="/static/empty/permission.png" + icon="http://cdn.uviewui.com/uview/empty/permission.png" > @@ -101,9 +101,12 @@ - + + + @@ -139,9 +142,7 @@ import { import { getDiy } from '@/api/api.js'; -// #ifdef APP-PLUS import uniMP from '@/utils/uniMP.js'; -// #endif export default { components: { @@ -183,8 +184,8 @@ export default { ], nowMenuList: [], street: '', - showPicker: false, - columnData: [], + showPicker: false, + columnData: [], bgColor: '', isFshow: false, backColor: 'rgba(252, 252, 252, 0)' @@ -337,7 +338,7 @@ export default { uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList)); }, getUniMp (appid) { - console.log('点击小程序'); + console.log('点击供销平台'); // #ifdef APP-PLUS uniMP.loadMP(appid); return; @@ -364,14 +365,14 @@ export default { } }, - Area () { - getArea({ - city_code: 510500 - }).then(res => { - this.$refs.uPicker.setColumnValues(0, res.data); - this.Street(res.data[0]['code']); - }); - }, + Area() { + getArea({ + city_code: 510500 + }).then(res => { + this.$refs.uPicker.setColumnValues(0, res.data); + this.Street(res.data[0]['code']); + }); + }, Street (code) { getStreet({ area_code: code diff --git a/pages/index/index.vue b/pages/index/index.vue index 9744d54..c7ec09d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,1050 +1,1109 @@ \ No newline at end of file diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue new file mode 100644 index 0000000..983cf82 --- /dev/null +++ b/pages/nongKe/food/index.vue @@ -0,0 +1,1308 @@ + + + + + \ No newline at end of file diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue index 196a2d3..0b553f2 100644 --- a/pages/nongKe/specialty/index.vue +++ b/pages/nongKe/specialty/index.vue @@ -1,142 +1,270 @@ @@ -144,104 +272,498 @@ \ No newline at end of file diff --git a/pages/nongKe/specialty/indexa.vue b/pages/nongKe/specialty/indexa.vue new file mode 100644 index 0000000..196a2d3 --- /dev/null +++ b/pages/nongKe/specialty/indexa.vue @@ -0,0 +1,324 @@ + + + + + \ No newline at end of file diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index ed7a850..6036de5 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -7,22 +7,26 @@ - - - - - - 供销综合云市场 + + + + + + + + + 供销综合云市场 + + - + @@ -30,6 +34,9 @@ height="50.82rpx"> + + + @@ -771,6 +778,14 @@ /* 可根据实际情况调整容器宽度 */ } + .head_tit { + display: flex; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + padding: 0 20rpx; + } + .productList { // padding-top: 50rpx; // padding: 0 20rpx 0; @@ -1350,6 +1365,14 @@ margin: 30px auto; } + .img_cls { + position: absolute; + top: 50%; + right: 7rpx; + transform: translateY(-50%); + + } + .pop { z-index: 1; } diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue index 946383a..4f9c78e 100644 --- a/pages/nongKe/supply_chain/supplierA.vue +++ b/pages/nongKe/supply_chain/supplierA.vue @@ -6,12 +6,17 @@ - - - + + + + + + + {{titName}} + - - {{titName}} + + - + @@ -374,6 +378,7 @@ if (options.street_id != undefined) { this.sotreParam.street_id = options.street_id } + this.credit_buy = options.credit_buy this.sotreParam.type_id = options.type_id this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || '' @@ -391,7 +396,14 @@ let index = this.menuList.findIndex((item) => { return item.merchant_category_id == options.merchant_category_id; }); + if (options.tit) { + this.titName = "先货后款" + return + } this.titName = this.menuList[index].category_name + + + // console.log(this.menuList) }) // console.log(this.menuList) @@ -1034,6 +1046,14 @@ margin-left: 10rpx; } + .head_tit { + display: flex; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + padding: 0 20rpx; + } + .store-wrapper { margin-top: 235rpx; border-top: 1px solid #F6F6F6; @@ -1307,13 +1327,11 @@ } } - .guanbi { - width: 20px; - height: 20px; - margin: 30px auto; - } + .img_cls { + position: absolute; + top: 50%; + right: 7rpx; + transform: translateY(-50%); - .pop { - z-index: 1; } \ No newline at end of file diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue new file mode 100644 index 0000000..8cf33a7 --- /dev/null +++ b/pages/nongKe/tourism/index.vue @@ -0,0 +1,1311 @@ + + + + + \ No newline at end of file diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index 994a540..2c9e80f 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -320,7 +320,7 @@ - + @@ -704,8 +704,13 @@ // }); // })' // that.isUser ? - videoList().then(res=>{ - that.getVideoData(res.data.list); + videoList({ + page: that.page, + limit: that.limit, + id:this.videoID + + }).then(res=>{ + that.getVideoData(res.data.list); }) @@ -1325,7 +1330,7 @@ .userInfo { position: absolute; - bottom: 120px; + bottom: 400rpx; right: 10px; display: flex; align-items: center; diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue index 906087d..955dc8d 100644 --- a/pages/short_video/nvueSwiper/index.nvue +++ b/pages/short_video/nvueSwiper/index.nvue @@ -15,10 +15,14 @@ - - + --> + + + @@ -250,7 +255,7 @@ - + - +