update 花店小程序

xuxueyang

2024-07-08 d8ad0c1805b0701afadd069c79950edde490d5c9

update 花店小程序

 components/footer/bussincess-footer.vue

文件已删除

 components/footer/customer-footer.vue

对比新文件
@@ -0,0 +1,85 @@
<template>

    <view class="footer flex customer-footer" style="">

        <view v-for="(item,index) in tabBar" :key="index" class="footer-item">

            <view class="item flex" :class="flg==index?'cur':''" @click="go(index,item)">



                <view v-if="index==0">

                    <image src="../../static/images/customer/footer/footer-home-1.png" class="footer-icon" v-if="flg==0"></image>

                    <image src="../../static/images/customer/footer/footer-home-0.png" class="footer-icon" v-if="flg!=0"></image>

                </view>

                <view v-if="index==1">

                    <image src="../../static/images/customer/footer/footer-trade-1.png" class="footer-icon" v-if="flg==0"></image>

                    <image src="../../static/images/customer/footer/footer-trade-0.png" class="footer-icon" v-if="flg!=0"></image>

                </view>

                <view v-if="index==2">

                    <image src="../../static/images/customer/footer/footer-shopping-1.png" class="footer-icon" v-if="flg==0">

                    </image>

                    <image src="../../static/images/customer/footer/footer-shopping-0.png" class="footer-icon" v-if="flg!=0">

                    </image>

                </view>

                <view v-if="index==3">

                    <image src="../../static/images/customer/footer/footer-self-1.png" class="footer-icon" v-if="flg==1"></image>

                    <image src="../../static/images/customer/footer/footer-self-0.png" class="footer-icon" v-if="flg!=1"></image>

                </view>



                <view>

                    {{item.text}}

                </view>



            </view>

        </view>





    </view>

</template>

<script>

    export default {

        data() {

            return {

                tabBar: [{



                        "text": "首页"

                    },

                    {



                        "text": "交易大厅"

                    },

                    {



                        "text": "购物车"

                    },

                    {

                        "text": "我的"

                    }

                ]

            }

        },

        props: {

            flg: {

                type: String,

            },

            bussincess: {

                type: Boolean,

                default () {

                    return false

                }

            }

        },

        created() {},

        methods: {



            go(index, item) {

                if (this.flg == ('' + index)) {

                    return

                }

                uni.redirectTo({

                    url: item.pagePath



                });

            },

        }

    }

</script>

<style lang="scss">

    @import "./main.scss";

</style>

 main.js

@@ -48,8 +48,16 @@



// #ifdef PUB_CUSTOMER
import customerFooter from '@/components/footer/customer-footer'
Vue.component('common-footer', customerFooter)
// #endif

// #ifndef PUB_CUSTOMER
import supplierfooter from '@/components/footer/supplier-footer'
Vue.component('supplier-footer', supplierfooter)
Vue.component('common-footer', supplierfooter)
// #endif

import nodata from '@/components/no-data'
Vue.component('no-data', nodata)
// import bfooter from '@/components/footer/bussincess-footer'

 package.json

@@ -22,6 +22,17 @@
                "define": {

                    "PUB_PARTNER": true

                }

            },
            "customer":{
                "title": "花店/用户-小程序",
                "BROWSER": "Chrome",
                "env": {
                    "UNI_PLATFORM": "mp-weixin",
                    "PUB_TYPE": "customer"
                },
                "define": {
                    "PUB_CUSTOMER": true
                }
            }



        }


 pages.json

