diff --git a/manifest.json b/manifest.json
index 38062d3..d6e76be 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"name" : "铸源商城",
"appid" : "__UNI__496DF55",
"description" : "",
- "versionName" : "1.0.5",
+ "versionName" : "1.0.6",
"versionCode" : 127,
"transformPx" : false,
/* 5+App特有相关 */
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 6e24984..711b3c5 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -433,14 +433,12 @@
getGoodsDetails(id).then(res => {
let arr = Object.keys(this.shopInfo)
let resData = res.data;
- let {
- shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseServicePhone,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
- } = this.shopInfo;
- console.log('resData: ',resData);
let com=resData.com;
let biz=resData.biz;
- mer_classification=this.array[resData.mer_type_id]['category_name'],
- userPhone=resData.phone,EnterpriseName=resData.mer_name,userName=resData.name,mer_type=resData.merchant_category_id,classification=resData.mer_type_id,EnterpriseType=com.type,EnterpriseServicePhone=com.service,EnterpriseName=com.contact,EnterpriseJoinName=com.mobile,EnterpriseId=com.number,userName=com.initiator,userPhone=com.inti_mobile,userId=com.inti_number,userPhoto=com.init_image,isVeteran=com.is_huimei,isVeteranPhoto=com.image_huimei,isFlagshipStore=com.is_soldier,isFlagshipStorePhoto=com.image_soldier,businessAddress=biz.province+'/'+biz.city,businessAddressDetail=biz.address_true;
+ uni.setStorageSync('updateShopInfo',resData);
+ let {shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseServicePhone,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType} = this.shopInfo;
+
+ mer_classification=this.array[resData.mer_type_id]['category_name'],classification=resData.mer_type_id,mer_storeType=this.storeTypeArr[resData.merchant_category_id]['type_name'],mer_type=resData.merchant_category_id,EnterprisePhone=com.mobile,shopName=resData.mer_name,userPhone=resData.phone,EnterpriseName=com.name,userName=resData.name,mer_type=resData.merchant_category_id,classification=resData.mer_type_id,EnterpriseType=com.type,EnterpriseServicePhone=com.service,EnterpriseName=com.name,EnterpriseJoinName=com.contact,EnterpriseId=com.number,userName=com.initiator,userPhone=com.inti_mobile,userId=com.inti_number,userPhoto=com.init_image,isVeteran=com.is_huimei,isVeteranPhoto=com.image_huimei,isFlagshipStore=com.is_soldier,isFlagshipStorePhoto=com.image_soldier,businessAddress=biz.province+'/'+biz.city,businessAddressDetail=biz.address_true;
this.shopInfo={
shopName,mer_classification,classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseServicePhone,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
}
@@ -497,10 +495,11 @@
merchant_category_id:mer_type,
mer_type_id:classification,
com:{
+ name:EnterpriseName,
type:EnterpriseType,
service:EnterpriseServicePhone,
- contact:EnterpriseName,
- mobile:EnterpriseJoinName,
+ contact:EnterpriseJoinName,
+ mobile:EnterprisePhone,
number:EnterpriseId,
initiator:userName,
inti_mobile:userPhone,
@@ -518,6 +517,8 @@
}
}
uni.setStorageSync('shopInfo', date2)
+
+
this.validate = true;
}
},
@@ -562,10 +563,16 @@
this.validateBtn();
},
nextStep() {
-
- uni.navigateTo({
- url: '/pages/store/settled/step2'
- })
+ if(this.mer_i_id){
+ uni.navigateTo({
+ url: '/pages/store/settled/step2?mer_i_id='+this.mer_i_id
+ })
+ }else{
+ uni.navigateTo({
+ url: '/pages/store/settled/step2'
+ })
+ }
+
},
viteran(e) {
// console.log('e: ',e);
diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue
index 1642b5a..e57049c 100644
--- a/pages/store/settled/step2.vue
+++ b/pages/store/settled/step2.vue
@@ -224,6 +224,7 @@
successful: false,
isType: false,
showProtocol: false,
+ mer_i_id:'',
};
},
onLoad(options) {
@@ -232,14 +233,22 @@
} else {
toLogin()
}
- },
- onShow() {},
- computed: {
- ...mapGetters(['isLogin','viewColor']),
- addressText(){
- return this.shopInfo.registerAddress.map(v=>v.name).join('/');
+ if (options.mer_i_id) {
+ this.mer_i_id = options.mer_i_id
+ uni.showLoading({
+ title: '获取数据中',
+ });
+ this.$nextTick(function() {
+ this.getGoodsDetails()
+ })
}
},
+ onShow() {
+
+ },
+ computed: {
+ ...mapGetters(['isLogin','viewColor'])
+ },
watch:{
deep:true,
'shopInfo.idCardPhoto':{
@@ -258,6 +267,15 @@
}
},
methods: {
+ getGoodsDetails(){
+ let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
+ let data2=uni.getStorageSync('updateShopInfo');
+ let idcard=data2.idcard;
+ let biz=data2.biz;
+ idCardPhoto=[idcard.image1,idcard.image2],idCardName=idcard.name,idCardNumber=idcard.number,idCardStartTime=idcard.start,idCardEndTime=idcard.end,businessLicense=biz.image,countId=biz.number,countStartTime=biz.start,countEndTime=biz.end,registerAddressDetail=biz.address,businessScope=biz.businessScope
+ this.shopInfo={idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail};
+ uni.hideLoading()
+ },
verifyIDcard(index){
let img={image:this.shopInfo.idCardPhoto[index],type:index+2};
queryIdCard(img).then((res)=>{
@@ -313,7 +331,6 @@
},
validateBtn(){
let data2=uni.getStorageSync('shopInfo');
- console.log('data2: ',data2);
let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
if(idCardPhoto&&idCardName&&idCardNumber&&idCardStartTime&&idCardEndTime&&businessLicense&&countId&&countStartTime&&countEndTime&&businessScope&®isterAddressDetail){
let idcard={
@@ -330,9 +347,9 @@
biz.start=countStartTime;
biz.end=countEndTime;
biz.address=registerAddressDetail;
+ biz.businessScope=businessScope;
data2.idcard=idcard;
uni.setStorageSync('shopInfo',data2);
- console.log('data2: ',data2);
this.validate=true;
}
},
@@ -349,9 +366,16 @@
this.validateBtn();
},
nextStep(){
- uni.navigateTo({
- url:'/pages/store/settled/step3'
- })
+ if(this.mer_i_id){
+ uni.navigateTo({
+ url:'/pages/store/settled/step3?mer_i_id='+this.mer_i_id
+ })
+ }else{
+ uni.navigateTo({
+ url:'/pages/store/settled/step3'
+ })
+ }
+
},
/**
* 上传文件
diff --git a/pages/store/settled/step3.vue b/pages/store/settled/step3.vue
index 6055963..ef6e99f 100644
--- a/pages/store/settled/step3.vue
+++ b/pages/store/settled/step3.vue
@@ -132,15 +132,26 @@
+
+
+
+ 恭喜,您的资料提交成功!
+ 预计15个工作日内审核完毕,平台客服会及时与您联系!
+
+ 返回首页
+
+
+