diff --git a/pages.json b/pages.json index c63692f..8d4e419 100644 --- a/pages.json +++ b/pages.json @@ -178,6 +178,12 @@ "style": { "navigationBarTitleText": "智慧云商协" } + }, + { + "path": "user/my_vip_off", + "style": { + "navigationBarTitleText": "智慧云商协" + } } ] }, { diff --git a/pages/index/home.vue b/pages/index/home.vue index 105c072..b4b286f 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -175,7 +175,8 @@ - - + - + + 技术支持:洛阳灵睿网络 + 电话:15503791530 + @@ -297,6 +304,17 @@ //this.getArticlePolicyListAll(); }, methods: { + callPhone() { + uni.makePhoneCall({ + phoneNumber: '15503791530', // 电话号码 + success: function() { + console.log('拨打电话成功'); + }, + fail: function() { + console.log('拨打电话失败'); + } + }); + }, msg() { return this.$store.state.msgCount; }, @@ -573,4 +591,4 @@ align-items: center; justify-content: space-between; } - + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index c34b32d..060299c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -33,8 +33,8 @@ + activeColor="#000000" inactiveColor="#AAAAAA" activeIconColor="#3377FF" inactiveIconColor="#888888" + :animation="true" :safeAreaInsetBottom="true" :thisIndex="thisIndex" @change="switchTabbar"> @@ -63,12 +63,14 @@ tabbarList: [{ title: '首页', activeIcon: '/static/01_1.png', - inactiveIcon: '/static/01.png' + inactiveIcon: '/static/01.png', + id: 0, }, { title: '通讯录', activeIcon: '/static/02_2.png', - inactiveIcon: '/static/02.png' + inactiveIcon: '/static/02.png', + id: 1, }, // { // // 服务、案例、品牌、合作、发现、探索 @@ -80,14 +82,17 @@ { title: '发现', activeIcon: '/static/03_3.png', - inactiveIcon: '/static/03.png' + inactiveIcon: '/static/03.png', + id: 2, }, { title: '个人中心', activeIcon: '/static/04_4.png', - inactiveIcon: '/static/04.png' + inactiveIcon: '/static/04.png', + id: 3, } ], + thisIndex: 0, // tabbar当前被选中的序号 currentIndex: 0, // 自定义底栏对应页面的加载情况 @@ -192,7 +197,7 @@ _switchTabbarPage(index) { const selectPageFlag = this.tabberPageLoadFlag[index] - + this.thisIndex = this.tabbarList[index].id; if (selectPageFlag === undefined) { return } diff --git a/pages/index/pizz.vue b/pages/index/pizz.vue index 1dcd41f..b37b622 100644 --- a/pages/index/pizz.vue +++ b/pages/index/pizz.vue @@ -1,36 +1,38 @@ diff --git a/pages/packageA/user/my_vip.vue b/pages/packageA/user/my_vip.vue index 31726a0..3958b92 100644 --- a/pages/packageA/user/my_vip.vue +++ b/pages/packageA/user/my_vip.vue @@ -1,172 +1,208 @@ \ No newline at end of file +page { + background-color: aliceblue; +} + diff --git a/pages/packageA/user/my_vip_clerk.vue b/pages/packageA/user/my_vip_clerk.vue index 8686720..d96ed60 100644 --- a/pages/packageA/user/my_vip_clerk.vue +++ b/pages/packageA/user/my_vip_clerk.vue @@ -1,170 +1,268 @@ \ No newline at end of file + diff --git a/pages/packageA/user/my_vip_off.vue b/pages/packageA/user/my_vip_off.vue new file mode 100644 index 0000000..56e239f --- /dev/null +++ b/pages/packageA/user/my_vip_off.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/tuniao-ui/components/tn-tabbar/tn-tabbar.vue b/tuniao-ui/components/tn-tabbar/tn-tabbar.vue index 9ee273b..414d445 100644 --- a/tuniao-ui/components/tn-tabbar/tn-tabbar.vue +++ b/tuniao-ui/components/tn-tabbar/tn-tabbar.vue @@ -38,7 +38,8 @@ {{ item.title }} @@ -89,6 +90,10 @@ type: Number, default: 100 }, + thisIndex: { + type: Number, + default: 0 + }, // 突起的高度 outHeight: { type: Number, @@ -546,4 +551,4 @@ } /* 点击动画 end */ - + \ No newline at end of file diff --git a/util/api.js b/util/api.js index 09c18ad..4e23e1a 100644 --- a/util/api.js +++ b/util/api.js @@ -70,4 +70,14 @@ export const businessFind = data => request.post('/move/business/businessFind', export const clerkListByBusiness = data => request.post('/move/business/getClerkListByBusinessId', data, false); -export const addClerk = data => request.post('/move/business/addClerk', data, false); \ No newline at end of file +export const addClerk = data => request.post('/move/business/addClerk', data, false); + +export const businessListByMember = data => request.post('/move/business/getBusinessListByMemberId', data, false); + +export const deleteClerk = data => request.post('/move/business/deleteClerk', data, false); + +export const handleMembercode = data => request.post('/move/Membercode/handleMembercode', data, false); + +export const ifRightToExamine = data => request.post('/move/Writeoff/ifRightToExamine', data, false); + +export const addWriteoff = data => request.post('/move/Writeoff/addWriteoff', data, false); \ No newline at end of file