From cfe2752f7ce2a66dd83ba4b5b4cfb91429622780 Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Tue, 8 Apr 2025 14:17:27 +0800 Subject: [PATCH] 最新 --- admin-web-master/src/api/newly.js | 8 ++++++++ admin-web-master/src/components/add/addss.vue | 49 ++++++++++++++++++++++++++++++------------------- admin-web-master/src/components/add/addyixiang.vue | 39 +++++++++++++++++++++++++++++++++++---- admin-web-master/src/components/chakan/cd.vue | 5 +++-- admin-web-master/src/utils/request.js | 4 ++-- admin-web-master/src/views/business/businessList/index.vue | 4 ++-- admin-web-master/src/views/customer/icReview/index.vue | 4 ++-- admin-web-master/src/views/customer/rUser/index.vue | 14 +++++++++++--- admin-web-master/src/views/customer/rsaManagement/index.vue | 29 ++++++++++++++++------------- admin-web-master/src/views/customer/rsaReview/index.vue | 18 +++++++++--------- admin-web-master/src/views/shopbus/settlement/addSettlement.vue | 4 ++-- ceres-uniapp-master/config/api.js | 4 ++-- lvdao-miniapp/pages.json | 15 +++++++++++++++ lvdao-miniapp/pages/home/home.vue | 12 +++++++++--- lvdao-miniapp/pages/mycreated/actList.vue | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lvdao-miniapp/pages/mycreated/mycreated.vue | 6 ++++++ lvdao-miniapp/pages/workbench/workbench.vue | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ lvdao-miniapp/pagesA/gongao/gongaoList.vue | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue | 25 ++++++++++++++++++++++--- lvdao-miniapp/utils/request.js | 12 ++++++------ settled-merchant-master/src/views/SettleIn/enterprisesApply.vue | 3 ++- settled-merchant-master/src/views/SettleIn/individualBusiness.vue | 3 ++- settled-merchant-master/src/views/SettleIn/organization.vue | 3 ++- settled-merchant-master/src/views/SettleIn/personal.vue | 3 ++- settled-merchant-master/src/views/moblie/mEnterprise.vue | 3 ++- settled-merchant-master/src/views/moblie/mOtherOrg.vue | 3 ++- settled-merchant-master/src/views/moblie/mPersonal.vue | 3 ++- settled-merchant-master/src/views/moblie/mUinitBusiness.vue | 3 ++- 28 files changed, 606 insertions(+), 86 deletions(-) create mode 100644 lvdao-miniapp/pages/mycreated/actList.vue create mode 100644 lvdao-miniapp/pagesA/gongao/gongaoList.vue diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index 88e4c92..034e04b 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -405,6 +405,14 @@ export function cerePlatformMerchantadd(data) { data }) } +// 绑定添加 +export function bamngdingAdd(data) { + return request({ + url: '/cerePlatformMerchant/addAgain', + method: 'post', + data + }) +} // 详情 export function cerePlatformMerchantinfo(data) { return request({ diff --git a/admin-web-master/src/components/add/addss.vue b/admin-web-master/src/components/add/addss.vue index bacec89..0004b6c 100644 --- a/admin-web-master/src/components/add/addss.vue +++ b/admin-web-master/src/components/add/addss.vue @@ -3,7 +3,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -94,7 +94,7 @@ import { cerePlatformMerchantadd, cerePlatformMerchantedit, - + bamngdingAdd } from '@/api/newly.js' export default { @@ -198,6 +198,7 @@ info: { immediate: true, handler(newVal) { + console.log(newVal,'newVal') if (Object.keys(newVal).length > 0) { this.formInline = newVal this.moren = 1 @@ -240,7 +241,6 @@ ...this.formInline, checkState: '2', state:'1', - flag:false, applyTime: this.updateCurrentTime() }).then(res => { if (res.code == 200 && res.message !='手机号已被注册') { @@ -250,21 +250,32 @@ }) this.$emit('removeonaction', '1') } else if(res.code == 200 && res.message =='手机号已被注册'){ - cerePlatformMerchantadd({ - ...this.formInline, - checkState: '2', - state:'1', - flag:false, - applyTime: this.updateCurrentTime() - }).then(res => { - if (res.code == 200) { - this.$message({ - message: '添加成功', - type: 'success' - }) - this.$emit('removeonaction', '1') - } - }) + this.$confirm('是否绑定线上商家？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + bamngdingAdd({ + ...this.formInline, + checkState: '2', + state: '1', + applyTime: this.updateCurrentTime() + }).then(response => { + if (response.code == '200') { + this.$message({ + message: '绑定成功', + type: 'success' + }); + this.$emit('removeonaction', '1'); + } + }) + }).catch(() => { + // 用户点击取消，不做任何操作 + this.$message({ + message: '已取消绑定', + type: 'info' + }); + }); }else { this.$message({ message: res.msg, diff --git a/admin-web-master/src/components/add/addyixiang.vue b/admin-web-master/src/components/add/addyixiang.vue index 198cc29..f67479c 100644 --- a/admin-web-master/src/components/add/addyixiang.vue +++ b/admin-web-master/src/components/add/addyixiang.vue @@ -218,7 +218,7 @@ -
{{info.cereBasicInformationShop.belongingGreenwaySection || '无'}}
+
{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection)|| '无'}}
 @@ -282,7 +282,7 @@ -
{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}
+
{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}
 @@ -369,7 +369,7 @@ -
{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}
+
{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}
 @@ -438,6 +438,11 @@ import newmap from "@/components/newmap/index"; import indexall from "@/components/newmap/indexall"; import { icManAdd} from '@/api/icManagement'; + import { + gongyuan, + parkTrails, + lvdaoduan, + } from '@/api/information.js'; export default { components: { TitleWithCircle, @@ -482,7 +487,8 @@ checkState:'2', phone: '', }, - shopMsg:{} + shopMsg:{}, + lvdaoList:[] } }, created() { @@ -494,6 +500,7 @@ if (this.info.cereAdvertisingInformation) { this.ontype = this.info.cereAdvertisingInformation.advertisingType } + this.getAll() }, computed: { @@ -594,6 +601,30 @@ closeFn() { this.$emit('change', false); }, + async getAll(){ + const lvdao = await lvdaoduan() + const gongyua = await parkTrails() + const budao = await gongyuan() + const lvList = lvdao.data.concat(gongyua.data) + + this.lvdaoList = lvList.concat(budao.data) + }, + getLvdaoNameByCode(code) { + // 若传入的 code 为空，直接返回空字符串 + if (!code) { + return ''; + } + // 遍历 this.lvdaoList 数组 + for (let i = 0; i < this.lvdaoList.length; i++) { + const item = this.lvdaoList[i]; + // 当传入的 code 等于 item 的 code 时，返回 item 的 name + if (item.code === code) { + return item.name; + } + } + // 若遍历完数组都没找到匹配的 code，返回空字符串 + return '无'; + }, } } diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue index 0fb53c2..9e0ed1a 100644 --- a/admin-web-master/src/components/chakan/cd.vue +++ b/admin-web-master/src/components/chakan/cd.vue @@ -95,8 +95,9 @@ - -
{{editbgid.otherImageVideos?'查看详情':'无'}}
+ + +
{{editbgid.otherMedia?'查看详情':'无'}}
 diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 45fa0ae..1cbf82e 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,12 +17,12 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - // baseURL = 'http://192.168.2.227:9003'; + baseURL = 'http://128.10.249.25:9003'; } else { diff --git a/admin-web-master/src/views/business/businessList/index.vue b/admin-web-master/src/views/business/businessList/index.vue index ac9e969..3b0ef9f 100644 --- a/admin-web-master/src/views/business/businessList/index.vue +++ b/admin-web-master/src/views/business/businessList/index.vue @@ -128,7 +128,7 @@
-
合同管理 > 商家信息管理 > 新增
@@ -152,7 +152,7 @@
-
合同管理 > 商家信息管理 > 编辑
diff --git a/admin-web-master/src/views/customer/icReview/index.vue b/admin-web-master/src/views/customer/icReview/index.vue index 3517330..332ba38 100644 --- a/admin-web-master/src/views/customer/icReview/index.vue +++ b/admin-web-master/src/views/customer/icReview/index.vue @@ -108,7 +108,7 @@
-
招商租赁审核 > 商户意向管理 > 新增
@@ -118,7 +118,7 @@
-
招商租赁审核 > 商户意向管理 > {{onindex=='1'?'查看':'审核'}}
diff --git a/admin-web-master/src/views/customer/rUser/index.vue b/admin-web-master/src/views/customer/rUser/index.vue index 46ea0e5..4eb58e4 100644 --- a/admin-web-master/src/views/customer/rUser/index.vue +++ b/admin-web-master/src/views/customer/rUser/index.vue @@ -294,8 +294,10 @@ import merchantInformation from '../../../components/merchantInformation/index.v if (valid) { this.ruleForm.id = this.secondData.id cerePlatformMerchantedit(this.ruleForm) - this.ggXin = false - this.getAll() + this.$message({ + message: '修改成功', + type: 'success' + }) }else{ this.$message({ message: '请填写完整信息', @@ -303,7 +305,9 @@ import merchantInformation from '../../../components/merchantInformation/index.v }) } - }) + }) + this.getAll() + this.ggXin = false }, handleCurrentChange(val) { this.pageindex.pageNumber = val - 1 @@ -341,6 +345,10 @@ import merchantInformation from '../../../components/merchantInformation/index.v beforeClose: (action, instance, done) => { if (action === 'confirm') { cerePlatformMerchantedit({id:ids,isBlackList:num}).then(res=>{ + this.$message({ + message: '修改成功', + type: 'success' + }) this.getAll() done(); }) diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue index 1ccc564..52d65e7 100644 --- a/admin-web-master/src/views/customer/rsaManagement/index.vue +++ b/admin-web-master/src/views/customer/rsaManagement/index.vue @@ -257,11 +257,11 @@
{{secondData.idCardNumber}}
- + @@ -355,7 +355,7 @@ - + @@ -366,13 +366,13 @@ - + @@ -561,11 +561,11 @@ message: '手机号只能包含数字', trigger: 'blur', }], - idCardValidStart: [{ - required: true, - message: '请选择身份证有效时间', - trigger: 'change' - }, ], + // idCardValidStart: [{ + // required: true, + // message: '请选择身份证有效时间', + // trigger: 'change' + // }, ], idCardPhotoFront: [{ required: true, message: '请输入身份证照片(正面)', @@ -703,11 +703,14 @@ this.getAll(); }, idCardchange(e) { - + console.log(e,'eee') this.ruleForm.idCardValidStart = e[0] this.ruleForm.idCardValidEnd = e[1] - + }, + blur(){ + this.$forceUpdate() + }, // 新增确定 addCheck() { diff --git a/admin-web-master/src/views/customer/rsaReview/index.vue b/admin-web-master/src/views/customer/rsaReview/index.vue index 0d3209d..a635ffe 100644 --- a/admin-web-master/src/views/customer/rsaReview/index.vue +++ b/admin-web-master/src/views/customer/rsaReview/index.vue @@ -226,11 +226,11 @@
{{secondData.idCardNumber}}
 - + @@ -333,11 +333,11 @@
{{ruleForm.idCardNumber}}
 - + @@ -534,11 +534,11 @@ message: '手机号只能包含数字', trigger: 'blur', }], - idCardValidStart: [{ - required: true, - message: '请选择身份证有效时间', - trigger: 'change' - }, ], + // idCardValidStart: [{ + // required: true, + // message: '请选择身份证有效时间', + // trigger: 'change' + // }, ], idCardPhotoFront: [{ required: true, message: '请输入身份证照片(正面)', diff --git a/admin-web-master/src/views/shopbus/settlement/addSettlement.vue b/admin-web-master/src/views/shopbus/settlement/addSettlement.vue index 2efcb5d..3a5af8b 100644 --- a/admin-web-master/src/views/shopbus/settlement/addSettlement.vue +++ b/admin-web-master/src/views/shopbus/settlement/addSettlement.vue @@ -29,9 +29,9 @@ -
{{shopDetails.AuthenType==2?'个体工商户':'企业'}}
+
{{shopDetails.authenType==2?'个体工商户':'企业'}}
 diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index 23b6138..8fe8762 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -45,9 +45,9 @@ const TERMINAL = 1 module.exports = { terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑 - // SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' , + SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' , // 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接 - SettledMerchantPrefix:'http://localhost:8082', + // SettledMerchantPrefix:'http://localhost:8082', shareLink: TIAOZHUAN + 'meh5', // 分享地址 // shareLink: 'http://172.16.61.123:9007/h5', // 分享地址 diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json index 8426b49..4ee304a 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -169,6 +169,14 @@ } }, { + "path": "pages/mycreated/actList", + "style": { + "navigationBarTitleText": "报名名单", + "navigationBarBackgroundColor": "#FFFFFF", + "enablePullDownRefresh": true + } + }, + { "path": "pages/record/record", "style": { "navigationBarTitleText": "申请记录", @@ -443,6 +451,13 @@ } }, { + "path": "gongao/gongaoList", + "style": { + "navigationBarTitleText": "公告列表", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { "path": "myZiyuan/myZiDetailsnew", "style": { "navigationBarBackgroundColor": "#FFFFFF", diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 030644c..0ecb80b 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -22,9 +22,9 @@ - + - + @@ -33,8 +33,9 @@ 暂无公告 + - + 公告 {{item.announcementTitle}} @@ -645,6 +646,11 @@ }) }, + gongList(){ + uni.navigateTo({ + url: `/pagesA/gongao/gongaoList` + }) + }, details(item) { let items = JSON.stringify(item) if (this.current == 0 || this.current == 1) { diff --git a/lvdao-miniapp/pages/mycreated/actList.vue b/lvdao-miniapp/pages/mycreated/actList.vue new file mode 100644 index 0000000..e02b466 --- /dev/null +++ b/lvdao-miniapp/pages/mycreated/actList.vue @@ -0,0 +1,134 @@ + + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pages/mycreated/mycreated.vue b/lvdao-miniapp/pages/mycreated/mycreated.vue index fdacf48..8579692 100644 --- a/lvdao-miniapp/pages/mycreated/mycreated.vue +++ b/lvdao-miniapp/pages/mycreated/mycreated.vue @@ -55,6 +55,7 @@ 撤回 编辑 显示二维码 + 报名名单 删除 @@ -224,6 +225,11 @@ //请求失败 }) }, + getList(ids){ + uni.navigateTo({ + url: `/pages/mycreated/actList?ids=${ids}` + }) + }, } } diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index 997d49e..c226b47 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -310,10 +310,10 @@ }, methods: { async toPath1(path) { - let c1 = uni.getStorageSync('user').phone + let h1 = uni.getStorageSync('user').phone // let c1 = '18188305496' await this.$http.sendRequest('/check/getAll', 'POST', { - "shopPhone": c1, + "shopPhone": h1, "checkState": "1", "page": 1, "pageSize": 1 @@ -325,14 +325,108 @@ uni.setStorageSync('shopId', ''); } }) - uni.navigateTo({ - url: path, + await this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', { + "pageSize": 10, + pageNumber: 0, + phone: uni.getStorageSync('user').phone + }).then(res => { + if (res.data.code == '20004' || res.data.code == '20003') { + uni.navigateTo({ + url: '/pages/login/login' + }) + } + if (res.data.data.content.length > 0) { + let c1 = res.data.data.content[0] + console.log(c1.checkState,'checkState') + if (c1.checkState == '1') { + uni.showToast({ + icon: 'none', + title: '商家申请正在审核中', + duration: 3000 + }); + } else if (c1.checkState == '3') { + uni.showToast({ + icon: 'none', + title: '商家申请审核已被拒绝 请重新提交', + duration: 3000 + }); + setTimeout(() => { + uni.navigateTo({ + url: '/pagesA/leaseAdd/leaseAdd' + }) + }, 3000) + } else if (c1.checkState == '2') { + uni.navigateTo({ + url: path, + }) + } + } else { + uni.showToast({ + icon: 'none', + title: '请先申请成为商家', + duration: 3000 + }); + setTimeout(() => { + uni.navigateTo({ + url: '/pagesA/leaseAdd/leaseAdd' + }) + }, 3000) + } }) + + + }, toPath(path) { - uni.navigateTo({ - url: path, + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', { + "pageSize": 10, + pageNumber: 0, + phone: uni.getStorageSync('user').phone + }).then(res => { + if (res.data.code == '20004' || res.data.code == '20003') { + uni.navigateTo({ + url: '/pages/login/login' + }) + } + if (res.data.data.content.length > 0) { + let c1 = res.data.data.content[0] + console.log(c1.checkState,'checkState') + if (c1.checkState == '1') { + uni.showToast({ + icon: 'none', + title: '商家申请正在审核中', + duration: 3000 + }); + } else if (c1.checkState == '3') { + uni.showToast({ + icon: 'none', + title: '商家申请审核已被拒绝 请重新提交', + duration: 3000 + }); + setTimeout(() => { + uni.navigateTo({ + url: '/pagesA/leaseAdd/leaseAdd' + }) + }, 3000) + } else if (c1.checkState == '2') { + uni.navigateTo({ + url: path, + }) + } + } else { + uni.showToast({ + icon: 'none', + title: '请先申请成为商家', + duration: 3000 + }); + setTimeout(() => { + uni.navigateTo({ + url: '/pagesA/leaseAdd/leaseAdd' + }) + }, 3000) + } }) + }, } } diff --git a/lvdao-miniapp/pagesA/gongao/gongaoList.vue b/lvdao-miniapp/pagesA/gongao/gongaoList.vue new file mode 100644 index 0000000..77cd1bd --- /dev/null +++ b/lvdao-miniapp/pagesA/gongao/gongaoList.vue @@ -0,0 +1,176 @@ + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue b/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue index ad939d5..1e88c5f 100644 --- a/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue +++ b/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue @@ -110,12 +110,31 @@ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; }, go() { - console.error(this.fileList1) - console.error(this.fileList2) - + if (!this.model1.idCardNumber) { + uni.showToast({ + icon: 'none', + title: '请输入身份证号码' + }); + return false; + } + this.model1.applyTime = this.getCurrentTime() this.model1.idCardFrontImage = this.fileList1.join(',') this.model1.idCardBackImage = this.fileList2.join(',') + if (!this.model1.idCardFrontImage) { + uni.showToast({ + icon: 'none', + title: '请上传身份证照片' + }); + return false; + } + if (!this.model1.idCardBackImage) { + uni.showToast({ + icon: 'none', + title: '请上传身份证照片' + }); + return false; + } this.model1.username = this.model1.name this.model1.phone = uni.getStorageSync('user').phone console.error({ diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 0d2a740..44b321f 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -21,17 +21,17 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; - // bases = 'http://128.10.249.31:9003'+ url; + bases = 'http://128.10.249.25:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - bases = c1 + 'cdwlMall/meserver/admin-server' + url; + // bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; // bases = 'http://128.10.249.22:9003:9007' + url; - // bases = 'http://128.10.249.23:9007' + url; - bases = c1 + 'cdwlMall/meserver/api' + url; + bases = 'http://128.10.249.25:9007' + url; + // bases = c1 + 'cdwlMall/meserver/api' + url; }else{ // bases = 'http://128.10.249.22:9004' + url; @@ -39,9 +39,9 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; - // bases = 'http://128.10.249.31:9004' + url; + bases = 'http://128.10.249.25:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; - bases = c1 + 'cdwlMall/business-server' + url; + // bases = c1 + 'cdwlMall/business-server' + url; } var token = uni.getStorageSync('token') || ''; diff --git a/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue b/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue index 1fb2637..c3be8f8 100644 --- a/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue +++ b/settled-merchant-master/src/views/SettleIn/enterprisesApply.vue @@ -232,7 +232,8 @@ export default { enterpriseCardStartTime: '', // 证件有效开始时间 enterpriseCardEndTime: '', // 证件有效结束时间 enterpriseCardPositive: '', // 身份证正面照 - enterpriseCardSide: '' // 身份证反面照 + enterpriseCardSide: '' ,// 身份证反面照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', diff --git a/settled-merchant-master/src/views/SettleIn/individualBusiness.vue b/settled-merchant-master/src/views/SettleIn/individualBusiness.vue index 521e08f..a5fe56a 100644 --- a/settled-merchant-master/src/views/SettleIn/individualBusiness.vue +++ b/settled-merchant-master/src/views/SettleIn/individualBusiness.vue @@ -232,7 +232,8 @@ export default { subjectCardStartTime: '', // 证件有效开始时间 subjectCardEndTime: '', // 证件有效结束时间 subjectCardPositive: '', // 身份证正面照 - subjectCardSide: '' // 身份证反面照 + subjectCardSide: '' ,// 身份证反面照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', diff --git a/settled-merchant-master/src/views/SettleIn/organization.vue b/settled-merchant-master/src/views/SettleIn/organization.vue index e89fbf2..fd28980 100644 --- a/settled-merchant-master/src/views/SettleIn/organization.vue +++ b/settled-merchant-master/src/views/SettleIn/organization.vue @@ -230,7 +230,8 @@ export default { otherCardStartTime: '', // 证件有效开始时间 otherCardEndTime: '', // 证件有效结束时间 otherCardPositive: '', // 身份证正面照 - otherCardSide: '' // 身份证反面照 + otherCardSide: '' ,// 身份证反面照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', diff --git a/settled-merchant-master/src/views/SettleIn/personal.vue b/settled-merchant-master/src/views/SettleIn/personal.vue index 4d9eecd..35005ca 100644 --- a/settled-merchant-master/src/views/SettleIn/personal.vue +++ b/settled-merchant-master/src/views/SettleIn/personal.vue @@ -186,7 +186,8 @@ export default { personalCardEndTime: '', // 证件有效结束时间 personalCardPositive: '', // 身份证正面照 personalCardSide: '', // 身份证反面照 - personalCardHand: '' // 手持证件照 + personalCardHand: '' ,// 手持证件照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', diff --git a/settled-merchant-master/src/views/moblie/mEnterprise.vue b/settled-merchant-master/src/views/moblie/mEnterprise.vue index 8ad5856..1dc5ad0 100644 --- a/settled-merchant-master/src/views/moblie/mEnterprise.vue +++ b/settled-merchant-master/src/views/moblie/mEnterprise.vue @@ -284,7 +284,8 @@ export default { enterpriseCardStartTime: '', // 证件有效开始时间 enterpriseCardEndTime: '', // 证件有效结束时间 enterpriseCardPositive: '', // 身份证正面照 - enterpriseCardSide: '' // 身份证反面照 + enterpriseCardSide: '' ,// 身份证反面照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', diff --git a/settled-merchant-master/src/views/moblie/mOtherOrg.vue b/settled-merchant-master/src/views/moblie/mOtherOrg.vue index ceaa263..d3b6dd8 100644 --- a/settled-merchant-master/src/views/moblie/mOtherOrg.vue +++ b/settled-merchant-master/src/views/moblie/mOtherOrg.vue @@ -283,7 +283,8 @@ export default { otherCardStartTime: '', // 证件有效开始时间 otherCardEndTime: '', // 证件有效结束时间 otherCardPositive: '', // 身份证正面照 - otherCardSide: '' // 身份证反面照 + otherCardSide: '' ,// 身份证反面照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', diff --git a/settled-merchant-master/src/views/moblie/mPersonal.vue b/settled-merchant-master/src/views/moblie/mPersonal.vue index d6b530d..da26548 100644 --- a/settled-merchant-master/src/views/moblie/mPersonal.vue +++ b/settled-merchant-master/src/views/moblie/mPersonal.vue @@ -206,7 +206,8 @@ export default { personalCardEndTime: '', // 证件有效结束时间 personalCardPositive: '', // 身份证正面照 personalCardSide: '', // 身份证反面照 - personalCardHand: '' // 手持证件照 + personalCardHand: '' ,// 手持证件照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', diff --git a/settled-merchant-master/src/views/moblie/mUinitBusiness.vue b/settled-merchant-master/src/views/moblie/mUinitBusiness.vue index a54fb07..59a77b4 100644 --- a/settled-merchant-master/src/views/moblie/mUinitBusiness.vue +++ b/settled-merchant-master/src/views/moblie/mUinitBusiness.vue @@ -287,7 +287,8 @@ export default { subjectCardStartTime: '', // 证件有效开始时间 subjectCardEndTime: '', // 证件有效结束时间 subjectCardPositive: '', // 身份证正面照 - subjectCardSide: '' // 身份证反面照 + subjectCardSide: '' ,// 身份证反面照 + merchantType: '线上商家' }, idCardList: [], dictName: '证件类型', -- libgit2 0.21.4