陶杰
2024-12-10 b3a62a1875b98ae6bbce009beef49a2146748894
1.供应商子账号:工作台、个人中心下拉
已修改2个文件
61 ■■■■■ 文件已修改
pages/home/supplier-home.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/user/supplier-user.vue 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/supplier-home.vue
@@ -337,7 +337,13 @@
        }
    },
    async onPullDownRefresh() {
        // 需要判断当前是否是子账号,如果是子账号则需要刷新账号切换的信息
        const currentInfo = this.$store.state.currentInfo
        if(currentInfo&&currentInfo.supplierSub&&currentInfo.supplierSub.id){
            await this.$store.dispatch('getSwitchSubAccount',currentInfo.supplierSub)
        }else{
        await this.$store.dispatch('getCurrentInfo')
        }
        await this.getTj(true)
        uni.stopPullDownRefresh()
    },
pages/user/supplier-user.vue
@@ -21,8 +21,7 @@
                    ||(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
                    ||(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
                    || currentInfo.picture
                    " :src="
                    (currentInfo.customerDTO&&currentInfo.customerDTO.cover)
                " :src="(currentInfo.customerDTO && currentInfo.customerDTO.cover)
                    ||(currentInfo.supplierDTO&&currentInfo.supplierDTO.cover)
                    ||(currentInfo.partnerDTO&&currentInfo.partnerDTO.cover)
                    || currentInfo.picture
@@ -65,7 +64,8 @@
                            v-if="currentInfo&&currentInfo.customerDTO&&currentInfo.customerDTO.userGrowthRecord">
                            <view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='普通会员'" class="v1">
                                <image class="member-icon"
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/73/732e40e1c473494bb9fb5cc639d9aa45icon-member-1.png"></image>
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/73/732e40e1c473494bb9fb5cc639d9aa45icon-member-1.png">
                                </image>
                                {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
                                <uni-icons color="#7CC662" type="right" size="18"></uni-icons>
@@ -73,7 +73,8 @@
                            <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'"
                                class="v2">
                                <image class="member-icon v2"
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/10/10af6861ae834bd3bb1b28a3c57b7dd1icon-member-2.png"></image>
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/10/10af6861ae834bd3bb1b28a3c57b7dd1icon-member-2.png">
                                </image>
                                {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
                                <uni-icons color="#7498E0" type="right" size="18"></uni-icons>
@@ -81,13 +82,15 @@
                            <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'"
                                class="v3">
                                <image class="member-icon v3"
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/c7/c70ca53f4dad4722a4e3a101dd6e23e9icon-member-3.png"></image>
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/c7/c70ca53f4dad4722a4e3a101dd6e23e9icon-member-3.png">
                                </image>
                                {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
                                <uni-icons color="#C47810" type="right" size="18"></uni-icons>
                            </view>
                            <view v-else class="v4">
                                <image class="member-icon v4"
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ad/ad380ae0ee7043a699a83cfceab0d7b2icon-member-4.png"></image>
                                    src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ad/ad380ae0ee7043a699a83cfceab0d7b2icon-member-4.png">
                                </image>
                                {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}}
                                <uni-icons color="#DD834E" type="right" size="18"></uni-icons>
                            </view>
@@ -103,13 +106,11 @@
                    <!-- getUserProfile -->
                    {{ '点击登陆/注册' }}
                </view>
                <image class="icon-setting"
                    v-if="
                <image class="icon-setting" v-if="
                        (selftype==='supplier' && $hasPermission('supplier:mine:setting'))
                        || (selftype==='partner' && $hasPermission('partner:mine:setting') ) 
                        || (selftype==='customer')
                    "
                    @click="toInfo" src="../../static/common/icon-setting.png" mode="aspectFit">
                " @click="toInfo" src="../../static/common/icon-setting.png" mode="aspectFit">
                </image>
            </view>
            <!-- #ifdef PUB_CUSTOMER -->
@@ -244,7 +245,9 @@
                </view>
                <view class="flex service-icons-container">
                    <view class="service-icons" @click="goto('/sub_pages/customer/self/sign',true)">
                        <image src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7e/7ec5bba5748d4414befb413f38c0f674icon-sign-home.png" class="service-icon ">
                        <image
                            src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/7e/7ec5bba5748d4414befb413f38c0f674icon-sign-home.png"
                            class="service-icon ">
                        </image>
                        <view>签到</view>
                        <view v-if="!signToday" class="dot"></view>
@@ -346,8 +349,7 @@
                </view>
            </view>
            <!-- #ifdef PUB_PARTNER -->
            <view class="user-util m-t-12 flex"
                v-if="
            <view class="user-util m-t-12 flex" v-if="
                    selftype==='partner'&& $hasPermission('partner:mine:reg:qrcode')
                    &&currentInfo.partnerDTO&&currentInfo.partnerDTO.id&&currentInfo.partnerDTO.status=='P'"
                @click="goto('/sub_pages/partner/partner-info/partner-code',true)">
@@ -374,13 +376,11 @@
                </view>
            </view>
            <!-- #endif -->
            <view class="user-util m-t-12 flex"
                v-if="
            <view class="user-util m-t-12 flex" v-if="
                (selftype==='supplier'&&currentInfo&&currentInfo.id&&currentInfo.supplierDTO&&currentInfo.supplierDTO.status==='P'
                    && $hasPermission('supplier:mine:edit:info')
                )
                "
                @click="goto('/sub_pages/supplier/supplier-info/supplier-info-update',true)">
            " @click="goto('/sub_pages/supplier/supplier-info/supplier-info-update', true)">
                <view class="title">信息维护</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
@@ -402,12 +402,10 @@
                </view>
            </view> -->
            <view class="user-util m-t-12 flex"
             v-if="
            <view class="user-util m-t-12 flex" v-if="
                (selftype==='supplier' && $hasPermission('supplier:mine:edit:password') )
                || (selftype==='partner' && $hasPermission('partner:mine:edit:password'))
             "
             @click="goto('/pages/user/user-pwd/user-pwd',true)">
            " @click="goto('/pages/user/user-pwd/user-pwd', true)">
                <view class="title">修改密码</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
@@ -438,11 +436,9 @@
            </view> -->
            <!-- v-if="selftype==='customer'" -->
            <view class="user-util m-t-12 flex"
              v-if="
            <view class="user-util m-t-12 flex" v-if="
                  (selftype==='supplier' && $hasPermission('supplier:mine:logout')) || 
                (selftype==='partner' &&  $hasPermission('partner:mine:logout')) "
             @click="clearlogout">
                (selftype === 'partner' && $hasPermission('partner:mine:logout'))" @click="clearlogout">
                <view class="title">退出登录</view>
                <view class="right-icon">
                    <uni-icons type="right"></uni-icons>
@@ -650,7 +646,13 @@
        },
        async onPullDownRefresh() {
        // 需要判断当前是否是子账号,如果是子账号则需要刷新账号切换的信息
        const currentInfo = this.$store.state.currentInfo
        if (currentInfo && currentInfo.supplierSub && currentInfo.supplierSub.id) {
            await this.$store.dispatch('getSwitchSubAccount', currentInfo.supplierSub)
        } else {
            await this.$store.dispatch('getCurrentInfo')
        }
            uni.stopPullDownRefresh()
        },
        methods: {
@@ -820,5 +822,4 @@
    @import "./user-customer.scss";
</style>
<!-- #endif -->
<style lang="scss" scoped>
</style>
<style lang="scss" scoped></style>