|
|
@@ -142,7 +142,7 @@
|
|
|
<image
|
|
|
style="width:90rpx;height:90rpx;border-radius:42rpx;"
|
|
|
mode="scaleToFill"
|
|
|
- :src="merchantData.smallLogoUrl"
|
|
|
+ :src="merchantData.logoUrl"
|
|
|
@error="imageError"
|
|
|
/>
|
|
|
<div class="recommend-info">
|
|
|
@@ -183,14 +183,10 @@ import AppAvatarModule from "@/components/module/app-avatar";
|
|
|
import AppUploader from "@/components/app-uploader";
|
|
|
import AppBindInfo from "@/components/app-bind-info";
|
|
|
const form = require("@/utils/formValidation.js");
|
|
|
-// api
|
|
|
import {
|
|
|
getIntroduce,
|
|
|
- applyRegister,
|
|
|
- // sendSmsW,
|
|
|
- // regionTree
|
|
|
+ applyRegister
|
|
|
} from "@/api/official";
|
|
|
-// import { getShopUser } from '@/utils/auth'
|
|
|
export default {
|
|
|
name: "apply-data",
|
|
|
components: {
|
|
|
@@ -250,23 +246,18 @@ export default {
|
|
|
this.form.mobile = val.mobile
|
|
|
},
|
|
|
init () {
|
|
|
- this.$util.getCheckLogin().then(res => {
|
|
|
- if (res) {
|
|
|
- if (this.option.introMerchantId) {
|
|
|
- this._getMerchantDet();
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+ this._getMerchantDet()
|
|
|
+
|
|
|
},
|
|
|
_getMerchantDet () {
|
|
|
- getIntroduce({ id: this.option.introMerchantId || 0 }).then(res => {
|
|
|
- this.merchantData = res.data;
|
|
|
+ getIntroduce(this.option).then(res => {
|
|
|
+ this.merchantData = res.data.introduce
|
|
|
});
|
|
|
},
|
|
|
- // ==============
|
|
|
confirmFn () {
|
|
|
applyRegister({
|
|
|
- shopAdminId: this.option.shopAdminId,
|
|
|
+ hdShopAdminId: this.option.hdShopAdminId,
|
|
|
+ ghsShopAdminId: this.option.ghsShopAdminId,
|
|
|
...this.form,
|
|
|
style: this.option.style || 0,
|
|
|
from: this.option.from || 0
|
|
|
@@ -287,18 +278,6 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
this.showRegion = true;
|
|
|
- // let that = this
|
|
|
- // uni.chooseLocation({
|
|
|
- // success: (res) => {
|
|
|
- // this.form.address = res.address
|
|
|
- // this.form.latitude = res.latitude
|
|
|
- // this.form.longitude = res.longitude
|
|
|
- // console.log('位置名称：' + res.name)
|
|
|
- // console.log('详细地址：' + res.address)
|
|
|
- // console.log('纬度：' + res.latitude)
|
|
|
- // console.log('经度：' + res.longitude)
|
|
|
- // }
|
|
|
- // })
|
|
|
},
|
|
|
changeAreaFn (e) {
|
|
|
console.log("changeAreaFn", e);
|
|
|
@@ -307,16 +286,13 @@ export default {
|
|
|
this.form.longitude = e.location.lng;
|
|
|
this.form.dist = e.district
|
|
|
},
|
|
|
- // -----
|
|
|
// 省市联动
|
|
|
openAddres () {
|
|
|
this.$refs.simpleAddress.open();
|
|
|
},
|
|
|
onCityConfirm (e) {
|
|
|
- // this.form.receiveAddress = e.label
|
|
|
this.form.province = e.provinceName;
|
|
|
this.form.city = e.cityName;
|
|
|
- // this.pickerText = JSON.stringify(e)
|
|
|
},
|
|
|
// 表单验证
|
|
|
formSubmit (e) {
|
|
|
@@ -336,13 +312,6 @@ export default {
|
|
|
// 进行表单检查
|
|
|
let formData = this.form;
|
|
|
let checkRes = form.validation(formData, rules);
|
|
|
- // this.$util.pageTo({
|
|
|
- // url: "/pagesClient/official/callback",
|
|
|
- // type: 2,
|
|
|
- // query: {
|
|
|
- // pagestatus: 1
|
|
|
- // }
|
|
|
- // });
|
|
|
// 验证通过!
|
|
|
if (!checkRes) {
|
|
|
setTimeout(() => {
|
|
|
@@ -354,10 +323,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
- // imageList(val){
|
|
|
- // this.form.
|
|
|
- // console.log(val)
|
|
|
- // }
|
|
|
}
|
|
|
};
|
|
|
</script>
|
shish