From e7731f1cf08331d23cd0d27549025a2642caa9ab Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 24 七月 2024 18:58:39 +0800
Subject: [PATCH] update todo还差个订单详情的商品列表展示
---
pages/login/supplier-reg.vue | 200 ++++++++++++++++++++++++++++++-------------------
1 files changed, 121 insertions(+), 79 deletions(-)
diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index f00fa03..0038663 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -1,63 +1,85 @@
<template>
- <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
- <image class="component-bg"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a5/a54508de179a4942918ecb2c5a4aa9f5bg.png"
- mode="scaleToFill" />
+ <view>
+ <view v-if="source==='step'" style="padding: 20rpx 0rpx;color: red;;background-color: #e6e6e6;">
+ <view style="padding: 20rpx;text-align: center;background-color: #fff;">仅限花满芫合伙人入驻</view>
+ <view v-if="source==='step'" class="" style="background-color: #fff;margin-top: 20rpx;padding: 20rpx;">
+ <u-steps current="1">
+ <u-steps-item title="信息填写" class="u-steps-item">
+ </u-steps-item>
+ <u-steps-item title="提交申请" class="u-steps-item"></u-steps-item>
+ </u-steps>
+ </view>
+ </view>
+
+
+ <view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
+ <image class="component-bg"
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a5/a54508de179a4942918ecb2c5a4aa9f5bg.png"
+ mode="scaleToFill" />
- <view class="t-login top-bg">
- <view class="nav-title">注册</view>
- <view class="login">
- <form class="cl">
- <view class="t-a titles-top">
- <view class="title-1">HELLO</view>
- <view class="title-2">欢迎入驻<span class="title-3">花满芜</span></view>
+ <view class="t-login top-bg">
+
+ <view class="nav-title" v-if="source!=='step'" :style="{'padding-top':source==='step'?'60rpx':'unset'
+ ,'padding-bottom':source==='step'?'80rpx':'unset'}">
+
+ <view>
+ 注册
</view>
+ </view>
+ <view class="login" style="padding-top: 40rpx;">
+ <form class="cl">
+ <view class="t-a titles-top">
+ <view class="title-1">HELLO</view>
+ <view class="title-2">欢迎入驻<span class="title-3">花满芫</span></view>
+ </view>
- <view class="t-a form-input" v-if="loginType=='code'">
- <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 class="t-a form-input" v-if="loginType=='code'">
+ <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>
- <!-- <u-input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber"
+ <!-- <u-input type="text" name="userName" placeholder="请输入手机号" v-model="phoneNumber"
style="position: relative;z-index: 1;" /> -->
- </view>
+ </view>
- <view class="t-a form-input" v-if="loginType=='code'">
- <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode"
+ <view class="t-a form-input" v-if="loginType=='code'">
+ <!-- <input type="text" name="userName" placeholder="请输入手机验证码" v-model="smsCode"
style="position: relative;z-index: 1;" /> -->
- <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>
-
- </view>
- <view class="t-a form-input" v-if="loginType=='code'">
- <!-- <input type="text" :password="true" name="password" placeholder="请输入密码" v-model="password" /> -->
-
- <u-input :password="true" :border="false" placeholder="请输入密码" v-model="password"></u-input>
- </view>
-
- <button @tap="login()" class="bottom-button">注 册</button>
-
- <view class="flex">
- <view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
- </view>
- <view class="flex flex-wrap-normal" style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;"
- v-if="false">
- <view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}"
- @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">
+ <u-input placeholder="请输入手机验证码" :border="false" v-model="smsCode"></u-input>
</view>
- <view class="topic-gray" @click="toProtocol">请仔细阅读《花满芜合伙人供应商入口小程序隐私保护指引》如您同意该指引，请勾选开始使用本小程序
+ <view class="t-a form-input" v-if="loginType=='code'">
+ <!-- <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>
- </form>
+
+ <button @tap="login()" class="bottom-button">注 册</button>
+
+ <view class="flex">
+ <view class="topic-font m-l-0 m-r-a" @click="backInfoPage" v-if="source==='step'">返回填写</view>
+ <view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
+ </view>
+ <view class="flex flex-wrap-normal"
+ style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="false">
+ <view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}"
+ @click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">
+
+ </view>
+ <view class="topic-gray" @click="toProtocol">请仔细阅读《花满芫合伙人供应商入口小程序隐私保护指引》如您同意该指引，请勾选开始使用本小程序
+ </view>
+ </view>
+ </form>
+ </view>
</view>
</view>
</view>
@@ -99,6 +121,10 @@
this.source = options.source || ''
},
methods: {
+ backInfoPage(){
+ console.log('backInfoPage')
+ uni.navigateBack()
+ },
toProtocol() {
uni.navigateTo({
url: '/sub_pages/supplier/protocol'
@@ -217,6 +243,17 @@
type: this.apitype
// openId: '123456789'
}
+ if (this.source == 'step') {
+ var tjson = this.$storage.getItem('cache_partner_info')
+
+ if (!tjson) {
+ this.$message.showToast('没有合伙人信息请返回重新填写')
+ return
+ }
+ var dto = JSON.parse(tjson)
+ post.dto = dto
+ }
+
// const {
// code
// } = await this.$http.request('get', '/api/login/admin')
@@ -234,41 +271,46 @@
title: '注册成功！',
icon: 'none'
});
- if (this.source == 'step') {
- // cache_partner_info
- var tjson = this.$storage.getItem('cache_partner_info')
- if (tjson) {
- var dto = JSON.parse(tjson)
- {
-
- this.$message.showLoading()
- const re = await this.$http.request('post', '/api/partner/addOrUpdate', {
- data: dto
- })
- this.$message.hideLoading()
- if (re.code == 2000 || re.code == 0) {
- this.toLogin()
- } else {
- this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
- setTimeout(() => {
- this.toLogin()
- }, 1000);
- }
- }
- }
-
- }else{
- this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
- setTimeout(() => {
- this.toLogin()
- }, 1000);
- }
+ setTimeout(() => {
+ this.toLogin()
+ }, 1000);
+ // if (this.source == 'step') {
+ // // cache_partner_info
+ // var tjson = this.$storage.getItem('cache_partner_info')
+ // if (tjson) {
+ // var dto = JSON.parse(tjson)
- } else {
- setTimeout(() => {
- this.toLogin()
- }, 1000);
- }
+
+ // this.$message.showLoading()
+ // const re = await this.$http.request('post', '/api/partner/addOrUpdate', {
+ // data: dto
+ // })
+ // this.$message.hideLoading()
+ // if (re.code == 2000 || re.code == 0) {
+ // this.$storage.removeItem('cache_partner_info')
+
+ // this.toLogin()
+ // } else {
+ // this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
+ // setTimeout(() => {
+ // this.toLogin()
+ // }, 1000);
+ // }
+
+
+
+ // } else {
+ // this.$message.showToast('合伙人信息失效，请登录后重新填写提交审核')
+ // setTimeout(() => {
+ // this.toLogin()
+ // }, 1000);
+ // }
+
+ // } else {
+ // setTimeout(() => {
+ // this.toLogin()
+ // }, 1000);
+ // }
} else {
@@ -276,7 +318,7 @@
// title: '登录失败！',
// icon: 'none'
// });
- return;
+ return
}
},
--
Gitblit v1.9.3