diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index f9ef44d..8c66ecb 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -18,8 +18,8 @@
-
+
请你阅读并同意我们的《隐私条款》和《隐私条款》和《服务协议》
@@ -51,7 +51,7 @@
-
@@ -80,14 +80,13 @@
-
-
+
+
-
+
-
+
忘记密码
-
+
@@ -125,8 +124,8 @@
form: {
username: '19330214982',
password: '123456',
- loginModel : 0,
- captcha : '',
+ loginModel: 0,
+ captcha: '',
},
form1: {
userName: '',
@@ -139,42 +138,44 @@
}
},
methods: {
- submit(){
- if(!this.checkboxValue.length){
+ submit() {
+ if (!this.checkboxValue.length) {
return uni.showToast({
title: '请先同意隐私协议',
- icon:'none'
+ icon: 'none'
})
}
-
- if(this.$utils.verificationAll(this.form, {
- username: '请输入账号',
- password: '请输入密码',
- })){
+
+ if (this.$utils.verificationAll(this.form, {
+ username: '请输入账号',
+ password: '请输入密码',
+ })) {
return
}
-
- if(!this.$utils.verificationPhone(this.form.username)){
+
+ if (!this.$utils.verificationPhone(this.form.username)) {
return uni.showToast({
- title: '账号请输入合法的手机号',
- icon:'none'
+ title: '请输入合法的手机号',
+ icon: 'none'
})
}
-
- if(this.titleIndex == 0){
+
+ if (this.titleIndex == 0) {
// 注册
- this.$api('registerUser', this.form, res =>{
- if(res.code == 200){
+ this.$api('registerUser', this.form, res => {
+ if (res.code == 200) {
this.titleIndex = 1
uni.showToast({
title: '注册成功，请登录！',
- icon : 'none'
+ icon: 'none'
})
}
})
- }else if(this.titleIndex == 1){
+ } else if (this.titleIndex == 1) {
// 登录
this.$store.commit('login', this.form)
+ } else {
+
}
},
// 切换页面
@@ -190,20 +191,28 @@
},
getCode() {
if (this.$refs.code.canGetCode) {
+
+ if (!this.$utils.verificationPhone(this.form1.username)) {
+ return uni.showToast({
+ title: '请输入合法的手机号',
+ icon: 'none'
+ })
+ }
+
uni.showLoading({
title: '正在获取验证码'
})
- this.$api('sendSms', {
- username: this.form1.userName,
- }, res => {
- if (res.code == 200) {
- uni.hideLoading();
- // 这里此提示会被this.start()方法中的提示覆盖
- uni.$uv.toast('验证码已发送');
- // 通知验证码组件内部开始倒计时
- this.$refs.code.start();
- }
- })
+ this.$api('sendSms', {
+ username: this.form1.userName,
+ }, res => {
+ if (res.code == 200) {
+ uni.hideLoading();
+ // 这里此提示会被this.start()方法中的提示覆盖
+ uni.$uv.toast('验证码已发送');
+ // 通知验证码组件内部开始倒计时
+ this.$refs.code.start();
+ }
+ })
} else {
uni.$uv.toast('请勿重复发送');
}
@@ -227,7 +236,7 @@
.refundsOrExchange {
background-color: #FFF;
height: 100vh;
-
+
.frame {
background-color: #FFF;
@@ -277,14 +286,14 @@
}
}
}
-
-
+
+
.btn {
// height: 5vh;
display: flex;
justify-content: center;
margin: 90rpx 0 0 0;
-
+
.a {
display: flex;
justify-content: center;
@@ -298,18 +307,18 @@
font-size: 30rpx;
}
}
-
+
.bottomTab {
display: flex;
justify-content: space-between;
height: 10vh;
padding: 0 80rpx;
margin-top: 30rpx;
-
+
.tabbarItemActive {
color: $uni-color;
}
-
+
.tabbarItemNoActive {
color: #9c9fa4;
}
diff --git a/pages_order/order/myOrderDetail.vue b/pages_order/order/myOrderDetail.vue
index b96d684..8c6e635 100644
--- a/pages_order/order/myOrderDetail.vue
+++ b/pages_order/order/myOrderDetail.vue
@@ -1,418 +1,497 @@
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
- {{ $t('other.aluminumProducts') }}
-
-
-
- {{ $t('components.productSpecification') }}：
- {{ $t('other.specification') }}
-
-
-
- {{ $t('other.pickupDate') }}：{{ orderInfo.takeTime }}
-
-
-
-
-
-
-
-
- {{ $t('components.shippingAddress') }}
-
-
- 
-
-
-
- {{ orderInfo.userName }} {{ orderInfo.phone }}
-
- {{ orderInfo.address }}
-
-
-
-
-
-
-
-
- {{ $t('components.orderInfo') }}
-
-
-
-
- {{ $t('components.orderNumber') }}
-
-
- {{ orderInfo.id }}
-
-
-
-
- {{ $t('components.orderTime') }}
-
-
- {{ orderInfo.createTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ {{ $t('other.aluminumProducts') }}
+
+
+
+ {{ $t('components.productSpecification') }}：
+ {{ $t('other.specification') }}
+
+
+
+ {{ $t('other.pickupDate') }}：{{ orderInfo.takeTime }}
+
+
+
+
+
+
+
+
+
+ 提货地址
+
+
+
+
+
+
+
+
+ {{ orderInfo.address }}
+
+
+
+
+
+
+
+
+ 供应商
+
+
+
+
+ 公司名称
+
+
+ {{ orderInfo.companyName }}
+
+
+
+
+ 联系电话
+
+
+ {{ orderInfo.phone }}
+
+
+
+
+ 开户行
+
+
+ {{ orderInfo.bankName }}
+
+
+
+
+ 银行卡号
+
+
+ {{ orderInfo.bankAccount }}
+
+
+
+
+
+
+
+
+ 采购商
+
+
+
+
+ 公司名称
+
+
+ {{ orderInfo.userName }}
+
+
+
+
+
+
+
+
+ {{ $t('components.orderInfo') }}
+
+
+
+
+ {{ $t('components.orderNumber') }}
+
+
+ {{ orderInfo.id }}
+
+
+
+
+ {{ $t('components.orderTime') }}
+
+
+ {{ orderInfo.createTime }}
+
+
+
+
+ 数量
+
+
+ {{ orderInfo.num }}
+
+
+
+
+ 单价
+
+
+ {{ orderInfo.price }}￥
+
+
+
+
+ 保证金
+
+
+ {{ orderInfo.deposit }}￥
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_order/tradingPlatform/confirmOrder.vue b/pages_order/tradingPlatform/confirmOrder.vue
index f05abef..4916a57 100644
--- a/pages_order/tradingPlatform/confirmOrder.vue
+++ b/pages_order/tradingPlatform/confirmOrder.vue
@@ -41,9 +41,9 @@
-
+