update1

xuxy

2024-06-27 36f5a552738ff64d35e5508a1db8c2249b9187b0

update1

 common/global.scss

@@ -62,6 +62,17 @@
    background: #fff;
    
}
.component-bg{
    position: absolute;
    left: 0;
    right: 0;
    bottom: 0;
    top: 0;
    width: 100%;
    height: 100;
    height: 100%;
    z-index: -1;
}
.component-popup_input{
    margin: 0 auto;
    margin-top: calc(50% + 200rpx);

 common/self.scss

@@ -1,5 +1,5 @@
/* $self-gray: #9a9da2; */
:root {
:root,page {
    --selfgray: #9a9da2;
    --self_light_gray: #dce3e9;
    --title_font_size: 60rpx;
@@ -21,11 +21,17 @@
    font-family: PingFangSC-Regular, PingFang SC;
}
.topic-font{
    color: var(--topicolor);
    color: var(--topicolor) !important;
}
.flex-wrap-normal{
    flex-wrap: nowrap;
}
.topic-gray{
    color: var(--topicgray);
}
.relative{
    position: relative;
}
.t-red{
    color: #CE3C39 !important;
}

 manifest.json

@@ -49,17 +49,13 @@
    "quickapp" : {},
    /* 快应用特有相关 */
    "mp-weixin" : {
        "appid" : "wxafc5aaa0fc79532b",
        "appid" : "wx3203fd935a6ffe09",
        "setting" : {
            "urlCheck" : false
            "urlCheck" : false,
            "es6" : true
        },
        "usingComponents" : true,
        "plugins" : {
            "kdPlugin" : {
                "version" : "1.1.2",
                "provider" : "wx6885acbedba59c14"
            }
        }
        "plugins" : {}
    },
    "vueVersion" : "2"
}

 pages/home/farmer-home.vue

@@ -9,15 +9,15 @@
                首页

            </view>
            <view class="flex m-t-20 user-info" v-if="currentInfo&&(currentInfo.id)">
            <view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
                <!-- 头像 -->
                <image class="user-icon" v-if="!currentInfo.picture" src="../../static/imgs/home/home-shop-top-icon.png"
                    mode="aspectFit"></image>
                <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>

                <view class="name" style="margin-top: 12rpx;">
                    <view class="t1">{{currentInfo.nickName || '-'}}</view>
                    <view class="t2 m-t-12">{{currentInfo.tel || '暂无电话'}}</view>
                <view class="name" >
                    <view class="t1" >{{currentInfo.nickName || '-'}}</view>
                    <view class="t2">{{currentInfo.tel || '暂无电话'}}</view>
                </view>
            </view>


 pages/login/farmer-login.vue

@@ -1,6 +1,8 @@
<template>
    <view class="main-container login-container img100" style="margin-top: 0rpx;">
    <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
        <!-- background-image:url('@/static/images/farmer/login/bg.png') -->

        <image class="component-bg" src="/static/images/farmer/login/bg.png" mode="scaleToFill" />
        <view class="t-login top-bg">
            <view class="nav-title">登录</view>
            <view class="login">
@@ -26,7 +28,7 @@


                    <view class="t-a input" v-if="loginType=='code'">
                        <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" />						
                        <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" />
                    </view>

                    <button @tap="login()" class="bottom-button">登 录</button>
@@ -34,7 +36,7 @@
                    <view class="flex">
                        <view class="topic-font" v-if="loginType=='pwd'" @click="loginType='code'">手机验证码登录</view>
                        <view class="topic-font" v-if="loginType=='code'" @click="loginType='pwd'">账号密码登录</view>
						

                        <view class="topic-font m-l-a m-r-0" @click="toReg">前往注册</view>
                    </view>
                </form>
@@ -54,10 +56,10 @@
                password: '123456',
                // userName: '',
                // password: '',
				

                phoneNumber: '',
                smsCode:'',
				
                smsCode: '',

                checked: false,
                loginType: 'pwd', //pwd和code，密码和验证码登录
                pcfvalue: undefined,
@@ -260,10 +262,11 @@

    .t-login .t-a {
        position: relative;
        .get-code{

        .get-code {
            position: absolute;
            right: 40rpx;
            top: 20rpx;
            top: 25rpx;
        }
    }


 pages/login/login.scss

@@ -1,6 +1,7 @@
.login-container{
    min-height: 99vh;
        background-image: url('@/static/images/farmer/login/bg.png');
        min-height: 99vh;
        // background-image: url('@/static/images/farmer/login/bg.png');
		
        .nav-title{
            font-weight: 400;
            font-size: 32rpx;

 pages/user/farmer-user.vue

@@ -4,23 +4,24 @@
            我的
        </view> -->
        <!-- 背景图 -->
        <view class="top-bg img100" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
        <view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
            <image class="component-bg" src="/static/images/farmer/user/bg.png" mode="scaleToFill" />
			
            <view class="title" style="position: relative;">
                我的

            </view>
            <view class="flex m-t-20 user-info" v-if="currentInfo&&(currentInfo.id)">
            <view class="flex user-info" v-if="currentInfo&&(currentInfo.id)">
                <!-- 头像 -->
                <image class="user-icon" v-if="!currentInfo.picture" src="../../static/imgs/home/home-shop-top-icon.png"
                    mode="aspectFit"></image>
                <image class="user-icon" v-if="currentInfo.picture" :src="currentInfo.picture" mode="aspectFit"></image>

                <view class="name" style="margin-top: 12rpx;">
                <view class="name">
                    <view class="t1">{{currentInfo.nickName || '-'}}</view>
                    <view class="t2 m-t-12">{{currentInfo.tel || '暂无电话'}}</view>
                    <view class="t2">{{currentInfo.tel || '暂无电话'}}</view>
                </view>
            </view>


        </view>
        <view class="user-utils m-20">
@@ -62,7 +63,7 @@
        </view>
        <farmer-footer flg="1"></farmer-footer>

	 

    </view>
</template>

@@ -75,35 +76,35 @@
                tcode: '',
                inviterName: '',
                // StatusBar:0,
                tel:'1386785374'
                tel: '1386785374'
            };
        },
 

        onLoad(options) {
            const url = options.q ? decodeURIComponent(options.q) : '';
            const urlcode = options.url&&decodeURIComponent(options.url) || ''
            const urlcode = options.url && decodeURIComponent(options.url) || ''
        },
        created() {

        },
        methods: {
			

            async clearlogout() {
                await this.$message.confirm('是否退出登录?')
                this.$store.commit('updateLogin',false)
				
                this.$store.commit('updateLogin', false)

                uni.reLaunch({
                    url: '/pages/login/farmer-login'
                })
            },
            async callTel(){
            async callTel() {
                await this.$message.confirm('是否拨打客服电话')
                uni.makePhoneCall({
                    phoneNumber: this.tel //仅为示例
                });
            }

	

        }
    }
</script>

 pages/user/user-info/user-info.vue

@@ -101,7 +101,7 @@
                    this.dto.picture = picture
                }
                
                // #ifdef MP

                const {
                    code
                } = await this.$http.request('post', "/api/current/user/update", {
@@ -111,7 +111,7 @@
                        // fullName: this.dto.nickName
                    }
                })
                // #endif
		
                // // #ifndef MP
                // if (!!this.dto.email) {
                //     if (!this.$util.isEmail(this.dto.email)) {
