From 6bc74e2ce65d4f11e23529fa4278d436078f3404 Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Thu, 8 Aug 2024 13:49:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E5=A5=97=E9=A4=90?= =?UTF-8?q?=E6=AC=A1=E5=8D=A1=E7=96=97=E7=A8=8B=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=9B=B6=E9=92=B1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/address/address.vue | 1 + my/order/paydingTc.vue | 58 +++++++++++++++++++------------------- pages/index/index.vue | 22 ++++++--------- pages/my/cooperation.vue | 10 +++---- pages/my/index.vue | 60 ++++++++++++++++++++-------------------- 5 files changed, 73 insertions(+), 78 deletions(-) diff --git a/my/address/address.vue b/my/address/address.vue index 8ed7555..8cb1f29 100644 --- a/my/address/address.vue +++ b/my/address/address.vue @@ -220,6 +220,7 @@ flex-direction: column; align-items: center; margin: 0 auto; + z-index: 66; } .delete-btn{ margin-left: 10px; diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue index 8792ec9..f43f104 100644 --- a/my/order/paydingTc.vue +++ b/my/order/paydingTc.vue @@ -220,36 +220,34 @@ if (uni.getStorageSync('token')) { this.getIsVip() } - - // #ifndef MP-WEIXIN - this.openLists = [{ - image: '../../static/images/icon_weixin.png', - text: '微信支付', - id: 2 - }, { - image: '../../static/images/zhifubao.png', - text: '支付宝支付', - id: 3 - }, { - image: '../../static/images/lingqian.png', - text: '零钱支付', - id: 1 - }], - this.openWay = 2; - // #endif - - // #ifdef MP-WEIXIN - this.openLists = [{ - image: '../../static/images/icon_weixin.png', - text: '微信支付', - id: 2 - }, { - image: '../../static/images/lingqian.png', - text: '零钱支付', - id: 1 - }], - this.openWay = 2; - // #endif + if(this.orderXm.type=='104'||this.orderXm.type=='105'||this.orderXm.type=='106'){ + this.openLists = [{ + image: '../../static/images/icon_weixin.png', + text: '微信支付', + id: 2 + }, { + image: '../../static/images/zhifubao.png', + text: '支付宝支付', + id: 3 + }], + this.openWay = 2; + }else{ + this.openLists = [{ + image: '../../static/images/icon_weixin.png', + text: '微信支付', + id: 2 + }, { + image: '../../static/images/zhifubao.png', + text: '支付宝支付', + id: 3 + }, { + image: '../../static/images/lingqian.png', + text: '零钱支付', + id: 1 + }], + this.openWay = 2; + } + }, methods: { addressMy() { diff --git a/pages/index/index.vue b/pages/index/index.vue index 631863a..69a7a7c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1189,6 +1189,8 @@ color: #fff; } .top-menu-view /deep/.uni-scroll-view-content{ + display: flex; + flex-direction: row; justify-content: space-around; } .guanbi{ @@ -1235,8 +1237,10 @@ width: 100%; height: 100%; } - /deep/.swiper-box-list /deep/.uni-scroll-view-content{ - justify-content: space-around !important; + .swiper-box-list /deep/.uni-scroll-view-content{ + display: flex; + flex-direction: row; + justify-content: space-around; flex-wrap: wrap; } .salogo{ @@ -1280,11 +1284,7 @@ margin-top: 3rpx; } - .index-mian /deep/.uni-scroll-view-content{ - display: flex; - flex-direction: column; - justify-content: center; - } + /deep/.uni-select__selector-scroll{ height: 100px; } @@ -1583,11 +1583,7 @@ overflow: hidden; padding-bottom: 100px; } - /deep/.uni-scroll-view-content{ - display: flex; - flex-direction: row; - /* justify-content: space-around; */ - } + .top-menu-view { display: flex; flex-direction: row; @@ -1640,7 +1636,7 @@ .swiper-box-list { width: 95%; margin: 5px auto; - flex:1; + /* flex:1; */ background-color: #FFFFFF; height: 490px; } diff --git a/pages/my/cooperation.vue b/pages/my/cooperation.vue index 1ba7e8e..1fc02d4 100644 --- a/pages/my/cooperation.vue +++ b/pages/my/cooperation.vue @@ -6,18 +6,18 @@ 联系人姓名 - + 联系人手机号 - + - 地址 - + 地址 + diff --git a/pages/my/index.vue b/pages/my/index.vue index 902e35a..3e14d78 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -240,36 +240,36 @@ text: '城市合伙人', link: '/pages/my/cooperation' }, - { - urlImg: '../../static/my-gong-11.png', - text: '申请经纪人', - link: '/pages/my/applyBroker/index' - }, - { - urlImg: '../../static/my-gong-12.png', - text: '我是经纪人', - link: '/pages/my/applyBroker/myBroker' - }, - { - urlImg: '../../static/my-gong-14.png', - text: '申请业务员', - link: '/pages/my/applySalesperson/index' - }, - { - urlImg: '../../static/my-gong-13.png', - text: '我是业务员', - link: '/pages/my/applySalesperson/mySalesperson' - }, - { - urlImg: '../../static/my-gong-15.png', - text: '申请分销员', - link: '/pages/my/applyDistributor/index' - }, - { - urlImg: '../../static/my-gong-16.png', - text: '我是分销员', - link: '/pages/my/applyDistributor/myDistributor' - }, + // { + // urlImg: '../../static/my-gong-11.png', + // text: '申请经纪人', + // link: '/pages/my/applyBroker/index' + // }, + // { + // urlImg: '../../static/my-gong-12.png', + // text: '我是经纪人', + // link: '/pages/my/applyBroker/myBroker' + // }, + // { + // urlImg: '../../static/my-gong-14.png', + // text: '申请业务员', + // link: '/pages/my/applySalesperson/index' + // }, + // { + // urlImg: '../../static/my-gong-13.png', + // text: '我是业务员', + // link: '/pages/my/applySalesperson/mySalesperson' + // }, + // { + // urlImg: '../../static/my-gong-15.png', + // text: '申请分销员', + // link: '/pages/my/applyDistributor/index' + // }, + // { + // urlImg: '../../static/my-gong-16.png', + // text: '我是分销员', + // link: '/pages/my/applyDistributor/myDistributor' + // }, { urlImg: '../../static/my-gong-9.png', text: '我的团队',