From 8fd43a90f5acadb8a0d645586244e6a32f02eea0 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 5 Sep 2023 10:04:46 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 4 +++-
pages/gather/gather.vue | 10 ++++++----
pages/moreProject/moreProject.vue | 2 +-
static/empty/permission.png | Bin 0 -> 19627 bytes
4 files changed, 10 insertions(+), 6 deletions(-)
create mode 100644 static/empty/permission.png
diff --git a/App.vue b/App.vue
index 088d48f..e0645a9 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
@@ -77,6 +77,7 @@
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);
@@ -86,6 +87,7 @@
});
}
});
+ // #endif
let that = this;
// #ifdef MP
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 8b22336..32db7d6 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -35,7 +35,7 @@
:show="jurisdiction"
mode="permission"
:text="emptyText"
- icon="http://cdn.uviewui.com/uview/empty/permission.png"
+ icon="/static/empty/permission.png"
>
@@ -105,9 +105,9 @@
-
+
@@ -143,7 +143,9 @@ import {
import {
getDiy
} from '@/api/api.js';
+// #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js';
+// #endif
export default {
components: {
@@ -339,7 +341,7 @@ export default {
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
},
getUniMp (appid) {
- console.log('点击供销平台');
+ console.log('点击小程序');
// #ifdef APP-PLUS
uniMP.loadMP(appid);
return;
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 666b762..ef93489 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -281,7 +281,7 @@
-->
-
+
diff --git a/static/empty/permission.png b/static/empty/permission.png
new file mode 100644
index 0000000000000000000000000000000000000000..8142421c0382474a78322f5ee55fc431d1576e7e
GIT binary patch
literal 19627
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
Date: Tue, 5 Sep 2023 10:07:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 78 +-
pages/supply_chains/supply_chains.vue | 1593 ++++++++++++-------------
2 files changed, 789 insertions(+), 882 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a76ee01..9b76b2d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -37,78 +37,6 @@
-
-
-
-
-
-
@@ -226,7 +154,6 @@
this.getCateList()
this.cateGoods = []
this.getGoods()
-
this.Area()
uni.stopPullDownRefresh()
},
@@ -257,7 +184,6 @@
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
-
this.where.page = ++this.where.page;
this.getGoods()
},
@@ -400,7 +326,7 @@
this.street = e.value[1].name
- this.$nextTick(() => {
+ this.$nextTick(() => {
this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
})
@@ -479,6 +405,7 @@
graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list)
+
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
@@ -513,6 +440,7 @@
this.cateGoods = []
this.where.category_id = item.category_id
this.emptyShow = false
+ this.status = 'loadmore'
this.where.page = 1
this.getGoods(item)
this.street_id = item.id
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index d2a8333..e0612a6 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -1,90 +1,81 @@
-
-
-
-
-
-
-
-
- {{street}}
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
+
+ {{street}}
+
+
+
+
+
-
-
-
-
-
-
-
-
- september
- 9月
-
-
-
-
- {{ town }}
-
- 综合供销云市场
-
-
-
- 点击查看
-
-
-
-
-
-
+
-
-
-
-
-
-
-
- 里海云仓
- 行业分类市场
-
-
-
- 点击查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
- 位置权限使用说明
- 用于向你推荐最近门店
-
-
+
+ 位置权限使用说明
+ 用于向你推荐最近门店
+
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .goodslist {
+ margin: 0 auto;
+ width: 725rpx;
+ }
+
\ No newline at end of file
From 575ba131ae090165ac7f699f08cd772277412efd Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:29:41 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/app.js | 4 ++--
pages/index/index.vue | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/config/app.js b/config/app.js
index adddc06..29070a6 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
- // httpApi = 'https://shop.lihaink.cn' // 生产
- httpApi = "https://crmeb-test.shop.lihaink.cn"
+ httpApi = 'https://shop.lihaink.cn' // 生产
+ // httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325'
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9b76b2d..f52da0d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -160,13 +160,18 @@
onLoad() {
+
+
this.getCateList()
this.getArticle()
this.getGoods()
this.Area()
- this.setPermissions()
+ //this.setPermissions()
+
+
+
// this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = ''
From 22725b4c2eb3e5185606bf726c272cbb745a6081 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:30:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/short_video/appSwiper/index.nvue | 11 +++++--
pages/short_video/nvueSwiper/index.nvue | 41 +++++++++++++++++++------
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 994a540..802388f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -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 681e11a..7103afe 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -424,6 +424,7 @@
communityId: '',
Listcount: '',
loadMore: true,
+ videoshow:true
}
},
watch: {
@@ -741,9 +742,11 @@
}
},
get() {
+
let that = this
+
// 1.这里引入后端请求数据
- if(this.videoID){
+ if(that.videoshow){
deoList(this.videoID).then(res => {
that.videoData([res.data])
if (res.data.list.length < that.limit) {
@@ -756,13 +759,32 @@
duration: 2000
});
})
- this.videoID=''
+ this.videoshow=false
}else{
- videoList().then(res=>{
- that.videoData(res.data.list);
- })
- }
-
+ // videoList().then(res=>{
+ // that.videoData(res.data.list);
+ // })
+ // console.log(that.userUid,that.videoID)
+ videoList({
+ page: that.page,
+ limit: that.limit,
+ id:this.videoID
+ // is_star: that.isSatrt,
+ // community_id: that.videoID
+ }).then(res => {
+ that.videoData(res.data.list)
+ if (res.data.list.length < that.limit) {
+ this.loadMore = false;
+ }
+ }).catch(err => {
+ return uni.showToast({
+ title: err,
+ icon: 'none',
+ duration: 2000
+ });
+ })
+ }
+
// that.isUser ?
// myVideoList(that.userUid, {
// page: that.page,
@@ -780,7 +802,8 @@
// icon: 'none',
// duration: 2000
// });
- // }) :
+ // })
+ //:
// graphicLstApi({
// page: that.page,
// limit: that.limit,
@@ -1412,7 +1435,7 @@
.userInfo {
position: absolute;
- bottom: 60rpx;
+ bottom: 420rpx;
right: 20rpx;
flex-direction: column;
text-align: center;
From 8ac478412906a6d635e965abbab2110e19ea7563 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:48:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/gather/gather.vue | 33 +++++++++++++++++----------------
pages/index/index.vue | 9 ++++++---
2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index b3b268d..d750591 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 f52da0d..0de3ecd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -163,9 +163,8 @@
this.getCateList()
- this.getArticle()
+ // this.getArticle()
this.getGoods()
-
this.Area()
//this.setPermissions()
@@ -229,7 +228,10 @@
},
// #endif
-
+ beforeDestroy () {
+ // 销毁监听事件
+ this.$bus.$off('value-updated')
+ },
methods: {
scrolling() {
@@ -725,6 +727,7 @@
/deep/.u-tabs__wrapper__nav__line {
width: 46rpx;
+ margin-left: -2rpx;
}
From 91e751adcd5a649bca26d50d5a672250b6d75aeb Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 13:50:42 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 54 ++++++----
pages/short_video/appSwiper/index.nvue | 2 +-
pages/short_video/nvueSwiper/index.nvue | 127 +++++++++++++-----------
3 files changed, 101 insertions(+), 82 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0de3ecd..1ce2725 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,8 @@
-
+
{{street}}
@@ -22,8 +23,8 @@
-
+
@@ -168,9 +169,9 @@
this.Area()
//this.setPermissions()
-
-
+
+
// this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = ''
@@ -184,7 +185,9 @@
})
},
-
+ onTabItemTap(e) {
+ console.log(e)
+ },
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
@@ -201,7 +204,7 @@
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
this.street = newValue.split(',')[0]
-
+
});
},
// #ifdef APP-PLUS
@@ -216,11 +219,11 @@
this.isFshow = false
this.show = true
} else if (20 < scrollTop && scrollTop <= 100) {
- this.backColor = 'rgba(255, 255, 255, 0.5)'
+ this.backColor = 'rgba(255, 255, 255, 0.5)'
this.isFshow = true
this.show = false
} else if (scrollTop > 100) {
- this.backColor = 'rgba(252, 252, 252, 1.0)'
+ this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true
this.show = false
}
@@ -228,9 +231,9 @@
},
// #endif
- beforeDestroy () {
- // 销毁监听事件
- this.$bus.$off('value-updated')
+ beforeDestroy() {
+ // 销毁监听事件
+ this.$bus.$off('value-updated')
},
methods: {
@@ -267,7 +270,13 @@
this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true
-
+ uni.setTabBarItem({
+ index: 0,
+ text: '',
+ id:'1',
+ iconPath: '/static/tabbar_icon/top.png',
+ selectedIconPath: '/static/tabbar_icon/top.png'
+ });
}
@@ -332,10 +341,10 @@
confirm(e) {
this.street = e.value[1].name
-
- this.$nextTick(() => {
- 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);
+
})
this.showPicker = false
},
@@ -412,7 +421,7 @@
graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list)
-
+
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
@@ -476,11 +485,12 @@
let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street
-
+
this.$nextTick(() => {
- this.$bus.$emit('value-updated',this.street + ',' +street_id);
-
- })
+ this.$bus.$emit('value-updated', this.street + ',' +
+ street_id);
+
+ })
}).catch(err => {
uni.showToast({
title: err,
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 802388f..2c9e80f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -320,7 +320,7 @@
-
+
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 7103afe..4dac07e 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -15,9 +15,14 @@
-
-
+ -->
+
+
+
@@ -249,7 +255,7 @@
-
+