@@ -131,14 +131,13 @@
                // // #endif
                this.$message.hideLoading()

                // #ifdef MP
                if (code == 0) {
                    this.$message.showToast('更新成功')
                    // this.$store.commit('updateInfo',this.dto)
                    // }
                    await this.$store.dispatch('getCurrentInfo');
                }
                // #endif



            },

 pages/user/user.scss

@@ -56,6 +56,7 @@
    
    .user-info{
        padding: 28rpx 24rpx;
        padding-bottom: 0rpx;
        // background: #FFFFFF;
        border-radius: 16rpx;
        // line-height:  116rpx;
@@ -63,6 +64,9 @@
            font-weight: 600;
            font-size: 32rpx;
            color: #000000;
            .t1{
                 line-height: 50rpx;
            }
        }
        .user-icon{
            width: 116rpx;

 sub_pages/farmer/farmer-reg/farmer-reg.vue

@@ -1,5 +1,6 @@
<template>
    <view class="main-container login-container img100" style="margin-top: 0rpx;">
    <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
        <image class="component-bg" src="/static/images/farmer/login/bg.png" mode="scaleToFill" />

        <view class="t-login top-bg">
            <view class="nav-title">注册</view>
@@ -255,7 +256,7 @@
        .get-code {
            position: absolute;
            right: 40rpx;
            top: 20rpx;
            top: 25rpx;
        }
    }


 sub_pages/farmer/flower-manage/flower-manage.vue

@@ -90,7 +90,7 @@
                    </view>

                    <!-- 输入框-->
                    <view class="flex w-fit">
                    <view class="flex w-fit ">

                        <u-input v-model="content" :placeholder="inputplaceholder" type="digit"
                            style="max-width: 390rpx;background-color: #F2F2F2;" v-if="currentInputKey=='price'" />
@@ -102,7 +102,7 @@
                </view>
                <!-- 提交按钮 -->
                <view class="line-gray" style="margin-bottom: 0px;"></view>
                <view class="flex">
                <view class="flex  flex-wrap-normal">
                    <u-button type="default" class="w-fit  flex1 " text="取消"
                        @click="()=>{$refs.popup_input.close()}"></u-button>
                    <view class="component-line-vert"></view>

 sub_pages/farmer/order-sale/order-sale.vue

@@ -92,7 +92,7 @@
    .order-sale-list {
        .order-sale-item {
            margin-bottom: 20rpx;
            padding: 28rpx;
            padding: 22rpx;

            .title {
                font-weight: 600;
@@ -109,7 +109,7 @@

            .form {
                display: flex;

                flex-wrap: wrap;
                .form-item {
                    flex: 1;
                    min-width: 40%;