From c8fe8ac9339e4b202f04f05051f1207da026f8ca Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Sat, 16 Mar 2024 13:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2UI=E4=BF=AE=E6=94=B9=20=20?=
=?UTF-8?q?=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order_details/index.vue | 444 +++++++++++++++++++---------
pages/store/home/index.vue | 12 +-
pages/store/settled/index.vue | 282 ++++++++++--------
pages/store/settled/unit.vue | 208 ++++++++-----
pages/users/order_confirm/index.vue | 8 +-
5 files changed, 606 insertions(+), 348 deletions(-)
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 9141aea..58ef49a 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -4,20 +4,25 @@
-
- 卡密已自动发放 {{orderInfo.delivery_id}}
+ 卡密已自动发放 {{orderInfo.delivery_id}}
+
@@ -169,7 +199,7 @@
配送员未接单
查看详情
+ :url="'/pages/order_details/delivery?orderId=' + orderInfo.order_id">查看详情
@@ -210,7 +240,8 @@
支付方式：
余额支付
支付宝支付
- 微信支付
+ 微信支付
买家留言：
@@ -219,11 +250,13 @@
-
+
{{index}}：
{{item}}
-
+
@@ -249,39 +282,62 @@
￥{{orderInfo.pay_price}}
-
+
+
-
- 24H发货
+
+
+ {{ii}}
-
- 品牌:123123
- 规格:{{item.unit_name}}
-
+
+
+ {{item.store_info}}
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 8d5ca08..931aaf3 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -1,30 +1,43 @@
-
+
-
-
+
+ class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:#fff;">
+ style="position: absolute;bottom: 15rpx;width: 500rpx; left:50%;transform: translate(-50%);text-align: center;color:#fff;font-size: 32rpx;font-weight: bold;">
商家入驻
-
+
+
+
+
-
-
{{detail.title}}
@@ -310,7 +315,6 @@
-
@@ -482,7 +486,8 @@
page: 1,
limit: 10
},
- codenote: []
+ codenote: [],
+ barBg: false, //导航栏背景
};
},
beforeDestroy() {
@@ -492,6 +497,13 @@
sys_intention_agree: ''
}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+ onPageScroll(e) {
+ if (e.scrollTop > 50) {
+ this.barBg = true;
+ } else {
+ this.barBg = false;
+ }
+ },
onLoad(options) {
if (this.isLogin) {
this.getClassfication();
@@ -684,7 +696,6 @@
this.city_id = resData.city_id;
this.area_id = resData.area_id
this.street_id = resData.street_id
- // this.mer_storeType = resData.mer_storeType
this.village_id = resData.village_id;
const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
@@ -833,10 +844,8 @@
again() {
this.getcaptcha()
},
- /**
- * 上传文件
- *
- */
+
+ // 上传文件
uploadpic: function() {
let that = this;
that.$util.uploadImageOne('upload/image', function(res) {
@@ -844,16 +853,15 @@
that.$set(that, 'pics', that.pics);
});
},
+
uploadpicBack: function() {
let that = this;
that.$util.uploadImageOne('upload/image', function(res) {
that.bank_front = res.data.path;
});
},
- /**
- * 上传图片识别文字
- *
- */
+
+ // 上传图片识别文字
uploadpicText: function() {
let that = this;
that.$util.uploadImageOne('upload/image', function(res) {
@@ -876,16 +884,15 @@
})
});
},
- /**
- * 删除图片
- *
- */
+
+ // 删除图片
DelPic: function(index) {
let that = this,
pic = this.pics[index];
that.pics.splice(index, 1);
that.$set(that, 'pics', that.pics);
},
+
getCode() {
let that = this
getCodeApi().then(res => {
@@ -896,6 +903,7 @@
});
});
},
+
async code(data) {
let that = this;
if (!that.merchantData.phone) return that.$util.Tips({
@@ -905,27 +913,22 @@
title: '请输入正确的手机号码'
});
await verify({
- phone: that.merchantData.phone,
- // key: that.codeKey,
- // code: that.codeVal,
- type: 'intention',
- captchaType: 'blockPuzzle',
- captchaVerification: data.captchaVerification
- })
- .then(res => {
- that.$util.Tips({
- title: res.msg
- });
- that.sendCode();
- })
- .catch(res => {
- that.$util.Tips({
- title: res
- });
- if (res.status == 402) {
- // that.getcaptcha();
- }
+ phone: that.merchantData.phone,
+ // key: that.codeKey,
+ // code: that.codeVal,
+ type: 'intention',
+ captchaType: 'blockPuzzle',
+ captchaVerification: data.captchaVerification
+ }).then(res => {
+ that.$util.Tips({
+ title: res.msg
});
+ that.sendCode();
+ }).catch(res => {
+ that.$util.Tips({
+ title: res
+ });
+ });
},
getcaptcha() {
@@ -1053,72 +1056,6 @@
}
}
}
-
- // let that = this;
- // if (that.validateForm() && that.validate) {
- // if (this.num == 0) {
- // let requestData = {
- // phone: that.merchantData.phone,
- // mer_name: that.merchantData.enterprise_name,
- // name: that.merchantData.user_name,
- // code: that.merchantData.yanzhengma,
- // company_name: that.merchantData.company_name,
- // address: that.merchantData.address,
- // social_credit_code: that.merchantData.social_credit_code,
- // merchant_category_id: that.merchantData.classification,
- // mer_type_id: that.merchantData.mer_type,
- // mer_storeType: this.mer_storeType,
- // area_id: this.area_id,
- // street_id: this.street_id,
- // village_id: this.village_id,
- // is_nmsc: this.isnum,
- // images: that.pics
- // }
- // that.validate = false;
- // if (that.mer_i_id) {
- // updateGoodsRecord(that.mer_i_id, requestData).then(res => {
- // if (res.status == 200) {
- // title: '提交成功',
- // that.loading = true;
- // that.timer = setTimeout(() => {
- // that.successful = true;
- // that.validate = true;
- // }, 1000)
- // }
- // }).catch(res => {
- // this.isshow = false
- // that.validate = true;
- // that.$util.Tips({
- // title: res
- // });
- // })
- // } else {
- // create(requestData).then(data => {
- // if (data.status == 200) {
- // title: '提交成功',
- // that.loading = true;
- // this.timer = setTimeout(() => {
- // that.successful = true;
- // that.validate = true;
- // }, 1000)
- // }
-
- // }).catch(res => {
- // that.validate = true;
- // that.$util.Tips({
- // title: res
- // });
- // })
- // }
- // } else {
- // this.isshow = true
- // this.countDown()
- // }
-
- // }
-
-
-
},
validateBtn: function() {
let that = this,
@@ -1182,17 +1119,45 @@
if (!that.isAgree) return that.$util.Tips({
title: '请勾选并同意入驻协议'
});
+
if (that.isShowCode && !that.codeVal) return that.$util.Tips({
title: '请填写图片验证码'
});
if (!that.business_license) return that.$util.Tips({
title: '请上传营业执照'
});
- // if (that.pics.length == 0) return that.$util.Tips({
- // title: '请上传一张或者多张图片'
- // });
+ if (this.nature_business == 1 && !this.merchantData.bank_code) {
+ return that.$util.Tips({
+ title: '请输入对公账号'
+ });
+ }
+
+ if (this.nature_business != 1 && !this.merchantData.bank_code) {
+ return that.$util.Tips({
+ title: '请输入银行卡号'
+ });
+ }
+
+ if (!this.merchantData.bank_username) {
+ return that.$util.Tips({
+ title: '请输入开户银行'
+ });
+ }
+
+ if (!this.merchantData.bank_opening) {
+ return that.$util.Tips({
+ title: '请输入开户网点'
+ });
+ }
+
+ if (this.nature_business == 0 && !this.merchantData.bank_card_username) {
+ return that.$util.Tips({
+ title: '请输入持卡人姓名'
+ });
+ }
+
that.validate = true;
return true;
},
@@ -1223,6 +1188,46 @@