faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
yangtao 2024-04-01 19:41:30 +08:00
parent 9812f6e52f
commit 31ff194388
5 changed files with 102 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

@ -2,7 +2,7 @@
"name" : "铸源商城",
"appid" : "__UNI__496DF55",
"description" : "",
"versionName" : "1.0.5",
"versionName" : "1.0.6",
"versionCode" : 127,
"transformPx" : false,
/* 5+App特有相关 */

29
pages/store/settled/index.vue
View File

@ -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() {
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'
})
}
uni.navigateTo({
url: '/pages/store/settled/step2'
})
},
viteran(e) {
// console.log('e: ',e);

46
pages/store/settled/step2.vue
View File

@ -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&&registerAddressDetail){
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'
})
}
},
/**
* 上传文件

36
pages/store/settled/step3.vue
View File

@ -132,15 +132,26 @@
<areaWindow ref="areaWindow2" :display="display2" :address="[]"
@submit="OnChangeAddress2" @changeClose="changeClose2" :cityShow="1"></areaWindow>
</view>
<view class="settledSuccessMain" v-else :style="viewColor">
<view class="settledSuccessful">
<image class="image" src="../static/images/settledSuccessful.svg" alt="">
<view class="title">恭喜，您的资料提交成功！</view>
<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
<view class="goHome" hover-class="none" @click="goHome">
返回首页
</view>
</view>
</view>
</template>
<script>
import areaWindow from '@/components/areaWindow';
import { mapGetters } from "vuex";
import parser from "@/components/jyf-parser/jyf-parser";
import { toLogin } from '@/libs/login.js';
import {queryBankCard,queryCNAPS} from '@/api/user.js';
import {queryBankCard,queryCNAPS,getAgreementApi} from '@/api/user.js';
import { configMap,throttle } from "@/utils";
import {updateGoodsRecord,create,getGoodsDetails} from '@/api/store.js';
const app = getApp();
export default {
components: {
@ -174,6 +185,9 @@
},
dataInfo:{},
mer_i_id:'',
loading:false,
successful:false,
validate:false,
};
},
onLoad(options) {
@ -184,7 +198,12 @@
}
if (options.mer_i_id) {
this.mer_i_id = options.mer_i_id
uni.showLoading({
title: '获取数据中',
});
this.$nextTick(function() {
this.getGoodsDetails()
})
}
},
onShow() {},
@ -203,6 +222,17 @@
},
},
methods: {
goHome(){
uni.navigateTo({
url:'/pages/store/settled/index'
})
},
getGoodsDetails(){
let {bankCardImg,bankCardUserName,bankCard,bankName,bankBranchName,CNAPS}=this.shopInfo;
let data2=uni.getStorageSync('updateShopInfo');
this.shopInfo=data2.bank;
uni.hideLoading()
},
searchBranch(){
let val=this.shopInfo;
@ -243,7 +273,7 @@
let that = this
that.showProtocol = true;
that.isType = true
getAgreementApi('sys_merchant_type').then(res => {
getAgreementApi('sys_intention_agree').then(res => {
that.protocol = res.data.sys_merchant_type
})
},

27
pages/user/index.vue
View File

@ -119,19 +119,7 @@
</block>
</view>
</view>
<!-- 轮播 -->
<!-- <view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
<block v-for="(item,index) in imgUrls" :key="index">
<swiper-item>
<view @click="goUrl(item.url)" class='slide-navigator acea-row row-between-wrapper'>
<image :src="item.pic" class="slide-image"></image>
</view>
</swiper-item>
</block>
</swiper>
</view> -->
<view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
<view class="item-text">
<view class="title">
@ -185,6 +173,19 @@
</block>
</view>
</view>
<!-- 轮播 -->
<view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
<block v-for="(item,index) in imgUrls" :key="index">
<swiper-item>
<view @click="goUrl(item.url)" class='slide-navigator acea-row row-between-wrapper'>
<image :src="item.pic" class="slide-image"></image>
</view>
</swiper-item>
</block>
</swiper>
</view>
</view>
<view v-if="copyright.status !== -1" class="copy-right">
<image class="img-copyright" :src="copyright.image" mode="widthFix"></image>