From d410edde864a5200123ae8353254dc38605640b5 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 16 May 2024 15:26:07 +0800
Subject: [PATCH] add
---
pages/gather/subnvue/concat.nvue | 4 +---
pages/index/subnvue/concat.nvue | 2 +-
pages/store/settled/index.vue | 39 +++++---------------------------
3 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue
index 6176600..ff635da 100644
--- a/pages/gather/subnvue/concat.nvue
+++ b/pages/gather/subnvue/concat.nvue
@@ -16,14 +16,12 @@
<view class="tips-box" :style="{ left:left+'px',top:(top+80)+'px'}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras" :class="{act:isActive}">
- <text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+ <text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击供销助农平台进入商户平台</text>
</view>
</view>
<image src="/static/images/starpng.png" class="start" mode="">
</image>
</view>
-
-
<view class="next-btn center">
<text class="next-btn-text font" @click="next">下一步(2/4)</text>
</view>
diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue
index b1c0b62..ac4ac52 100644
--- a/pages/index/subnvue/concat.nvue
+++ b/pages/index/subnvue/concat.nvue
@@ -9,7 +9,7 @@
<view class="tips-box" :style="{right:20, top:(offsetY-218)+'px'}">
<view class="tips" style="position: absolute;padding-left: 20px;">
<view class="tras" :class="{act:isActive}">
- <text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+ <text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击生产页面，进入办公助手</text>
</view>
</view>
<image src="/static/images/starpng.png" class="start" mode="">
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 8a7befd..cac839f 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -423,15 +423,15 @@
uniMP.loadAppletMP(this.uniMpInfo)
},
splitAddress(str) {
- if (!str.includes('省')) str = "四川省" + str;
- var reg = /.+?(省|市|自治区|自治州|县|区|镇|社区|街道|村|街)/g; // 省市区的正则
+ var reg = /.+?(省|市|自治区|自治州|县|区)/g; // 省市区的正则
let list = str.match(reg)
- console.log(list, 'xiugiahou1de1address')
+ if (!list[0].includes("省")) {
+ list.unshift('')
+ }
this.formData.province_name = list[0]
this.formData.city_name = list[1]
this.formData.area_name = list[2]
- this.formData.street_name = list[3]
- this.formData.village_name = list[4]
+
},
confirmCate(e) {
this.formData.merchant_category_name = e.value[0].category_name
@@ -486,7 +486,6 @@
that.formData.address = res.data.address;
that.formData.name = res.data.legal_person;
that.formData.social_credit_code = res.data.register_number;
- // that.formData.social_credit_code = this.generateRandomNumbers(1, 10000, 99999)[0];
that.formData.company_name = res.data.name;
} else {
that.$util.Tips({
@@ -554,6 +553,7 @@
return Toast("请勾选用户协议")
}
this.splitAddress(this.formData.address)
+ return
this.formData.step = this.step
if (this.step == 2) {
@@ -562,24 +562,6 @@
} else {
this.agree()
}
- return
- create(this.formData).then(res => {
- console.log(res.data.mer_intention_id, 'res')
- this.formData.mer_intention_id = res.data.mer_intention_id
- this.formData.status = 0
- if (this.step == 2) {
- getIntention(this.$store.state.app.userInfo.uid).then(res => {
- if (Object.keys(res.data).length == 0) return
- this.formData = res.data
- this.step = this.formData.step
- this.formData.phone = this.$store.state.app.userInfo.account
- })
- }
- this.step++
- }).catch(err => {
- console.log(err, 'err')
- Toast(err)
- })
},
agree() {
this.isshow = false
@@ -600,9 +582,6 @@
console.log(err, 'err')
Toast(err)
})
-
-
-
},
jumpToList() {
uni.navigateTo({
@@ -623,14 +602,8 @@
}
})
uni.stopPullDownRefresh()
- // this.page = 1;
- // this.pageloading = false;
- // this.loadend = false;
- // this.assistList = []
- // this.getAssistProductList();
},
onLoad(option) {
- // console.log(this.$store.state.app)
this.shoplist('mer_services_agree')
this.formData.phone = this.$store.state.app.userInfo.account
merClassifly().then(res => {