diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue index 66b4338..17df164 100644 --- a/admin-web-master/src/components/chakan/ggsh.vue +++ b/admin-web-master/src/components/chakan/ggsh.vue @@ -20,8 +20,8 @@ - -
{{info.entityName}}
+ +
{{info.subjectName}}
 @@ -32,8 +32,8 @@ - -
{{info.entityType}}
+ +
{{info.type}}
 @@ -57,8 +57,8 @@ - -
{{info.residence}}
+ +
{{info.address}}
 @@ -87,36 +87,36 @@ - -
{{info.operatorName}}
+ +
{{shopMsg.name}}
 -
{{info.phone}}
+
{{shopMsg.phone}}
 -
{{info.idCardType}}
+
{{shopMsg.idCardType}}
 - -
{{info.idNumber}}
+ +
{{shopMsg.idCardNumber}}
 - +
- +
- +
- +
@@ -211,7 +211,7 @@ - +
{{info.cereAdvertisingInformation.memo || '无'}}
 @@ -262,7 +262,9 @@ import { AdvertiserInfoEdit, } from '@/api/advertisement.js' - + import { + cerePlatformMerchant + } from '@/api/newly.js' import TitleWithCircle from '@/components/top/index'; import MapXian from "@/components/MapContainer/MapXian"; export default { @@ -301,12 +303,22 @@ shop: {}, newshop: {}, newinfo: {}, - parentMessage: {} + parentMessage: {}, + pagequery: { + pageNumber: 0, + pageSize: 10, + checkState:'2', + phone: '', + }, + shopMsg:{} } }, created() { console.log(this.info) - + this.pagequery.phone = this.info.applicant + cerePlatformMerchant(this.pagequery).then(res=>{ + this.shopMsg = res.data.content[0] + }) }, computed: { diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index c8beb4b..9eb5c1e 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -263,7 +263,7 @@ export default { // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理'], ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','广告服务','轮播图设置','商户意向管理','客服服务管理'], ['品牌策划','活动策划','氛围策划','媒体推广'], - ['订单管理','积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'], + ['订单管理','积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','优惠券管理'], ['联机交易','对账处理','日志管理','商户服务'], ['渠道售票统计分析','销售额统计分析'], ], @@ -645,7 +645,7 @@ this.listMune[0] = All ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','广告服务','轮播图设置','商户意向管理','客服服务管理'], // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'], ['品牌策划','活动策划','氛围策划','媒体推广'], - ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'], + ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','优惠券管理'], ['联机交易','对账处理','日志管理','商户服务'], ['渠道售票统计分析','销售额统计分析'], ], diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue index 0332412..ec4904b 100644 --- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -159,7 +159,7 @@
- 确定 + 确定 取消
@@ -247,7 +247,8 @@ message: tit + '成功', type: 'success' }) - this.removeonaction('1') + this.addcl = false + this.getAll() } else { this.$message({ message: res.msg, @@ -544,4 +545,4 @@ padding: 0; display: none; } - \ No newline at end of file + diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue index 17e94e4..f692be3 100644 --- a/admin-web-master/src/views/customer/icManagement/index.vue +++ b/admin-web-master/src/views/customer/icManagement/index.vue @@ -46,7 +46,7 @@ - + @@ -61,7 +63,7 @@
- + - -
- + +
+ v-for="(item,index) in imgList" :key="index" + > +
+ +
+ @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" > @@ -364,16 +369,17 @@ }, genjinMsg(item){ this.msgEit = true + this.formInline = {} this.formInline = item this.formInline.plan_Time = [item.nextFollowUpStartTime,item.nextFollowUpEndTime] - if(typeof item.intendedResource == 'string'){ + if(typeof item.intendedResource == 'string' && item.intendedResource!=''){ this.addziyuanData = JSON.parse(item.intendedResource) } if(typeof item.onSitePhotos == 'string'){ this.imgList = item.onSitePhotos.split(',') ||[] } - console.log( this.formInline) + this.ggXin = true }, onSubmit(){ @@ -449,19 +455,32 @@ this.ggXin = false }, // 新增确定按钮 - async addCheck(val) { - this.formInline.potentialCustomer = this.message - if(this.addziyuanData.length !=0){ - this.formInline.intendedResource = JSON.stringify(this.addziyuanData) - } - this.formInline.onSitePhotos = this.imgList.join(',') - if(this.formInline.currentStage == '达成共识'){ - this.formInline.status = '2' - } - await genAdd(this.formInline) - this.ggXin = false - this.addziyuanData =[] - this.getAll() + addCheck(val) { + this.$refs.genform.validate((valid) => { + if (valid) { + this.formInline.potentialCustomer = this.message + if(this.addziyuanData.length !=0){ + this.formInline.intendedResource = JSON.stringify(this.addziyuanData) + } + this.formInline.onSitePhotos = this.imgList.join(',') + if(this.formInline.currentStage == '达成共识'){ + this.formInline.status = '2' + } + genAdd(this.formInline).then(()=>{ + this.ggXin = false + this.addziyuanData =[] + this.getAll() + }) + + }else { + this.$message({ + message: '请填写完整信息', + type: 'error' + }) + + } + }) + }, } } diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue index 8ccbfd5..e3e2eac 100644 --- a/admin-web-master/src/views/customer/rsaManagement/index.vue +++ b/admin-web-master/src/views/customer/rsaManagement/index.vue @@ -256,15 +256,15 @@ - + - + - + @@ -309,7 +309,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -459,7 +459,7 @@ intentionRegion:'',//意向区域 idCardNumber:'',//身份证号 idCardType:'',//证件类型 - phone:'',//手机号 + phone:null,//手机号 idTime:[], idCardValidStart:'',//身份证有效开始时间 idCardValidEnd:'',//身份证有效结束时间 @@ -512,11 +512,11 @@ message: '请输入租赁周期', trigger: 'blur' }, ], - rentalRent: [{ - required: true, - message: '请输入意向租金(月)', - trigger: 'blur' - }, ], + // rentalRent: [{ + // required: true, + // message: '请输入意向租金(月)', + // trigger: 'blur' + // }, ], operationType: [{ required: true, message: '请输入经营类型', @@ -536,7 +536,11 @@ required: true, message: '请输入手机号', trigger: 'blur' - }, ], + },{ + pattern: /^[0-9]+$/, + message: '手机号只能包含数字', + trigger: 'blur' , + }], idCardValidStart: [{ required: true, message: '请选择身份证有效时间', @@ -569,6 +573,13 @@ // editor.destroy() // 组件销毁时，及时销毁编辑器 // }, methods: { + getCoordinateRules(coord) { + return [ + { required: true, message: `意向租金不能为空且必须是数字`, trigger: 'blur'}, + { pattern: /^(\d+|\d*\.\d{1,10})$/, message: `意向租金为整数或最多三位小数,`, trigger: 'blur' }, + + ] + }, changimg(e,type) { this.ruleForm[type] = e }, @@ -652,7 +663,7 @@ intentionRegion:'',//意向区域 idCardNumber:'',//身份证号 idCardType:'',//证件类型 - phone:'',//手机号 + phone:null,//手机号 idTime:[], idCardValidStart:'',//身份证有效开始时间 idCardValidEnd:'',//身份证有效结束时间 @@ -717,7 +728,9 @@ this.edit = true }, // 取消 closeFn(val) { + this.getAll() this.ggXin = false; + }, //删除管理列表 async delGuan(item) { @@ -737,6 +750,10 @@ this.edit = true rsaManDel({ id: item.id }).then(res => { + this.$message({ + message: '删除成功', + type: 'success' + }) this.getAll() done(); }) @@ -762,12 +779,14 @@ this.edit = true leaseType:'', pageNumber: 0, pageSize: 10, - }; + } + this.currentPage =1 this.getAll() }, // 查询 async onSubmit() { const res = await rsaManAll(this.formSel) + this.currentPage =1 this.tableData = res.data.content this.total = res.data.content.length }, diff --git a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue index b7a727c..6f0f5d1 100644 --- a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue +++ b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue @@ -41,11 +41,13 @@ slot="dateCell" slot-scope="{date, data}"> {{data.day.split("-").slice(2).join("-")}} -
-
- {{item.negotiationTime == data.day?item.negotiationResult:''}} -
-
+
+
+
+ {{item.negotiationTime == data.day?item.negotiationResult:''}} +
+
+
@@ -61,7 +63,7 @@
- +
{{formInline.otherAttachments?'查看详情':'暂无文件'}}
 - -
- + +
+ v-for="(item,index) in imgList" :key="index" + > +
+
+
+ @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" > @@ -260,10 +265,11 @@ }, genjinMsg(item){ this.msgEit = true + this.formInline ={} this.formInline = item this.formInline.plan_Time = [item.nextNegotiationStartTime,item.nextNegotiationEndTime] - if(typeof item.intendedResource == 'string'){ + if(typeof item.intendedResource == 'string' && item.intendedResource != ''){ this.addziyuanData = JSON.parse(item.intendedResource) } if(typeof item.onSitePhotos == 'string'){ @@ -322,16 +328,28 @@ this.ggXin = false }, // 新增确定按钮 - async addCheck(val) { - this.formInline.potentialCustomer = this.message - this.formInline.onSitePhotos = this.imgList.join(',') - if(this.formInline.currentStage == '达成共识'){ - this.formInline.status = '2' - } - await tanAdd(this.formInline) - this.ggXin = false + addCheck(val) { + + this.$refs.tanform.validate((valid) => { + if (valid) { + this.formInline.potentialCustomer = this.message + this.formInline.onSitePhotos = this.imgList.join(',') + if(this.formInline.currentStage == '达成共识'){ + this.formInline.status = '2' + } + tanAdd(this.formInline).then(()=>{ + this.ggXin = false + this.getAll() + }) + }else { + this.$message({ + message: '请填写完整信息', + type: 'error' + }) + + } + }) - this.getAll() }, } } @@ -362,4 +380,5 @@ ::v-deep .el-calendar-table:not(.is-range)td.prev{visibility:hidden;} ::v-deep .el-calendar__button-group {display: none;} ::v-deep .el-backtop, .el-calendar-table td.is-today{color: #3F9B6A;} +::v-deep .el-calendar-table .el-calendar-day {min-height:85px;} diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue index 2bb473c..035e53b 100644 --- a/admin-web-master/src/views/detect/examine/index.vue +++ b/admin-web-master/src/views/detect/examine/index.vue @@ -35,10 +35,10 @@
商铺
- +
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue index a1dc432..dbf9dac 100644 --- a/admin-web-master/src/views/serve/MarkActivity/index.vue +++ b/admin-web-master/src/views/serve/MarkActivity/index.vue @@ -179,7 +179,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -465,6 +465,7 @@ contactPhone: '', pageNumber: 0, pageSize: 10, + orderingRule:3 }, bianjiBox: 1, chengeTatle: 1, @@ -507,6 +508,11 @@ message: '请输入联系电话', trigger: 'blur' }], + coverImage: [{ + required: true, + message: '请上传封面图片', + trigger: 'change' + }], }, mingtotal:0, mingPage:1, @@ -686,7 +692,9 @@ // 查询按钮 onSubmit() { + this.currentPage = 1 this.getAll() + }, //重置按钮 resetting() { @@ -698,6 +706,7 @@ pageNumber: 0, pageSize: 10, } + this.currentPage = 1 this.getAll() }, @@ -737,6 +746,10 @@ this.selectedRow = null MarkDel({ id: item.id }).then(res => { + this.$message({ + message: '删除成功', + type: 'success' + }) this.getAll() done(); }) diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue index f2c16e2..e0f4d80 100644 --- a/admin-web-master/src/views/serve/Merchant/index.vue +++ b/admin-web-master/src/views/serve/Merchant/index.vue @@ -192,8 +192,7 @@ - - + @@ -308,7 +307,7 @@ - + @@ -488,6 +487,11 @@ message: '请上传往期活动图片', trigger: 'change' }, ], + coverImage: [{ + required: true, + message: '请上传封面图片', + trigger: 'change' + }, ], }, selectedRow:null } @@ -720,6 +724,10 @@ this.addziyuanData.push(this.selectedRow) beforeClose: (action, instance, done) => { if (action === 'confirm') { MerDel({id:item.id}).then(res=>{ + this.$message({ + message: '删除成功', + type: 'success' + }) this.getAll() done(); }) diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue index dea8759..a99b7ac 100644 --- a/admin-web-master/src/views/serve/actSp.vue +++ b/admin-web-master/src/views/serve/actSp.vue @@ -294,6 +294,7 @@ region:'', pageNumber:0, pageSize: 10, + orderingRule:3 }, secondData: {}, xiangqing:0, @@ -308,6 +309,7 @@ pageindex: { pageNumber: 0, pageSize: 10, + orderingRule:3 }, fileList: [], actSpye: false, // 审核 diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index d09b4b0..e85d54b 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -6,8 +6,8 @@ -const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' -const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' +const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' +const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' // const DOMAIN_PREFIXPING = 'http://192.168.2.225:9003' // const DOMAIN_PREFIX = 'http://192.168.2.225:9007' // const host = `${window.location.protocol}//${window.location.host}` diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json index f3104dc..e54bec4 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -452,6 +452,13 @@ "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTitleText": "支付" } + }, + { + "path": "rentPay/webView", + "style": { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "跳转" + } } ] }], diff --git a/lvdao-miniapp/pages/activityAdd/activityAdd.vue b/lvdao-miniapp/pages/activityAdd/activityAdd.vue index b9a0756..4c74b9d 100644 --- a/lvdao-miniapp/pages/activityAdd/activityAdd.vue +++ b/lvdao-miniapp/pages/activityAdd/activityAdd.vue @@ -75,7 +75,7 @@ second: true }, typeShow: false, - typeList: [{ value: '1', label: '类型1' }, { value: '2', label: '类型2' }], + typeList: [{ value: '1', label: '社交活动' }, { value: '2', label: '营销活动' }, { value: '3', label: '公益活动' }, { value: '4', label: '教育学习活动' }, { value: '5', label: '文化艺术活动' }], readOnly: false, formats: {}, fist:[], diff --git a/lvdao-miniapp/pages/advertisement/advertisement.vue b/lvdao-miniapp/pages/advertisement/advertisement.vue index 1a732e8..b951a08 100644 --- a/lvdao-miniapp/pages/advertisement/advertisement.vue +++ b/lvdao-miniapp/pages/advertisement/advertisement.vue @@ -7,7 +7,7 @@ --> - + @@ -67,11 +67,12 @@ return { tableData: [], query: { - advertisingName: '', - advertisingType: '', + publishStatus:2 }, pageindex: { + advertisingName: '', + advertisingType: '', pageNumber: 0, pageSize: 10, publishStatus:2 @@ -105,8 +106,8 @@ methods: { //查询全数据 getAll() { - let query = Object.assign(this.pageindex, this.query); - this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', query, 1).then(res => { + + this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', this.pageindex, 1).then(res => { //成功回调 this.tableData = res.data.data.content; }).catch(err => { @@ -127,15 +128,12 @@ // }) }, search() { - this.pageindex = { - pageNumber: 1, - pageSize: 10, - } + this.pageindex.advertisingType = '' this.getAll() }, queryChange(key, val) { - this.query[`${key}`] = val[0].value; - this.search(); + this.pageindex[`${key}`] = val[0].value; + this.getAll() }, toDetail(item) { let items = JSON.stringify(item) @@ -173,8 +171,9 @@ }, handleCompanyConfirm(val){ let page = { - pageNumber: 1, + pageNumber: 0, pageSize: 10, + publishStatus:2, advertisingType:val[0].label } this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', page, 1).then(res => { diff --git a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue index 32727f1..070e75f 100644 --- a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue +++ b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue @@ -356,7 +356,7 @@ }) return } - this.model1.scheduleTime = e.range.after+'至'+e.range.before + this.model1.scheduleTime =e.range.before+'至'+e.range.after }, typeChange(e) { this.model1.type = e[0].label; diff --git a/lvdao-miniapp/pages/business/businessList/businessList.vue b/lvdao-miniapp/pages/business/businessList/businessList.vue index 82c07b9..afc2c3e 100644 --- a/lvdao-miniapp/pages/business/businessList/businessList.vue +++ b/lvdao-miniapp/pages/business/businessList/businessList.vue @@ -43,7 +43,7 @@ title: '', pageNumber: 1, pageSize: 10, - + status:'1', }, listIn:0, num:0, diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue index 2a61224..50ae6d3 100644 --- a/lvdao-miniapp/pages/details/details.vue +++ b/lvdao-miniapp/pages/details/details.vue @@ -46,12 +46,15 @@ 规划图纸： - - - 暂无 - + + + + + + 暂无 + 位置描述： @@ -132,8 +135,10 @@ export default { }, filters: { getimgurl(e) { + let c1 = e.split(',')[0] return c1; + }, }, onLoad(option){ @@ -160,6 +165,12 @@ export default { }) this.swiperList[0].url = data.displayMainImage || data.locationDiagram this.tableData = data + if(typeof data.architecturalDrawings == 'string' && data.architecturalDrawings){ + this.tableData.architecturalDrawings =data.architecturalDrawings.split(',') + } + if(typeof data.planningDrawing == 'string' && data.planningDrawing){ + this.tableData.architecturalDrawings =data.planningDrawing.split(',') + } // let location // if(data.mapPunctuation){ // location = JSON.parse(data.mapPunctuation) diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 2325872..8e7f3c7 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -279,8 +279,10 @@ + + {{item.title}} @@ -393,12 +395,14 @@ let actPages = { pageNumber: 0, pageSize: 10, - reviewStatus:'2' + reviewStatus:'2', + orderingRule:3 } let shopAct = { auditStatus:'3', pageNumber: 0, pageSize: 10, + orderingRule:3 } let shanghu = { status:'1', diff --git a/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue b/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue index a33a339..550cc4e 100644 --- a/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue +++ b/lvdao-miniapp/pages/marketing/marketingList/marketingList.vue @@ -25,7 +25,7 @@ {{item.title}} 活动时间：{{item.startTime}}至{{item.endTime}} - + @@ -52,6 +52,8 @@ activeState: null, // 活动状态 pageNumber:0, pageSize: 10, + reviewStatus:'2' + }, sortTypeOptions: [ { label: '正序', value: 1 }, diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue index 9223ae4..00241ae 100644 --- a/lvdao-miniapp/pages/message/message.vue +++ b/lvdao-miniapp/pages/message/message.vue @@ -228,7 +228,7 @@ }) } else { - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => { + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => { if(res.data.code == '20004' || res.data.code == '20003'){ uni.navigateTo({ url: '/pages/login/login' diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue index d6c74bd..795723e 100644 --- a/lvdao-miniapp/pages/my/my.vue +++ b/lvdao-miniapp/pages/my/my.vue @@ -284,7 +284,7 @@ }) } else { - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => { + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => { if(res.data.code == '20004' || res.data.code == '20003'){ uni.navigateTo({ url: '/pages/login/login' diff --git a/lvdao-miniapp/pages/participation/participation.vue b/lvdao-miniapp/pages/participation/participation.vue index ec5b98c..efd4da7 100644 --- a/lvdao-miniapp/pages/participation/participation.vue +++ b/lvdao-miniapp/pages/participation/participation.vue @@ -32,7 +32,7 @@ {{item.activityName}} 活动日期：{{item.startTime}}至{{item.endTime}} 参与人数：{{item.maxParticipants}} - + diff --git a/lvdao-miniapp/pages/rsaManagement/rsaManagement.vue b/lvdao-miniapp/pages/rsaManagement/rsaManagement.vue index b13dfde..d99c0ff 100644 --- a/lvdao-miniapp/pages/rsaManagement/rsaManagement.vue +++ b/lvdao-miniapp/pages/rsaManagement/rsaManagement.vue @@ -25,7 +25,7 @@ *意向租金(月) - + @@ -85,7 +85,7 @@ ruleForm: { leaseType: '', leaseCycle: '', - rentalRent: '', + rentalRent:null, operationType: '', remark: '', intentionRegion: '', @@ -145,6 +145,7 @@ }); return false; } + if (!this.ruleForm.operationType) { uni.showToast({ icon: 'none', diff --git a/lvdao-miniapp/pages/saleReport/saleReport.vue b/lvdao-miniapp/pages/saleReport/saleReport.vue index ee1e711..3448e9b 100644 --- a/lvdao-miniapp/pages/saleReport/saleReport.vue +++ b/lvdao-miniapp/pages/saleReport/saleReport.vue @@ -35,7 +35,7 @@ 单价 - + @@ -54,7 +54,7 @@ 销售数量 - + diff --git a/lvdao-miniapp/pages/shops/shops.scss b/lvdao-miniapp/pages/shops/shops.scss index d4820c7..b83d530 100644 --- a/lvdao-miniapp/pages/shops/shops.scss +++ b/lvdao-miniapp/pages/shops/shops.scss @@ -36,7 +36,7 @@ padding: 0 20rpx; .zidong{ width: 160rpx; - background-color: #3F9B6A; + background-color: #19be6b; color: #fff; padding: 10rpx; border-radius: 30rpx; diff --git a/lvdao-miniapp/pages/shops/shops.vue b/lvdao-miniapp/pages/shops/shops.vue index 690f6f2..6438b26 100644 --- a/lvdao-miniapp/pages/shops/shops.vue +++ b/lvdao-miniapp/pages/shops/shops.vue @@ -78,13 +78,13 @@ - + 意向面积 @@ -124,12 +124,16 @@ belongingRegion: '', pageNumber: 0, pageSize: 10 , - publishStatus:2 + publishStatus:2, + minPrice:0, + maxPrice:1000000 }, pageindex: { pageNumber: 0, pageSize: 10, - publishStatus:2 + publishStatus:2, + minPrice:0, + maxPrice:1000000 }, tableData: [], areList: [ @@ -297,12 +301,16 @@ this.companys = [ { value: '1', - label: '0-5000' + label: '0-2000' }, { value: '2', - label: '5000-10000' - } + label: '2000-5000' + }, + { + value: '3', + label: '5000-10000' + } ] }else{ this.companys = [ @@ -313,6 +321,10 @@ { value: '2', label: '100-200' + }, + { + value: '3', + label: '200-300' } ] } @@ -326,9 +338,30 @@ }else if(this.index == 3){ this.formList.zuqi = e[0].label }else if(this.index == 4){ - this.formList.zujin = e[0].label + this.formList.zujin = e[0].label + if(e[0].value == 1){ + this.formList.minPrice = 0 + this.formList.maxPrice = 2000 + }else if(e[0].value == 2){ + this.formList.minPrice = 2000 + this.formList.maxPrice = 5000 + }else{ + this.formList.minPrice = 5000 + this.formList.maxPrice = 10000 + } }else{ - this.formList.mianji = e[0].label + this.formList.mianji = e[0].label + if(e[0].value == 1){ + this.formList.minActualUsableArea = 0 + this.formList.maxActualUsableArea = 100 + }else if(e[0].value == 2){ + this.formList.minActualUsableArea = 100 + this.formList.maxActualUsableArea = 200 + }else{ + this.formList.minActualUsableArea = 200 + this.formList.maxActualUsableArea = 300 + } + } }, @@ -377,7 +410,6 @@ this.formList = { zulei: '', belongingRegion: '', - zuqi:'', zujin: '', mianji:'', name:'', diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index f95a655..21ce9c6 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -178,7 +178,7 @@ }) } else { - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => { + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => { if(res.data.code == '20004' || res.data.code == '20003'){ uni.navigateTo({ url: '/pages/login/login' diff --git a/lvdao-miniapp/pagesA/rentPay/goPay.vue b/lvdao-miniapp/pagesA/rentPay/goPay.vue index 6a74158..6eb7e85 100644 --- a/lvdao-miniapp/pagesA/rentPay/goPay.vue +++ b/lvdao-miniapp/pagesA/rentPay/goPay.vue @@ -41,7 +41,9 @@ }, methods: { submit(){ - + uni.navigateTo({ + url: '/pagesA/rentPay/webView' + }) } } } diff --git a/lvdao-miniapp/pagesA/rentPay/webView.vue b/lvdao-miniapp/pagesA/rentPay/webView.vue new file mode 100644 index 0000000..6c04275 --- /dev/null +++ b/lvdao-miniapp/pagesA/rentPay/webView.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file