add
This commit is contained in:
parent
b5e261a764
commit
e269404174
@ -15,9 +15,9 @@ let openPlantGrass = '-openPlantGrass-'
|
|||||||
|
|
||||||
let httpSix, httpApi, httpTwo;
|
let httpSix, httpApi, httpTwo;
|
||||||
|
|
||||||
// const env = 'dev'; // 开发
|
const env = 'dev'; // 开发
|
||||||
// const env = 'prod'; // 生产
|
// const env = 'prod'; // 生产
|
||||||
const env = 'prew'; // 预上线
|
// const env = 'prew'; // 预上线
|
||||||
|
|
||||||
switch (env) {
|
switch (env) {
|
||||||
case 'prod':
|
case 'prod':
|
||||||
@ -38,8 +38,6 @@ switch (env) {
|
|||||||
httpSix = 'https://ceshi-new-wokr.lihaink.cn'
|
httpSix = 'https://ceshi-new-wokr.lihaink.cn'
|
||||||
// httpTwo = 'http://192.168.1.22:8546'
|
// httpTwo = 'http://192.168.1.22:8546'
|
||||||
httpTwo = 'http://192.168.1.13:8546'
|
httpTwo = 'http://192.168.1.13:8546'
|
||||||
|
|
||||||
|
|
||||||
// httpTwo = 'https://erp.lihaink.cn'
|
// httpTwo = 'https://erp.lihaink.cn'
|
||||||
wsApi = 'wss://crmeb-test.shop.lihaink.cn'
|
wsApi = 'wss://crmeb-test.shop.lihaink.cn'
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@
|
|||||||
<!-- #ifdef APP-PLUS -->
|
<!-- #ifdef APP-PLUS -->
|
||||||
<view @click="getLocation"
|
<view @click="getLocation"
|
||||||
style="width: 100%;padding: 20rpx;border: 1px solid #F3F3F3;;color:#999999;border-radius: 16rpx;">
|
style="width: 100%;padding: 20rpx;border: 1px solid #F3F3F3;;color:#999999;border-radius: 16rpx;">
|
||||||
{{formData.storeAddress||'点击获取当前位置'}}
|
{{formData.mer_address||'点击获取当前位置'}}
|
||||||
</view>
|
</view>
|
||||||
<!-- #endif -->
|
<!-- #endif -->
|
||||||
|
|
||||||
@ -320,11 +320,12 @@
|
|||||||
"merchant_category_name": "",
|
"merchant_category_name": "",
|
||||||
"mer_type_id": 0,
|
"mer_type_id": 0,
|
||||||
"mer_storeType": "",
|
"mer_storeType": "",
|
||||||
province_name: "",
|
city_name: "",
|
||||||
|
area_name: "",
|
||||||
mer_intention_id: "",
|
mer_intention_id: "",
|
||||||
storeAddress: "",
|
mer_address: "",
|
||||||
"images": [],
|
"images": [],
|
||||||
is_merchant_type: 2,
|
is_merchant_type: 1,
|
||||||
jg_register_id: uni.getStorageSync('jg_id') || ''
|
jg_register_id: uni.getStorageSync('jg_id') || ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -355,7 +356,6 @@
|
|||||||
this.showMerchantCategoryPicker = false
|
this.showMerchantCategoryPicker = false
|
||||||
},
|
},
|
||||||
confirmType(e) {
|
confirmType(e) {
|
||||||
console.log(e.value)
|
|
||||||
this.formData.type_id = e.value[0].id
|
this.formData.type_id = e.value[0].id
|
||||||
this.formData.type_name = e.value[0].name
|
this.formData.type_name = e.value[0].name
|
||||||
this.showStoreType = false
|
this.showStoreType = false
|
||||||
@ -396,7 +396,6 @@
|
|||||||
that.formData.company_nickname = res.data.legal_person;
|
that.formData.company_nickname = res.data.legal_person;
|
||||||
that.formData.social_credit_code = res.data.register_number;
|
that.formData.social_credit_code = res.data.register_number;
|
||||||
that.formData.company_name = res.data.name;
|
that.formData.company_name = res.data.name;
|
||||||
console.log(this.formData)
|
|
||||||
} else {
|
} else {
|
||||||
that.$util.Tips({
|
that.$util.Tips({
|
||||||
title: "识别失败!"
|
title: "识别失败!"
|
||||||
@ -420,13 +419,13 @@
|
|||||||
this.formData[key] = res.data[key]
|
this.formData[key] = res.data[key]
|
||||||
}
|
}
|
||||||
this.formData.phone = res.data.service_phone
|
this.formData.phone = res.data.service_phone
|
||||||
console.log(JSON.parse(res.data.data_json))
|
|
||||||
let obj = JSON.parse(res.data.data_json)
|
let obj = JSON.parse(res.data.data_json)
|
||||||
this.formData.images = [obj.images]
|
this.formData.images = [obj.images]
|
||||||
this.formData.company_nickname = obj.company_nickname
|
this.formData.company_nickname = obj.company_nickname
|
||||||
this.formData.company_name = obj.company_name
|
this.formData.company_name = obj.company_name
|
||||||
this.formData.address = obj.company_address
|
this.formData.address = obj.company_address
|
||||||
this.formData.social_credit_code = obj.social_credit_code
|
this.formData.social_credit_code = obj.social_credit_code
|
||||||
|
console.log(res.data)
|
||||||
})
|
})
|
||||||
this.step = 1
|
this.step = 1
|
||||||
|
|
||||||
@ -464,7 +463,9 @@
|
|||||||
success: (res) => {
|
success: (res) => {
|
||||||
this.formData.long = res.longitude
|
this.formData.long = res.longitude
|
||||||
this.formData.lat = res.latitude
|
this.formData.lat = res.latitude
|
||||||
this.formData.storeAddress = res.address.city + res.address.district + res.address
|
this.formData.city_name = res.address.city
|
||||||
|
this.formData.area_name = res.address.district
|
||||||
|
this.formData.mer_address = res.address.city + res.address.district + res.address
|
||||||
.street + res.address.streetNum
|
.street + res.address.streetNum
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
},
|
},
|
||||||
@ -482,10 +483,10 @@
|
|||||||
delete this.formData.data_json
|
delete this.formData.data_json
|
||||||
}
|
}
|
||||||
this.formData.is_merchant_type = 2
|
this.formData.is_merchant_type = 2
|
||||||
console.log(this.formData)
|
|
||||||
applysApi({
|
applysApi({
|
||||||
...this.formData
|
...this.formData
|
||||||
}).then(ress => {
|
}).then(ress => {
|
||||||
|
console.log('ress', ress)
|
||||||
this.getSuccessData()
|
this.getSuccessData()
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user