@@ -3,7 +3,19 @@
    "easycom": {
        "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
    },
    "pages": [{
    "pages": [

        // #ifdef PUB_CUSTOMER 
        {

            "path": "pages/home/home",

            "style": {

                "navigationBarTitleText": "首页",

                "enablePullDownRefresh": true,

                "navigationStyle": "custom"

            }



        },

        // #endif 
        {

            "path": "pages/login/supplier-login",
            "style": {
                "navigationBarTitleText": "登录",
@@ -18,7 +30,8 @@
                "navigationStyle": "custom"
            }

        }, {
        },

        {

            "path": "pages/user/supplier-user",
            "style": {
                "navigationBarTitleText": "我的",
@@ -49,8 +62,7 @@
        },
        {
            "path" : "pages/user/user-pwd/user-pwd",
            "style" : 
            {
            "style": {

                "navigationBarTitleText" : "修改密码",
                "enablePullDownRefresh" : false
            }
@@ -90,7 +102,7 @@
                "path": "order-records/order-records",
                "style": {
                    "navigationBarTitleText": "扣款记录",
                    "enablePullDownRefresh": false,
                    "enablePullDownRefresh": true,

                    "navigationBarBackgroundColor": "#E6F2EB"

                }
@@ -111,8 +123,7 @@
            },
            {
                "path" : "protocol",
                "style" : 
                {
                "style": {

                    "navigationBarTitleText" : "协议",
                    "enablePullDownRefresh" : false
                }
@@ -124,18 +135,34 @@
        "root": "sub_pages/partner",
        "pages": [{
            "path" : "order-manage/order-manage",
            "style" : 
            {
                "style": {

                "navigationBarTitleText" : "订单管理",
                "enablePullDownRefresh" : false
                    "enablePullDownRefresh": true

            }
        },
        {
            "path" : "markup-config/markup-config",
            "style" : 
            {
                "style": {

                "navigationBarTitleText" : "加价配置",
                "enablePullDownRefresh" : false
                    "enablePullDownRefresh": true

                }

            }



        ]

    }, {

        "root": "sub_pages/customer",

        "pages": [{

                "path": "trade/trade",

                "style": {

                    "navigationBarTitleText": "交易大厅",

                    "enablePullDownRefresh": true

                }

            },

            {

                "path": "shopping/shopping",

                "style": {

                    "navigationBarTitleText": "购物车",

                    "enablePullDownRefresh": true

            }
        }
            

 pages/home/bussiness-home.vue

文件已删除

 pages/home/components/home-buttons.vue

文件已删除

 pages/home/components/home-goods.vue

文件已删除

 pages/home/home.vue

@@ -110,7 +110,7 @@
        </view>
        <view style="padding-bottom:200rpx">
        </view>
        <supplier-footer flg="0"></supplier-footer>
        <common-footer flg="0"></common-footer>

    </view>
</template>

 pages/home/supplier-home.vue

@@ -171,7 +171,7 @@

        <view style="padding-bottom:200rpx">
        </view>
        <supplier-footer flg="0"></supplier-footer>
        <common-footer flg="0"></common-footer>


    </view>

 pages/login/supplier-login.vue

@@ -62,6 +62,9 @@
                    // #ifdef PUB_PARTNER
                    return 'loginPartner'
                    // #endif                    
                    // #ifdef PUB_CUSTOMER

                    return 'loginCustomer'

                    // #endif	
                    return ''
                    // return 'loginPartner'
                }

 pages/user/supplier-user.vue

@@ -31,6 +31,77 @@
            </view>

        </view>
        <!-- #ifdef PUB_CUSTOMER -->

        <view class="user-utils m-20" v-if="selftype==='customer'">

            <view class="user-util m-t-12 user-customer-order-infos">

                <view class="title flex">

                    <view>我的订单</view>

                    <view class="m-r-a m-r-0 more">全部订单<uni-icons type="right"></uni-icons></view>

                </view>

                <view class="flex order-icons-container">

                    <view class="order-icons">

                        <image src="../../static/images/customer/order/order-type-1.png" class="order-icon dfk"></image>

                        <view>待付款</view>

                    </view>

                    <view class="order-icons">

                        <image src="../../static/images/customer/order/order-type-2.png" class="order-icon dfh"></image>

                        <view>待发货</view>

                    </view>

                    <view class="order-icons">

                        <image src="../../static/images/customer/order/order-type-3.png" class="order-icon dsh"></image>

                        <view>待收货</view>

                    </view>

                    <view class="order-icons">

                        <image src="../../static/images/customer/order/order-type-4.png" class="order-icon dpj"></image>

                        <view>待评价</view>

                    </view>

                    <view class="order-icons">

                        <image src="../../static/images/customer/order/order-type-5.png" class="order-icon sh"></image>

                        <view>售后</view>

                    </view>

                </view>

            </view>

        </view>

        <view class="user-utils m-20" v-if="selftype==='customer'">

            <view class="user-util m-t-12 user-customer-service-infos">

                <view class="title flex">

                    <view>我的服务</view>

                </view>

                <view class="flex service-icons-container">

                    <view class="service-icons">

                        <image src="../../static/images/customer/service/service-icon-1.png" class="service-icon ">

                        </image>

                        <view>关注店铺</view>

                    </view>

                    <view class="service-icons">

                        <image src="../../static/images/customer/service/service-icon-2.png" class="service-icon ">

                        </image>

                        <view>我的收藏</view>

                    </view>
                    <view class="service-icons">
                        <image src="../../static/images/customer/service/service-icon-3.png" class="service-icon ">
                        </image>
                        <view>地址管理</view>
                    </view>
                    <view class="service-icons">
                        <image src="../../static/images/customer/service/service-icon-4.png" class="service-icon ">
                        </image>
                        <view>售后规则</view>
                    </view>
                    <view class="service-icons">
                        <image src="../../static/images/customer/service/service-icon-5.png" class="t2 service-icon ">
                        </image>
                        <view>新手帮助</view>
                    </view>
                    <view class="service-icons">
                        <image src="../../static/images/customer/service/service-icon-6.png" class="t2 service-icon ">
                        </image>
                        <view>运费详查</view>
                    </view>

                </view>

            </view>

        </view>

        <!-- #endif -->

        <view class="user-utils m-20">
            <view class="user-util m-t-12 flex" @click="goto('/pages/user/user-info/user-info',true)">
                <view class="title">个人信息</view>
@@ -51,7 +122,7 @@
                    <uni-icons type="right"></uni-icons>
                </view>
            </view>
            <view class="user-util m-t-12 " @click="callTel" v-if="selftype==='supplier'">
            <view class="user-util m-t-12 " @click="callTel" v-if="selftype==='supplier'||selftype==='customer'">

                <view class="title">我的客服</view>
                <view class="flex">
                    <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image>
@@ -71,13 +142,22 @@
        </view>



        <!-- #ifdef PUB_CUSTOMER -->
        <view style="padding-bottom:200rpx">
        </view>
        <common-footer flg="4"></common-footer>
        <!-- #endif -->
        <!-- #ifndef PUB_CUSTOMER -->
        <view class="button-login-out topic-gray" @click="clearlogout">
            退出登录
        </view>

        <view style="padding-bottom:200rpx">
        </view>
        <supplier-footer flg="1"></supplier-footer>
        <common-footer flg="1"></common-footer>
        <!-- #endif -->

		


    </view>
@@ -132,6 +212,10 @@
<style lang="scss" scoped>
    @import "./user.scss";
</style>

<!-- #ifdef PUB_CUSTOMER -->

<style lang="scss" scoped>

    @import "./user-customer.scss";

</style>

<!-- #endif -->

<style lang="scss" scoped>
</style>

 pages/user/user-customer.scss

对比新文件
@@ -0,0 +1,68 @@
.user-customer-order-infos{
    .more{
        font-weight: 400;
        font-size: 24rpx;
        color: #666666;
        line-height: 34rpx;
    }
    .order-icons-container{
        .order-icons{
            margin: 0 auto;
            margin-top: 26rpx;
            text-align: center;
            width: fit-content;
            font-weight: 400;
            font-size: 24rpx;
            color: #000000;
            line-height: 34rpx;
            .order-icon{
                flex:1;
                margin: 0 auto;
                width: 52rpx;
                height: 52rpx;
            }
            .order-icon.dsh{
                width: 48rpx;
                height: 46rpx;
                margin-top: 3rpx;
            }
            .order-icon.sh{
                width: 48rpx;
                height: 46rpx;
                margin-top: 3rpx;
            }
        }
        .order-icons:last-child{
            margin-right: 0rpx;
        }
        .order-icons:first-child{
            margin-left: 0rpx;
        }
    }

}


.user-customer-service-infos{
    .service-icons-container{
        flex-wrap: wrap;
        .service-icons{
            min-width: 25%;
            max-width: 33%;
            flex: 1;
            margin: 0 auto;
            margin-top: 24rpx;
            text-align: center;
            .service-icons{
                height: 52rpx;
                width: 52rpx;
            }
            .service-icons.t2{
                height: 52rpx;
                width: 56rpx;
            }
        }
		
    }
}


 static/images/customer/footer/footer-home-0.png

 static/images/customer/footer/footer-home-1.png

 static/images/customer/footer/footer-self-0.png

 static/images/customer/footer/footer-self-1.png

 static/images/customer/footer/footer-shopping-0.png

 static/images/customer/footer/footer-shopping-1.png

 static/images/customer/footer/footer-trade-0.png

 static/images/customer/footer/footer-trade-1.png

 static/images/customer/order/order-type-1.png

 static/images/customer/order/order-type-2.png

 static/images/customer/order/order-type-3.png

 static/images/customer/order/order-type-4.png

 static/images/customer/order/order-type-5.png

 static/images/customer/service/service-icon-1.png

 static/images/customer/service/service-icon-2.png

 static/images/customer/service/service-icon-3.png

 static/images/customer/service/service-icon-4.png

 static/images/customer/service/service-icon-5.png

 static/images/customer/service/service-icon-6.png

 store/index.js

@@ -392,7 +392,43 @@
                            return resp
                        }

                    },
				
                    loginCustomer:async function({
                        commit,
                        dispatch,
                        state
                    }, data) {
                        {
                            const resp = await http.request('post', '/api/login/customer' + (data
                                .phoneNumber ? '/phone' : ''), {
                                data: {
                                    username: data.username,
                                    password: data.password,
                                    tel: data.phoneNumber || data.tel,
                                    smsCode: data.smsCode || ''
                                },
                                params: {
                                    clientType: data.clientType || 'app'
                    }
                            })
                            console.log('resp', resp)
                            if (resp && resp.code == 0) {
                                storage.setItem('token', resp.data.access_token)
                                commit("updateLogin", true)
                                await dispatch('getCurrentInfo')
                                uni.reLaunch({
                                    url: '/pages/home/home'
                                })
                            } else {


                            }
                            return resp
                        }

                    },
					
                }
            })


 sub_pages/customer/shopping/shopping.vue

对比新文件
@@ -0,0 +1,22 @@
<template>
    <view>
		
    </view>
</template>

<script>
    export default {
        data() {
            return {
				
            }
        },
        methods: {
			
        }
    }
</script>

<style>

</style>

 sub_pages/customer/trade/trade.vue

对比新文件
@@ -0,0 +1,22 @@
<template>
    <view>
		
    </view>
</template>

<script>
    export default {
        data() {
            return {
				
            }
        },
        methods: {
			
        }
    }
</script>

<style>

</style>

 sub_pages/partner/order-manage/order-manage.vue

@@ -1,7 +1,7 @@
<template>
    <view class="list-container order-settlement supplier">
        <view class="component-tab-container m-t-12">
            <view class="tab-item" :class="[tabIndex==0?'cur':'']" @click="changeIndex(0)">带配送</view>
            <view class="tab-item" :class="[tabIndex==0?'cur':'']" @click="changeIndex(0)">待配送</view>
            <view class="tab-item" :class="[tabIndex==1?'cur':'']" @click="changeIndex(1)">已配送</view>
        </view>