From 558e4844c6003e361bb8190818d17bc6835f1a62 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 22 Dec 2023 18:34:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/store.js | 9 ++++
config/app.js | 6 ++-
pages/gather/gather.vue | 2 +-
pages/store/settled/index.vue | 77 +++++++++++++++++++++++++++--------
store/modules/app.js | 14 ++++++-
5 files changed, 87 insertions(+), 21 deletions(-)
diff --git a/api/store.js b/api/store.js
index ed9b774..e5ff95e 100644
--- a/api/store.js
+++ b/api/store.js
@@ -582,4 +582,13 @@ export function agreeiness(data) {
return request.get(`business/agree`, data, {
noAuth: true
});
+}
+
+/*
+ 上传图片识别文字
+*/
+export function merchantLicenseIdentify(data) {
+ return request.post(`merchant_license_identify`, data, {
+ noAuth: true
+ });
}
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index 65fbab4..cdcc9f8 100644
--- a/config/app.js
+++ b/config/app.js
@@ -11,8 +11,8 @@ let httpApiFive
let wsApi
// 在打包之前请检查当前环境是否正确
-// const env = 'dev'; // 开发
-const env = 'prod'; // 生产
+const env = 'dev'; // 开发
+// const env = 'prod'; // 生产
// const env = 'prew'; // 预上线
switch (env) {
@@ -39,6 +39,8 @@ switch (env) {
wsApi = 'wss://crmeb-test.shop.lihaink.cn'
}
+// httpApi=''
+
// 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
// wsApi = 'ws://192.168.1.17:8324'
let wsApi_one = 'wss://ceshi-zhibo.lihaink.cn/chat_room'
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index de57192..bb596a3 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -238,7 +238,7 @@
icon: '/static/applet/icons.png',
data: {
id: "__UNI__D087881",
- url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/793a5202312201452086405.wgt",
+ url: "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c5a3b202312221802534062.wgt",
},
type: 4
}
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 9bfcd5b..c0066d9 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -115,6 +115,33 @@
+
+
+
+
+ 邀请码(选填)
+
+
+
+
+
+
+
+ 请上传营业执照
+ (图片格式支持JPG、PNG、JPEG)
+
+
+
+
+
+
+ 上传图片
+
+
+
+
@@ -128,19 +155,6 @@
-
-
-
-
- 邀请码(选填)
-
-
-
-
-
-
@@ -296,7 +310,8 @@
getGoodsDetails,
updateGoodsRecord,
getStoreTypeApi,
- agreeiness
+ agreeiness,
+ merchantLicenseIdentify
} from '@/api/store.js';
import {
getCaptcha,
@@ -358,6 +373,7 @@
address: '',
invitation_code: '',
},
+ business_license: '',//营业执照
validate: false,
successful: false,
keyCode: "",
@@ -592,7 +608,9 @@
this.village_id = resData.village_id
})
- this.pics = resData.images
+ this.business_license = resData.images[0];
+ resData.images.shift();
+ this.pics = resData.images;
this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
if(resData.mer_type_id!=12){
@@ -768,6 +786,30 @@
that.$set(that, 'pics', that.pics);
});
},
+ /**
+ * 上传图片识别文字
+ *
+ */
+ uploadpicText: function() {
+ let that = this;
+ that.$util.uploadImageOne('upload/image', function(res) {
+ that.business_license = res.data.path;
+ uni.showLoading({
+ title: '识别中'
+ })
+ merchantLicenseIdentify({
+ image: res.data.path
+ }).then(res=>{
+ that.merchantData.address = res.data.address;
+ that.merchantData.user_name = res.data.legal_person;
+ that.merchantData.social_credit_code = res.data.register_number;
+ // that.$set('merchantData', that.merchantData);
+ uni.hideLoading();
+ }).catch(()=>{
+ uni.hideLoading();
+ })
+ });
+ },
/**
* 删除图片
*
@@ -881,7 +923,7 @@
street_id: this.street_id,
village_id: this.village_id,
is_nmsc: this.isnum,
- images: that.pics
+ images: [this.business_license, ...that.pics]
}
that.validate = false;
if (that.mer_i_id) {
@@ -1109,6 +1151,7 @@
background-color: var(--view-theme) !important;
color: #fff !important;
}
+
.conten-top {
width: 100%;
@@ -1150,7 +1193,7 @@
.merchantsSettled {
background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
- height: 2300rpx;
+ min-height: 2600rpx;
position: relative;
}
diff --git a/store/modules/app.js b/store/modules/app.js
index d9f87f2..675dae7 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -119,6 +119,13 @@ const actions = {
await uni.$u.sleep(500)
}
const wgt_v = uni.getStorageSync('wgt_version') || '1.0.0';
+ // Appversion({
+ // version: '1.6.4',
+ // type: 1,
+ // phone_brand: 'xiaomi'
+ // }).then((res)=>{
+ // console.log(res);
+ // })
// #ifdef APP-PLUS
let os = uni.getSystemInfoSync();
let apptype;
@@ -127,12 +134,17 @@ const actions = {
} else {
apptype = 1
}
+ console.log({
+ version: os.appWgtVersion,
+ type: apptype,
+ phone_brand:os.brand
+ });
Appversion({
version: os.appWgtVersion,
type: apptype,
phone_brand:os.brand
-
}).then((res) => {
+ console.log(res);
if(data) uni.hideLoading()
if (Object.keys(res.data.appInfo).length > 0) {
// if(res.data.appInfo.version) uni.showLoading({