xuxueyang
2024-07-17 b75418f77342f81cd3c1ecf8897759e6bbaea6fa
update 合伙人功能更新
已修改5个文件
62 ■■■■ 文件已修改
pages/home/supplier-home.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/login/supplier-login.vue 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
store/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/partner/markup-config/markup-config.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/partner/order-manage/order-manage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/supplier-home.vue
@@ -34,7 +34,7 @@
            <view class="flex tj-container" v-if="selftype==='partner'">.
                <view class="tj-each">
                    <view class="num total">
                        ¥999.80
                        ¥0.00
                    </view>
                </view>
                <view class="tj-each" style="flex: 1;">
pages/login/supplier-login.vue
@@ -14,35 +14,35 @@
                        <view class="title-2">欢迎登录<span class="title-3">花满芜</span></view>
                    </view>
                    <view class="t-a input form-input" v-if="loginType=='pwd'">
                        <!-- <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> -->
                        <u-input placeholder="请输入账号"    :border="false"   v-model="userName"></u-input>
                        <!-- <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> -->
                        <u-input placeholder="请输入账号" :border="false" v-model="userName"></u-input>
                    </view>
                    <view class="t-a input form-input" v-if="loginType=='pwd'">
                        <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> -->
                        <u-input :password="true" :border="false"     placeholder="请输入密码" v-model="password"></u-input>
                        <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> -->
                        <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input>
                    </view>
                    <view class="t-a input form-input" v-if="loginType=='code'">
<!--                         <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" />
                        <!--                         <input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber" />
                        <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
                            {{getCodeText}}
                        </view> -->
                        <u-input placeholder="请输入手机号"  :border="false"  v-model="phoneNumber">
                            <template slot="suffix">
                                <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
                                    {{getCodeText}}
                                </view>
                            </template>
                        </view> -->
                        <u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
                            <template slot="suffix">
                                <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
                                    {{getCodeText}}
                                </view>
                            </template>
                        </u-input>
                    </view>
                    <view class="t-a form-input" v-if="loginType=='code'">
                        <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> -->
                        <u-input placeholder="请输入手机验证码"    :border="false"   v-model="smsCode"></u-input>
                        <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode" /> -->
                        <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>
                    </view>
                    <button @tap="login()" class="bottom-button">登 录</button>
@@ -106,7 +106,7 @@
            };
        },
        methods: {
            async getCode() {
            async getCode() {
                console.log('getCode')
                uni.hideKeyboard() //隐藏已经显示的软键盘,如果软键盘没有显示则不做任何操作。
                if (this.getCodeisWaiting) {
@@ -126,7 +126,7 @@
                } = await this.$http.request('post', '/api/sms/send/code', {
                    data: {
                        tel: this.phoneNumber,
                        userType: 'supplier'
                        userType: this.apitype.replace("login", "").toLowerCase() || 'supplier'
                    }
                })
                if (code == 0) {
@@ -135,7 +135,7 @@
                        icon: "none"
                    });
                    this.setTimer(); //调用定时器方法
                }else{
                } else {
                    this.getCodeText = "获取验证码" //发送验证码
                    this.getCodeisWaiting = false;
                    this.getCodeBtnColor = "#20613D";
@@ -266,17 +266,19 @@
    .form-input {
        background-color: #f8f7fc;
        border-radius: 50rpx;
        margin-bottom: 50rpx;
        margin-bottom: 50rpx;
        border: 1px solid #e9e9e9;
        /deep/ .u-input{
            padding-left: 60rpx !important;
            padding-right: 40rpx !important;
        /deep/ .u-input {
            padding-left: 60rpx !important;
            padding-right: 40rpx !important;
        }
        /deep/ input {
            height: 70rpx;
            line-height: 70rpx;
        }
            line-height: 70rpx;
        }
    }
</style>
store/index.js
@@ -284,7 +284,7 @@
                            const resp = await http.request('post', '/api/login/partner' + ((data
                                .phoneNumber||data.tel) ? '/phone' : ''), {
                                data: {
                                    username: data.username,
                                    username: (data.phoneNumber ||data.tel)?(data.phoneNumber || data.tel): data.username,
                                    password: data.password,
                                    tel: data.phoneNumber || data.tel,
                                    smsCode: data.smsCode || ''
sub_pages/partner/markup-config/markup-config.vue
@@ -84,7 +84,7 @@
            }
        },
        onLoad() {
            this.listApi = '/api/flower/markup/spcg/list'
            this.listApi = ''
            this.getList()
        },
sub_pages/partner/order-manage/order-manage.vue
@@ -34,7 +34,7 @@
            }
        },
        onLoad() {
            this.listApi = '/api/ua/announcement/list'
            this.listApi = ''
            this.getList()
        },