webapp / GreenwayWeb

Commit 7b3827628425abf2a89a12533b1887bd1e157846

Authored by wesley88
2 parents 6abe0316 4e955529

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 30 changed files with 353 additions and 148 deletions
admin-web-master/src/components/chakan/ggsh.vue
  View file @7b38276
... ... @@ -20,8 +20,8 @@
20 20 <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
21 21 <el-row :gutter="20">
22 22 <el-col :span="9">
23   - <el-form-item label="主体名称" prop="entityName">
24   - <div class="duiqi">{{info.entityName}}</div>
  23 + <el-form-item label="主体名称" prop="subjectName">
  24 + <div class="duiqi">{{info.subjectName}}</div>
25 25 </el-form-item>
26 26 </el-col>
27 27 <el-col :span="9">
... ... @@ -32,8 +32,8 @@
32 32 </el-row>
33 33 <el-row :gutter="20">
34 34 <el-col :span="9">
35   - <el-form-item label="类型" prop="entityType">
36   - <div class="duiqi">{{info.entityType}}</div>
  35 + <el-form-item label="类型" prop="type">
  36 + <div class="duiqi">{{info.type}}</div>
37 37 </el-form-item>
38 38 </el-col>
39 39 <el-col :span="9">
... ... @@ -57,8 +57,8 @@
57 57 </el-form-item>
58 58 </el-col>
59 59 </el-row>
60   - <el-form-item label="住所" prop="residence">
61   - <div class="duiqi">{{info.residence}}</div>
  60 + <el-form-item label="住所" prop="address">
  61 + <div class="duiqi">{{info.address}}</div>
62 62 </el-form-item>
63 63 <el-row :gutter="20">
64 64 <el-col :span="9">
... ... @@ -87,36 +87,36 @@
87 87 <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
88 88 <el-row :gutter="20">
89 89 <el-col :span="9">
90   - <el-form-item label="姓名" prop="operatorName">
91   - <div class="duiqi">{{info.operatorName}}</div>
  90 + <el-form-item label="姓名" prop="name">
  91 + <div class="duiqi">{{shopMsg.name}}</div>
92 92 </el-form-item>
93 93 </el-col>
94 94 <el-col :span="9">
95 95 <el-form-item label="手机号" prop="phone">
96   - <div class="duiqi">{{info.phone}}</div>
  96 + <div class="duiqi">{{shopMsg.phone}}</div>
97 97 </el-form-item>
98 98 </el-col>
99 99 </el-row>
100 100 <el-row :gutter="20">
101 101 <el-col :span="9">
102 102 <el-form-item label="证件类型" prop="idCardType">
103   - <div class="duiqi">{{info.idCardType}}</div>
  103 + <div class="duiqi">{{shopMsg.idCardType}}</div>
104 104 </el-form-item>
105 105 </el-col>
106 106 <el-col :span="9">
107   - <el-form-item label="身份证号码" prop="idNumber">
108   - <div class="duiqi">{{info.idNumber}}</div>
  107 + <el-form-item label="身份证号码" prop="idCardNumber">
  108 + <div class="duiqi">{{shopMsg.idCardNumber}}</div>
109 109 </el-form-item>
110 110 </el-col>
111 111 </el-row>
112   - <el-form-item label="身份证照片（正）" prop="idPhotoFront">
  112 + <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
113 113 <div style="margin-top: 10px;">
114   - <el-image style="width: 200px;" :src="$baseURL+info.idPhotoFront" fit="contain"></el-image>
  114 + <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
115 115 </div>
116 116 </el-form-item>
117   - <el-form-item label="身份证照片（反）" prop="idPhotoBack">
  117 + <el-form-item label="身份证照片（反）" prop="idCardBackImage">
118 118 <div style="margin-top: 10px;">
119   - <el-image style="width: 200px;" :src="$baseURL+info.idPhotoBack" fit="contain"></el-image>
  119 + <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
120 120 </div>
121 121 </el-form-item>
122 122 </el-form>
... ... @@ -211,7 +211,7 @@
211 211 <el-form-item label="位置示意图" prop="locationDiagram">
212 212 <img v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
213 213 </el-form-item>
214   -
  214 +
215 215 <el-form-item label="备注信息" prop="memo" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
216 216 <div class="duiqi">{{info.cereAdvertisingInformation.memo || '无'}}</div>
217 217 </el-form-item>
... ... @@ -262,7 +262,9 @@
262 262 import {
263 263 AdvertiserInfoEdit,
264 264 } from '@/api/advertisement.js'
265   -
  265 + import {
  266 + cerePlatformMerchant
  267 + } from '@/api/newly.js'
266 268 import TitleWithCircle from '@/components/top/index';
267 269 import MapXian from "@/components/MapContainer/MapXian";
268 270 export default {
... ... @@ -301,12 +303,22 @@
301 303 shop: {},
302 304 newshop: {},
303 305 newinfo: {},
304   - parentMessage: {}
  306 + parentMessage: {},
  307 + pagequery: {
  308 + pageNumber: 0,
  309 + pageSize: 10,
  310 + checkState:'2',
  311 + phone: '',
  312 + },
  313 + shopMsg:{}
305 314 }
306 315 },
307 316 created() {
308 317 console.log(this.info)
309   -
  318 + this.pagequery.phone = this.info.applicant
  319 + cerePlatformMerchant(this.pagequery).then(res=>{
  320 + this.shopMsg = res.data.content[0]
  321 + })
310 322 },
311 323 computed: {
312 324  
... ...
admin-web-master/src/layout/index.vue
  View file @7b38276
... ... @@ -263,7 +263,7 @@ export default {
263 263 // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理'],
264 264 ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','广告服务','轮播图设置','商户意向管理','客服服务管理'],
265 265 ['品牌策划','活动策划','氛围策划','媒体推广'],
266   - ['订单管理','积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'],
  266 + ['订单管理','积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','优惠券管理'],
267 267 ['联机交易','对账处理','日志管理','商户服务'],
268 268 ['渠道售票统计分析','销售额统计分析'],
269 269 ],
... ... @@ -645,7 +645,7 @@ this.listMune[0] = All
645 645 ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','广告服务','轮播图设置','商户意向管理','客服服务管理'],
646 646 // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'],
647 647 ['品牌策划','活动策划','氛围策划','媒体推广'],
648   - ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'],
  648 + ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','优惠券管理'],
649 649 ['联机交易','对账处理','日志管理','商户服务'],
650 650 ['渠道售票统计分析','销售额统计分析'],
651 651 ],
... ...
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @7b38276
... ... @@ -159,7 +159,7 @@
159 159 <el-col :span="12">
160 160 <el-form-item>
161 161 <div style="margin-top: 20px">
162   - <el-button @click="changeauditStatus()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  162 + <el-button @click="changeauditStatus" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
163 163 <el-button @click="addcl = false" class="buttonHover"
164 164 style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
165 165 </div>
... ... @@ -247,7 +247,8 @@
247 247 message: tit + '成功',
248 248 type: 'success'
249 249 })
250   - this.removeonaction('1')
  250 + this.addcl = false
  251 + this.getAll()
251 252 } else {
252 253 this.$message({
253 254 message: res.msg,
... ... @@ -544,4 +545,4 @@
544 545 padding: 0;
545 546 display: none;
546 547 }
547   -</style>
548 548 \ No newline at end of file
  549 +</style>
... ...
admin-web-master/src/views/customer/icManagement/index.vue
  View file @7b38276
... ... @@ -46,7 +46,7 @@
46 46 <el-table-column label="意向租赁周期" prop="leaseCycle" min-width="120" />
47 47 <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" />
48 48 <el-table-column label="意向区域" prop="intentionRegion" min-width="150" />
49   - <el-table-column label="操作" min-width="180">
  49 + <el-table-column label="操作" min-width="180" fixed="right">
50 50 <template slot-scope="scope">
51 51 <div class="tableBtn greens" @click="handleEditForm(scope.row)">
52 52 查看
... ... @@ -96,8 +96,10 @@
96 96 </el-row>
97 97 <el-row :gutter="20">
98 98 <el-col :span="12">
99   - <el-form-item label="意向租金(月)" prop="rentalRent">
100   - <el-input v-model.number="ruleForm.rentalRent" placeholder="请输入" />
  99 + <el-form-item label="意向租金(月)" prop="rentalRent" :rules="getCoordinateRules('rentalRent')">
  100 + <el-input v-model.number="ruleForm.rentalRent" placeholder="请输入" >
  101 +
  102 + </el-input>
101 103 </el-form-item>
102 104 </el-col>
103 105 <el-col :span="12">
... ... @@ -123,7 +125,7 @@
123 125 </el-col>
124 126 <el-col :span="12">
125 127 <el-form-item label="手机号" prop="phone">
126   - <el-input v-model="ruleForm.phone" placeholder="请输入" />
  128 + <el-input v-model.number="ruleForm.phone" placeholder="请输入" />
127 129 </el-form-item>
128 130 </el-col>
129 131 </el-row>
... ... @@ -257,15 +259,15 @@
257 259 <el-col :span="12">
258 260 <el-form-item label="身份证照片(正面)" prop="businessScope">
259 261 <!-- {{idCardPhotoFront}} -->
260   - <el-image :src="$baseURL +secondData.idCardPhotoFront"></el-image>
  262 + <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image>
261 263 </el-form-item>
262 264 </el-col>
263 265 </el-row>
264 266 <el-row :gutter="20">
265 267 <el-col :span="12">
266   - <el-form-item label="身份证照片(反面面)" prop="businessScope">
  268 + <el-form-item label="身份证照片(反面)" prop="businessScope">
267 269 <!-- idCardPhotoBack -->
268   - <el-image :src="$baseURL +secondData.idCardPhotoBack"></el-image>
  270 + <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image>
269 271 </el-form-item>
270 272 </el-col>
271 273 </el-row>
... ... @@ -326,7 +328,7 @@
326 328 intentionRegion:'',//意向区域
327 329 idCardNumber:'',//身份证号
328 330 idCardType:'',//证件类型
329   - phone:'',//手机号
  331 + phone:null,//手机号
330 332 idTime:[],
331 333 idCardValidStart:'',//身份证有效开始时间
332 334 idCardValidEnd:'',//身份证有效结束时间
... ... @@ -362,11 +364,14 @@
362 364 message: '请输入租赁周期',
363 365 trigger: 'blur'
364 366 }, ],
365   - rentalRent: [{
366   - required: true,
367   - message: '请输入意向租金(月)',
368   - trigger: 'blur'
369   - }, ],
  367 + // rentalRent: [{
  368 + // required: true,
  369 + // message: '请输入意向租金(月)',
  370 + // trigger: 'blur'
  371 + // },{
  372 + // pattern: /^(\d+|\d*\.\d{1,10})$/,
  373 + // message: `${coord}为整数或最多三位小数,trigger:'blur'`
  374 + // }],
370 375 operationType: [{
371 376 required: true,
372 377 message: '请输入经营类型',
... ... @@ -386,7 +391,11 @@
386 391 required: true,
387 392 message: '请输入手机号',
388 393 trigger: 'blur'
389   - }, ],
  394 + },{
  395 + pattern: /^[0-9]+$/,
  396 + message: '手机号只能包含数字',
  397 + trigger: 'blur' ,
  398 + }],
390 399 idCardValidStart: [{
391 400 required: true,
392 401 message: '请选择身份证有效时间',
... ... @@ -414,6 +423,13 @@
414 423 mounted() {},
415 424  
416 425 methods: {
  426 +getCoordinateRules(coord) {
  427 + return [
  428 + { required: true, message: `意向租金不能为空且必须是数字`, trigger: 'blur'},
  429 + { pattern: /^(\d+|\d*\.\d{1,10})$/, message: `意向租金为整数或最多三位小数`, trigger: 'blur' },
  430 +
  431 + ]
  432 +},
417 433 changimg(e,type) {
418 434 this.ruleForm[type] = e
419 435 },
... ... @@ -461,7 +477,9 @@ this.ruleForm.idCardValidEnd = e[1]
461 477 },
462 478 // 查询
463 479 async onSubmit() {
  480 +
464 481 const res = await icManAll(this.formSel)
  482 + this.currentPage =1
465 483 this.tableData = res.data.content
466 484 this.total = res.data.content.length
467 485 },
... ... @@ -483,7 +501,7 @@ this.ruleForm.idCardValidEnd = e[1]
483 501 idCardNumber:'',//身份证号
484 502 idCardType:'',//证件类型
485 503 idTime:[],
486   - phone:'',//手机号
  504 + phone:null,//手机号
487 505 idCardValidStart:'',//身份证有效开始时间
488 506 idCardValidEnd:'',//身份证有效结束时间
489 507 idCardPhotoFront:'',//身份证照片(正面)
... ... @@ -537,6 +555,7 @@ this.ruleForm.idCardValidEnd = e[1]
537 555 // 取消
538 556 closeFn(val) {
539 557 this.ggXin = false;
  558 + this.getAll()
540 559 },
541 560 //删除管理列表
542 561 delGuan(item) {
... ... @@ -556,6 +575,10 @@ this.ruleForm.idCardValidEnd = e[1]
556 575 icManDel({
557 576 id: item.id
558 577 }).then(res => {
  578 + this.$message({
  579 + message: '删除成功',
  580 + type: 'success'
  581 + })
559 582 this.getAll()
560 583 done();
561 584 })
... ... @@ -573,6 +596,7 @@ this.ruleForm.idCardValidEnd = e[1]
573 596 pageNumber: 0,
574 597 pageSize: 10,
575 598 }
  599 + this.currentPage = 1
576 600 this.getAll()
577 601 },
578 602 }
... ...
admin-web-master/src/views/customer/rsaManagement/genjin.vue
  View file @7b38276
... ... @@ -41,11 +41,13 @@
41 41 slot="dateCell"
42 42 slot-scope="{date, data}">
43 43 {{data.day.split("-").slice(2).join("-")}}
  44 + <div style="overflow: auto;height:55px;">
44 45 <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
45 46 <div style="font-size:12px;margin-top:10px;" >
46 47 {{item.followUpTime == data.day?item.contentFeedback:''}}
47 48 </div>
48 49 </div>
  50 + </div>
49 51 </template>
50 52 </el-calendar>
51 53 </div>
... ... @@ -61,7 +63,7 @@
61 63 <el-dialog :title="msgEit?'查看':'新增'" :visible.sync="ggXin" width="75%"
62 64 append-to-body :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
63 65 <div style="padding: 20px;">
64   - <el-form ref="form" :model="formInline" :rules="rulesOne" label-width="120px">
  66 + <el-form ref="genform" :model="formInline" :rules="rulesOne" label-width="120px">
65 67 <el-form-item label="跟进时间" prop="followUpTime">
66 68 <el-date-picker
67 69 :disabled="msgEit"
... ... @@ -135,17 +137,20 @@
135 137 <el-input type="textarea" v-model="formInline.contentFeedback" :rows="4" :disabled="msgEit"></el-input>
136 138 </el-form-item>
137 139  
138   - <el-form-item label="现场照片">
139   - <div v-if="msgEit" v-for="(item,index) in imgList" :key="index" >
140   -
  140 + <el-form-item label="现场照片" >
  141 + <div style="display:flex;flex-wrap: wrap;" v-if="msgEit" >
141 142 <el-image
142   - style="width: 100px; height: 100px"
  143 + style="width: 100px; height: 100px;margin-right: 10px;"
143 144 fit="fill"
144 145 :src="$baseURL+item"
145   - ></el-image>
  146 + v-for="(item,index) in imgList" :key="index"
  147 + >
  148 + <div slot="error" class="image-slot">
  149 +
  150 + </div></el-image>
146 151 </div>
147 152 <upimg filePath="yixiang" inputtype="onSitePhotos" :value="formInline.onSitePhotos"
148   - @changimg="e=>changimg(e,'onSitePhotos')" :limit="5" v-if="msgEit==false" ></upimg>
  153 + @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" ></upimg>
149 154  
150 155 </el-form-item>
151 156 <el-form-item label="下次更进时间" prop="plan_Time">
... ... @@ -364,16 +369,17 @@
364 369 },
365 370 genjinMsg(item){
366 371 this.msgEit = true
  372 + this.formInline = {}
367 373 this.formInline = item
368 374 this.formInline.plan_Time = [item.nextFollowUpStartTime,item.nextFollowUpEndTime]
369 375  
370   - if(typeof item.intendedResource == 'string'){
  376 + if(typeof item.intendedResource == 'string' && item.intendedResource!=''){
371 377 this.addziyuanData = JSON.parse(item.intendedResource)
372 378 }
373 379 if(typeof item.onSitePhotos == 'string'){
374 380 this.imgList = item.onSitePhotos.split(',') ||[]
375 381 }
376   - console.log( this.formInline)
  382 +
377 383 this.ggXin = true
378 384 },
379 385 onSubmit(){
... ... @@ -449,19 +455,32 @@
449 455 this.ggXin = false
450 456 },
451 457 // 新增确定按钮
452   - async addCheck(val) {
453   - this.formInline.potentialCustomer = this.message
454   - if(this.addziyuanData.length !=0){
455   - this.formInline.intendedResource = JSON.stringify(this.addziyuanData)
456   - }
457   - this.formInline.onSitePhotos = this.imgList.join(',')
458   - if(this.formInline.currentStage == '达成共识'){
459   - this.formInline.status = '2'
460   - }
461   - await genAdd(this.formInline)
462   - this.ggXin = false
463   - this.addziyuanData =[]
464   - this.getAll()
  458 + addCheck(val) {
  459 + this.$refs.genform.validate((valid) => {
  460 + if (valid) {
  461 + this.formInline.potentialCustomer = this.message
  462 + if(this.addziyuanData.length !=0){
  463 + this.formInline.intendedResource = JSON.stringify(this.addziyuanData)
  464 + }
  465 + this.formInline.onSitePhotos = this.imgList.join(',')
  466 + if(this.formInline.currentStage == '达成共识'){
  467 + this.formInline.status = '2'
  468 + }
  469 + genAdd(this.formInline).then(()=>{
  470 + this.ggXin = false
  471 + this.addziyuanData =[]
  472 + this.getAll()
  473 + })
  474 +
  475 + }else {
  476 + this.$message({
  477 + message: '请填写完整信息',
  478 + type: 'error'
  479 + })
  480 +
  481 + }
  482 + })
  483 +
465 484 },
466 485 }
467 486 }
... ...
admin-web-master/src/views/customer/rsaManagement/index.vue
  View file @7b38276
... ... @@ -256,15 +256,15 @@
256 256 <el-col :span="12">
257 257 <el-form-item label="身份证照片(正面)" prop="businessScope">
258 258 <!-- {{idCardPhotoFront}} -->
259   - <el-image :src="$baseURL +secondData.idCardPhotoFront"></el-image>
  259 + <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image>
260 260 </el-form-item>
261 261 </el-col>
262 262 </el-row>
263 263 <el-row :gutter="20">
264 264 <el-col :span="12">
265   - <el-form-item label="身份证照片(反面面)" prop="businessScope">
  265 + <el-form-item label="身份证照片(反面)" prop="businessScope">
266 266 <!-- idCardPhotoBack -->
267   - <el-image :src="$baseURL +secondData.idCardPhotoBack"></el-image>
  267 + <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image>
268 268 </el-form-item>
269 269 </el-col>
270 270 </el-row>
... ... @@ -309,7 +309,7 @@
309 309 </el-row>
310 310 <el-row :gutter="20">
311 311 <el-col :span="12">
312   - <el-form-item label="意向租金(月)" prop="rentalRent">
  312 + <el-form-item label="意向租金(月)" prop="rentalRent" :rules="getCoordinateRules('rentalRent')">
313 313 <el-input v-model.number="ruleForm.rentalRent" placeholder="请输入" />
314 314 </el-form-item>
315 315 </el-col>
... ... @@ -336,7 +336,7 @@
336 336 </el-col>
337 337 <el-col :span="12">
338 338 <el-form-item label="手机号" prop="phone">
339   - <el-input v-model="ruleForm.phone" placeholder="请输入" />
  339 + <el-input v-model.number="ruleForm.phone" placeholder="请输入" />
340 340 </el-form-item>
341 341 </el-col>
342 342 </el-row>
... ... @@ -459,7 +459,7 @@
459 459 intentionRegion:'',//意向区域
460 460 idCardNumber:'',//身份证号
461 461 idCardType:'',//证件类型
462   - phone:'',//手机号
  462 + phone:null,//手机号
463 463 idTime:[],
464 464 idCardValidStart:'',//身份证有效开始时间
465 465 idCardValidEnd:'',//身份证有效结束时间
... ... @@ -512,11 +512,11 @@
512 512 message: '请输入租赁周期',
513 513 trigger: 'blur'
514 514 }, ],
515   - rentalRent: [{
516   - required: true,
517   - message: '请输入意向租金(月)',
518   - trigger: 'blur'
519   - }, ],
  515 + // rentalRent: [{
  516 + // required: true,
  517 + // message: '请输入意向租金(月)',
  518 + // trigger: 'blur'
  519 + // }, ],
520 520 operationType: [{
521 521 required: true,
522 522 message: '请输入经营类型',
... ... @@ -536,7 +536,11 @@
536 536 required: true,
537 537 message: '请输入手机号',
538 538 trigger: 'blur'
539   - }, ],
  539 + },{
  540 + pattern: /^[0-9]+$/,
  541 + message: '手机号只能包含数字',
  542 + trigger: 'blur' ,
  543 + }],
540 544 idCardValidStart: [{
541 545 required: true,
542 546 message: '请选择身份证有效时间',
... ... @@ -569,6 +573,13 @@
569 573 // editor.destroy() // 组件销毁时，及时销毁编辑器
570 574 // },
571 575 methods: {
  576 + getCoordinateRules(coord) {
  577 + return [
  578 + { required: true, message: `意向租金不能为空且必须是数字`, trigger: 'blur'},
  579 + { pattern: /^(\d+|\d*\.\d{1,10})$/, message: `意向租金为整数或最多三位小数,`, trigger: 'blur' },
  580 +
  581 + ]
  582 + },
572 583 changimg(e,type) {
573 584 this.ruleForm[type] = e
574 585 },
... ... @@ -652,7 +663,7 @@
652 663 intentionRegion:'',//意向区域
653 664 idCardNumber:'',//身份证号
654 665 idCardType:'',//证件类型
655   - phone:'',//手机号
  666 + phone:null,//手机号
656 667 idTime:[],
657 668 idCardValidStart:'',//身份证有效开始时间
658 669 idCardValidEnd:'',//身份证有效结束时间
... ... @@ -717,7 +728,9 @@ this.edit = true
717 728 },
718 729 // 取消
719 730 closeFn(val) {
  731 + this.getAll()
720 732 this.ggXin = false;
  733 +
721 734 },
722 735 //删除管理列表
723 736 async delGuan(item) {
... ... @@ -737,6 +750,10 @@ this.edit = true
737 750 rsaManDel({
738 751 id: item.id
739 752 }).then(res => {
  753 + this.$message({
  754 + message: '删除成功',
  755 + type: 'success'
  756 + })
740 757 this.getAll()
741 758 done();
742 759 })
... ... @@ -762,12 +779,14 @@ this.edit = true
762 779 leaseType:'',
763 780 pageNumber: 0,
764 781 pageSize: 10,
765   - };
  782 + }
  783 + this.currentPage =1
766 784 this.getAll()
767 785 },
768 786 // 查询
769 787 async onSubmit() {
770 788 const res = await rsaManAll(this.formSel)
  789 + this.currentPage =1
771 790 this.tableData = res.data.content
772 791 this.total = res.data.content.length
773 792 },
... ...
admin-web-master/src/views/customer/rsaManagement/tanpan.vue
  View file @7b38276
... ... @@ -41,11 +41,13 @@
41 41 slot="dateCell"
42 42 slot-scope="{date, data}">
43 43 {{data.day.split("-").slice(2).join("-")}}
44   - <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
45   - <div style="font-size:12px;margin-top:10px;" >
46   - {{item.negotiationTime == data.day?item.negotiationResult:''}}
47   - </div>
48   - </div>
  44 + <div style="overflow: auto;height:55px;">
  45 + <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
  46 + <div style="font-size:12px;margin-top:10px;width:48%" >
  47 + {{item.negotiationTime == data.day?item.negotiationResult:''}}
  48 + </div>
  49 + </div>
  50 + </div>
49 51 </template>
50 52 </el-calendar>
51 53 </div>
... ... @@ -61,7 +63,7 @@
61 63 <el-dialog :title="msgEit?'查看':'新增'" :visible.sync="ggXin" width="75%"
62 64 append-to-body :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
63 65 <div style="padding: 20px;">
64   - <el-form ref="form" :model="formInline" :rules="rulesOne" label-width="120px">
  66 + <el-form ref="tanform" :model="formInline" :rules="rulesOne" label-width="120px">
65 67 <el-form-item label="谈判时间" prop="negotiationTime">
66 68 <el-date-picker
67 69 :disabled="msgEit"
... ... @@ -98,17 +100,20 @@
98 100 <upfile filePath="yixiang" inputtype="otherAttachments" :value="formInline.otherAttachments" v-if="msgEit==false" accept=".docx" @changimg="e=>changimg(e,'otherAttachments')"></upfile>
99 101 <div class="duiqi greens" v-if="msgEit" @click="formInline.otherAttachments?openfile(formInline.otherAttachments):''">{{formInline.otherAttachments?'查看详情':'暂无文件'}}</div>
100 102 </el-form-item>
101   - <el-form-item label="现场照片">
102   - <div v-if="msgEit" v-for="(item,index) in imgList" :key="index" >
103   -
  103 + <el-form-item label="现场照片" >
  104 + <div v-if="msgEit" style="display:flex;flex-wrap: wrap">
104 105 <el-image
105   - style="width: 100px; height: 100px"
  106 + style="width: 100px; height: 100px;margin-right: 10px;"
106 107 fit="fill"
107 108 :src="$baseURL+item"
108   - ></el-image>
  109 + v-for="(item,index) in imgList" :key="index"
  110 + >
  111 + <div slot="error" class="image-slot">
  112 + </div>
  113 + </el-image>
109 114 </div>
110 115 <upimg filePath="yixiang" inputtype="onSitePhotos" :value="formInline.onSitePhotos"
111   - @changimg="e=>changimg(e,'onSitePhotos')" :limit="5" v-if="msgEit==false" ></upimg>
  116 + @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" ></upimg>
112 117  
113 118 </el-form-item>
114 119 <el-form-item label="下次谈判时间" prop="plan_Time">
... ... @@ -260,10 +265,11 @@
260 265 },
261 266 genjinMsg(item){
262 267 this.msgEit = true
  268 + this.formInline ={}
263 269 this.formInline = item
264 270 this.formInline.plan_Time = [item.nextNegotiationStartTime,item.nextNegotiationEndTime]
265 271  
266   - if(typeof item.intendedResource == 'string'){
  272 + if(typeof item.intendedResource == 'string' && item.intendedResource != ''){
267 273 this.addziyuanData = JSON.parse(item.intendedResource)
268 274 }
269 275 if(typeof item.onSitePhotos == 'string'){
... ... @@ -322,16 +328,28 @@
322 328 this.ggXin = false
323 329 },
324 330 // 新增确定按钮
325   - async addCheck(val) {
326   - this.formInline.potentialCustomer = this.message
327   - this.formInline.onSitePhotos = this.imgList.join(',')
328   - if(this.formInline.currentStage == '达成共识'){
329   - this.formInline.status = '2'
330   - }
331   - await tanAdd(this.formInline)
332   - this.ggXin = false
  331 + addCheck(val) {
  332 +
  333 + this.$refs.tanform.validate((valid) => {
  334 + if (valid) {
  335 + this.formInline.potentialCustomer = this.message
  336 + this.formInline.onSitePhotos = this.imgList.join(',')
  337 + if(this.formInline.currentStage == '达成共识'){
  338 + this.formInline.status = '2'
  339 + }
  340 + tanAdd(this.formInline).then(()=>{
  341 + this.ggXin = false
  342 + this.getAll()
  343 + })
  344 + }else {
  345 + this.$message({
  346 + message: '请填写完整信息',
  347 + type: 'error'
  348 + })
  349 +
  350 + }
  351 + })
333 352  
334   - this.getAll()
335 353 },
336 354 }
337 355 }
... ... @@ -362,4 +380,5 @@
362 380 ::v-deep .el-calendar-table:not(.is-range)td.prev{visibility:hidden;}
363 381 ::v-deep .el-calendar__button-group {display: none;}
364 382 ::v-deep .el-backtop, .el-calendar-table td.is-today{color: #3F9B6A;}
  383 +::v-deep .el-calendar-table .el-calendar-day {min-height:85px;}
365 384 </style>
... ...
admin-web-master/src/views/detect/examine/index.vue
  View file @7b38276
... ... @@ -35,10 +35,10 @@
35 35 <div style="display: flex;font-size: 14px">
36 36 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
37 37 </div>
38   - <!-- <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
  38 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
39 39 广告位</div>
40 40 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
41   - </div> -->
  41 + </div>
42 42 </div>
43 43 </div>
44 44 <!-- 表格 -->
... ...
admin-web-master/src/views/serve/MarkActivity/index.vue
  View file @7b38276
... ... @@ -179,7 +179,7 @@
179 179 <el-col :span="24">
180 180 <el-form-item label="封面图片" prop="businessScope">
181 181 <!-- {{idCardPhotoFront}} -->
182   - <el-image :src="$baseURL +xiangData.coverImage"></el-image>
  182 + <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image>
183 183 </el-form-item>
184 184 </el-col>
185 185 </el-row>
... ... @@ -279,7 +279,7 @@
279 279  
280 280 <el-row :gutter="20">
281 281 <el-col :span="24">
282   - <el-form-item label="封面图片">
  282 + <el-form-item label="封面图片" prop="coverImage">
283 283 <!-- <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg> -->
284 284 <upimg filePath="serve" :value="formInline.coverImage" inputtype="coverImage" :limit="1"
285 285 @changimg="e=>changimg(e,'coverImage')"></upimg>
... ... @@ -465,6 +465,7 @@
465 465 contactPhone: '',
466 466 pageNumber: 0,
467 467 pageSize: 10,
  468 + orderingRule:3
468 469 },
469 470 bianjiBox: 1,
470 471 chengeTatle: 1,
... ... @@ -507,6 +508,11 @@
507 508 message: '请输入联系电话',
508 509 trigger: 'blur'
509 510 }],
  511 + coverImage: [{
  512 + required: true,
  513 + message: '请上传封面图片',
  514 + trigger: 'change'
  515 + }],
510 516 },
511 517 mingtotal:0,
512 518 mingPage:1,
... ... @@ -686,7 +692,9 @@
686 692  
687 693 // 查询按钮
688 694 onSubmit() {
  695 + this.currentPage = 1
689 696 this.getAll()
  697 +
690 698 },
691 699 //重置按钮
692 700 resetting() {
... ... @@ -698,6 +706,7 @@
698 706 pageNumber: 0,
699 707 pageSize: 10,
700 708 }
  709 + this.currentPage = 1
701 710 this.getAll()
702 711 },
703 712  
... ... @@ -737,6 +746,10 @@ this.selectedRow = null
737 746 MarkDel({
738 747 id: item.id
739 748 }).then(res => {
  749 + this.$message({
  750 + message: '删除成功',
  751 + type: 'success'
  752 + })
740 753 this.getAll()
741 754 done();
742 755 })
... ...
admin-web-master/src/views/serve/Merchant/index.vue
  View file @7b38276
... ... @@ -192,8 +192,7 @@
192 192 <el-row :gutter="20">
193 193 <el-col :span="24">
194 194 <el-form-item label="封面图片" prop="coverImage">
195   -
196   - <el-image :src="$baseURL +xiangData.coverImage"></el-image>
  195 + <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image>
197 196 </el-form-item>
198 197 </el-col>
199 198 </el-row>
... ... @@ -308,7 +307,7 @@
308 307 </el-row>
309 308 <el-row :gutter="20">
310 309 <el-col :span="24">
311   - <el-form-item label="封面图片">
  310 + <el-form-item label="封面图片" prop="coverImage">
312 311 <upimg filePath="serve" :value="formInline.coverImage" inputtype="coverImage" :limit="1"
313 312 @changimg="e=>changimg(e,'coverImage')"></upimg>
314 313 </el-form-item>
... ... @@ -488,6 +487,11 @@
488 487 message: '请上传往期活动图片',
489 488 trigger: 'change'
490 489 }, ],
  490 + coverImage: [{
  491 + required: true,
  492 + message: '请上传封面图片',
  493 + trigger: 'change'
  494 + }, ],
491 495 },
492 496 selectedRow:null
493 497 }
... ... @@ -720,6 +724,10 @@ this.addziyuanData.push(this.selectedRow)
720 724 beforeClose: (action, instance, done) => {
721 725 if (action === 'confirm') {
722 726 MerDel({id:item.id}).then(res=>{
  727 + this.$message({
  728 + message: '删除成功',
  729 + type: 'success'
  730 + })
723 731 this.getAll()
724 732 done();
725 733 })
... ...
admin-web-master/src/views/serve/actSp.vue
  View file @7b38276
... ... @@ -294,6 +294,7 @@
294 294 region:'',
295 295 pageNumber:0,
296 296 pageSize: 10,
  297 + orderingRule:3
297 298 },
298 299 secondData: {},
299 300 xiangqing:0,
... ... @@ -308,6 +309,7 @@
308 309 pageindex: {
309 310 pageNumber: 0,
310 311 pageSize: 10,
  312 + orderingRule:3
311 313 },
312 314 fileList: [],
313 315 actSpye: false, // 审核
... ...
ceres-uniapp-master/config/api.js
  View file @7b38276
... ... @@ -6,8 +6,8 @@
6 6  
7 7  
8 8  
9   -const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
10   -const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api'
  9 +const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
  10 +const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
11 11 // const DOMAIN_PREFIXPING = 'http://192.168.2.225:9003'
12 12 // const DOMAIN_PREFIX = 'http://192.168.2.225:9007'
13 13 // const host = `${window.location.protocol}//${window.location.host}`
... ...
lvdao-miniapp/pages.json
  View file @7b38276
... ... @@ -452,6 +452,13 @@
452 452 "navigationBarBackgroundColor": "#FFFFFF",
453 453 "navigationBarTitleText": "支付"
454 454 }
  455 + },
  456 + {
  457 + "path": "rentPay/webView",
  458 + "style": {
  459 + "navigationBarBackgroundColor": "#FFFFFF",
  460 + "navigationBarTitleText": "跳转"
  461 + }
455 462 }
456 463 ]
457 464 }],
... ...
lvdao-miniapp/pages/activityAdd/activityAdd.vue
  View file @7b38276
... ... @@ -75,7 +75,7 @@
75 75 second: true
76 76 },
77 77 typeShow: false,
78   - typeList: [{ value: '1', label: '类型1' }, { value: '2', label: '类型2' }],
  78 + typeList: [{ value: '1', label: '社交活动' }, { value: '2', label: '营销活动' }, { value: '3', label: '公益活动' }, { value: '4', label: '教育学习活动' }, { value: '5', label: '文化艺术活动' }],
79 79 readOnly: false,
80 80 formats: {},
81 81 fist:[],
... ...
lvdao-miniapp/pages/advertisement/advertisement.vue
  View file @7b38276
... ... @@ -7,7 +7,7 @@
7 7 </view> -->
8 8 <!-- 搜索 -->
9 9 <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
10   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.advertisingName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  10 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageindex.advertisingName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
11 11 </view>
12 12 <view class="screen-list">
13 13 <view class="list" @click="typeshow = true">
... ... @@ -67,11 +67,12 @@
67 67 return {
68 68 tableData: [],
69 69 query: {
70   - advertisingName: '',
71   - advertisingType: '',
  70 +
72 71 publishStatus:2
73 72 },
74 73 pageindex: {
  74 + advertisingName: '',
  75 + advertisingType: '',
75 76 pageNumber: 0,
76 77 pageSize: 10,
77 78 publishStatus:2
... ... @@ -105,8 +106,8 @@
105 106 methods: {
106 107 //查询全数据
107 108 getAll() {
108   - let query = Object.assign(this.pageindex, this.query);
109   - this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', query, 1).then(res => {
  109 +
  110 + this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
110 111 //成功回调
111 112 this.tableData = res.data.data.content;
112 113 }).catch(err => {
... ... @@ -127,15 +128,12 @@
127 128 // })
128 129 },
129 130 search() {
130   - this.pageindex = {
131   - pageNumber: 1,
132   - pageSize: 10,
133   - }
  131 + this.pageindex.advertisingType = ''
134 132 this.getAll()
135 133 },
136 134 queryChange(key, val) {
137   - this.query[`${key}`] = val[0].value;
138   - this.search();
  135 + this.pageindex[`${key}`] = val[0].value;
  136 + this.getAll()
139 137 },
140 138 toDetail(item) {
141 139 let items = JSON.stringify(item)
... ... @@ -173,8 +171,9 @@
173 171 },
174 172 handleCompanyConfirm(val){
175 173 let page = {
176   - pageNumber: 1,
  174 + pageNumber: 0,
177 175 pageSize: 10,
  176 + publishStatus:2,
178 177 advertisingType:val[0].label
179 178 }
180 179 this.$http.sendRequest('/cereAdvertisingInformation/queryByPage', 'POST', page, 1).then(res => {
... ...
lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
  View file @7b38276
... ... @@ -356,7 +356,7 @@
356 356 })
357 357 return
358 358 }
359   - this.model1.scheduleTime = e.range.after+'至'+e.range.before
  359 + this.model1.scheduleTime =e.range.before+'至'+e.range.after
360 360 },
361 361 typeChange(e) {
362 362 this.model1.type = e[0].label;
... ...
lvdao-miniapp/pages/business/businessList/businessList.vue
  View file @7b38276
... ... @@ -43,7 +43,7 @@
43 43 title: '',
44 44 pageNumber: 1,
45 45 pageSize: 10,
46   -
  46 + status:'1',
47 47 },
48 48 listIn:0,
49 49 num:0,
... ...
lvdao-miniapp/pages/details/details.vue
  View file @7b38276
... ... @@ -46,12 +46,15 @@
46 46 <u-col span="12">
47 47 <view class="form-item">
48 48 <view class="label">规划图纸：</view>
49   - <view>
50   - <u-image v-if="tableData.architecturalDrawings" :showLoading="true" :src="$img + tableData.architecturalDrawings | getimgurl" width="calc(90vw - 140rpx)" height="300rpx"></u-image>
51   - <text v-else>暂无</text>
52   - </view>
  49 +
  50 + </view>
  51 + <view style="display: flex;flex-wrap: wrap;justify-content: space-around;">
  52 +
  53 + <u-image v-if="tableData.architecturalDrawings" :showLoading="true" :src="$img + item" v-for="(item,index) in tableData.architecturalDrawings" width="140px" height="140px" border-radius="20" style="margin-bottom:10rpx;"></u-image>
  54 + <text v-else>暂无</text>
53 55 </view>
54 56 </u-col>
  57 +
55 58 <u-col span="12">
56 59 <view class="form-item">
57 60 <view class="label" style="width: 142rpx;">位置描述：</view>
... ... @@ -132,8 +135,10 @@ export default {
132 135 },
133 136 filters: {
134 137 getimgurl(e) {
  138 +
135 139 let c1 = e.split(',')[0]
136 140 return c1;
  141 +
137 142 },
138 143 },
139 144 onLoad(option){
... ... @@ -160,6 +165,12 @@ export default {
160 165 })
161 166 this.swiperList[0].url = data.displayMainImage || data.locationDiagram
162 167 this.tableData = data
  168 + if(typeof data.architecturalDrawings == 'string' && data.architecturalDrawings){
  169 + this.tableData.architecturalDrawings =data.architecturalDrawings.split(',')
  170 + }
  171 + if(typeof data.planningDrawing == 'string' && data.planningDrawing){
  172 + this.tableData.architecturalDrawings =data.planningDrawing.split(',')
  173 + }
163 174 // let location
164 175 // if(data.mapPunctuation){
165 176 // location = JSON.parse(data.mapPunctuation)
... ...
lvdao-miniapp/pages/home/home.vue
  View file @7b38276
... ... @@ -279,8 +279,10 @@
279 279 </view>
280 280 <view style="width:100%;margin-top:10px;" class="other-business">
281 281 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
  282 +
282 283 <view v-for="(item, index) in yingxiaoData" :key="item.id" class="scroll-view-item_H" @click="toDetail(item.id, '/pages/marketing/marketingDetail/marketingDetail')">
283 284 <view class="business-card">
  285 +
284 286 <u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx" border-radius="20"></u-image>
285 287 <view class="business-card-title">
286 288 {{item.title}}
... ... @@ -393,12 +395,14 @@
393 395 let actPages = {
394 396 pageNumber: 0,
395 397 pageSize: 10,
396   - reviewStatus:'2'
  398 + reviewStatus:'2',
  399 + orderingRule:3
397 400 }
398 401 let shopAct = {
399 402 auditStatus:'3',
400 403 pageNumber: 0,
401 404 pageSize: 10,
  405 + orderingRule:3
402 406 }
403 407 let shanghu = {
404 408 status:'1',
... ...
lvdao-miniapp/pages/marketing/marketingList/marketingList.vue
  View file @7b38276
... ... @@ -25,7 +25,7 @@
25 25 <view class="info">
26 26 <view class="title">{{item.title}}</view>
27 27 <view class="name">活动时间：{{item.startTime}}至{{item.endTime}}</view>
28   - <view style="margin-top: 5px;">
  28 + <view style="margin-top: 5px;height:23px;">
29 29 <u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1"/>
30 30 <u-tag text="未开始" type="info" mode="dark" v-if="item.activeState==0"/>
31 31 <u-tag text="已结束" type="warning" mode="dark" v-if="item.activeState==2"/>
... ... @@ -52,6 +52,8 @@
52 52 activeState: null, // 活动状态
53 53 pageNumber:0,
54 54 pageSize: 10,
  55 + reviewStatus:'2'
  56 +
55 57 },
56 58 sortTypeOptions: [
57 59 { label: '正序', value: 1 },
... ...
lvdao-miniapp/pages/message/message.vue
  View file @7b38276
... ... @@ -228,7 +228,7 @@
228 228 })
229 229 } else {
230 230  
231   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
  231 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
232 232 if(res.data.code == '20004' || res.data.code == '20003'){
233 233 uni.navigateTo({
234 234 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/my/my.vue
  View file @7b38276
... ... @@ -284,7 +284,7 @@
284 284 })
285 285 } else {
286 286  
287   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
  287 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
288 288 if(res.data.code == '20004' || res.data.code == '20003'){
289 289 uni.navigateTo({
290 290 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/participation/participation.vue
  View file @7b38276
... ... @@ -32,7 +32,7 @@
32 32 <view class="title">{{item.activityName}}</view>
33 33 <view class="huo-card-item">活动日期：<span>{{item.startTime}}至{{item.endTime}}</span></view>
34 34 <view class="huo-card-item">参与人数：<span>{{item.maxParticipants}}</span></view>
35   - <view style="margin-top: 5px;">
  35 + <view style="margin-top: 5px;height:23px">
36 36 <u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1"/>
37 37 <u-tag text="未开始" type="info" mode="dark" v-if="item.activeState==0"/>
38 38 <u-tag text="已结束" type="warning" mode="dark" v-if="item.activeState==2"/>
... ...
lvdao-miniapp/pages/rsaManagement/rsaManagement.vue
  View file @7b38276
... ... @@ -25,7 +25,7 @@
25 25 <text style="font-weight: bold;">*意向租金(月)</text>
26 26 </view>
27 27 <view class="content">
28   - <input type="text" placeholder="请输入" v-model="ruleForm.rentalRent">
  28 + <input type="digit" placeholder="请输入" v-model="ruleForm.rentalRent">
29 29 </view>
30 30 </view>
31 31 <view class="list">
... ... @@ -85,7 +85,7 @@
85 85 ruleForm: {
86 86 leaseType: '',
87 87 leaseCycle: '',
88   - rentalRent: '',
  88 + rentalRent:null,
89 89 operationType: '',
90 90 remark: '',
91 91 intentionRegion: '',
... ... @@ -145,6 +145,7 @@
145 145 });
146 146 return false;
147 147 }
  148 +
148 149 if (!this.ruleForm.operationType) {
149 150 uni.showToast({
150 151 icon: 'none',
... ...
lvdao-miniapp/pages/saleReport/saleReport.vue
  View file @7b38276
... ... @@ -35,7 +35,7 @@
35 35 单价
36 36 </view>
37 37 <view class="inputContent">
38   - <input type="text" v-model="item.price" placeholder="请输入" />
  38 + <input type="digit" v-model="item.price" placeholder="请输入" />
39 39 </view>
40 40 </view>
41 41 <view class="up_line"></view>
... ... @@ -54,7 +54,7 @@
54 54 销售数量
55 55 </view>
56 56 <view class="inputContent">
57   - <input type="text" v-model="item.salesQuantity" placeholder="请输入" />
  57 + <input type="number" v-model="item.salesQuantity" placeholder="请输入" />
58 58 </view>
59 59 </view>
60 60 <view class="up_line"></view>
... ...
lvdao-miniapp/pages/shops/shops.scss
  View file @7b38276
... ... @@ -36,7 +36,7 @@
36 36 padding: 0 20rpx;
37 37 .zidong{
38 38 width: 160rpx;
39   - background-color: #3F9B6A;
  39 + background-color: #19be6b;
40 40 color: #fff;
41 41 padding: 10rpx;
42 42 border-radius: 30rpx;
... ...
lvdao-miniapp/pages/shops/shops.vue
  View file @7b38276
... ... @@ -78,13 +78,13 @@
78 78 <u-icon name="arrow-down"></u-icon>
79 79 </view>
80 80 </view>
81   - <!-- <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
  81 + <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
82 82 <text class="sc" style="color: #979797;font-size: 30rpx;">意向租金(月)</text>
83 83 <view @click="showS(4)">
84 84 <text class="mc" style="margin-right: 10rpx;"> {{formList.zujin ==''?'请选择':formList.zujin}}</text>
85 85 <u-icon name="arrow-down"></u-icon>
86 86 </view>
87   - </view> -->
  87 + </view>
88 88 <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
89 89 <text class="sc" style="color: #979797;font-size: 30rpx;">意向面积</text>
90 90 <view @click="showS(5)">
... ... @@ -124,12 +124,16 @@
124 124 belongingRegion: '',
125 125 pageNumber: 0,
126 126 pageSize: 10 ,
127   - publishStatus:2
  127 + publishStatus:2,
  128 + minPrice:0,
  129 + maxPrice:1000000
128 130 },
129 131 pageindex: {
130 132 pageNumber: 0,
131 133 pageSize: 10,
132   - publishStatus:2
  134 + publishStatus:2,
  135 + minPrice:0,
  136 + maxPrice:1000000
133 137 },
134 138 tableData: [],
135 139 areList: [
... ... @@ -297,12 +301,16 @@
297 301 this.companys = [
298 302 {
299 303 value: '1',
300   - label: '0-5000'
  304 + label: '0-2000'
301 305 },
302 306 {
303 307 value: '2',
304   - label: '5000-10000'
305   - }
  308 + label: '2000-5000'
  309 + },
  310 + {
  311 + value: '3',
  312 + label: '5000-10000'
  313 + }
306 314 ]
307 315 }else{
308 316 this.companys = [
... ... @@ -313,6 +321,10 @@
313 321 {
314 322 value: '2',
315 323 label: '100-200'
  324 + },
  325 + {
  326 + value: '3',
  327 + label: '200-300'
316 328 }
317 329 ]
318 330 }
... ... @@ -326,9 +338,30 @@
326 338 }else if(this.index == 3){
327 339 this.formList.zuqi = e[0].label
328 340 }else if(this.index == 4){
329   - this.formList.zujin = e[0].label
  341 + this.formList.zujin = e[0].label
  342 + if(e[0].value == 1){
  343 + this.formList.minPrice = 0
  344 + this.formList.maxPrice = 2000
  345 + }else if(e[0].value == 2){
  346 + this.formList.minPrice = 2000
  347 + this.formList.maxPrice = 5000
  348 + }else{
  349 + this.formList.minPrice = 5000
  350 + this.formList.maxPrice = 10000
  351 + }
330 352 }else{
331   - this.formList.mianji = e[0].label
  353 + this.formList.mianji = e[0].label
  354 + if(e[0].value == 1){
  355 + this.formList.minActualUsableArea = 0
  356 + this.formList.maxActualUsableArea = 100
  357 + }else if(e[0].value == 2){
  358 + this.formList.minActualUsableArea = 100
  359 + this.formList.maxActualUsableArea = 200
  360 + }else{
  361 + this.formList.minActualUsableArea = 200
  362 + this.formList.maxActualUsableArea = 300
  363 + }
  364 +
332 365 }
333 366  
334 367 },
... ... @@ -377,7 +410,6 @@
377 410 this.formList = {
378 411 zulei: '',
379 412 belongingRegion: '',
380   - zuqi:'',
381 413 zujin: '',
382 414 mianji:'',
383 415 name:'',
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @7b38276
... ... @@ -178,7 +178,7 @@
178 178 })
179 179 } else {
180 180  
181   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
  181 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
182 182 if(res.data.code == '20004' || res.data.code == '20003'){
183 183 uni.navigateTo({
184 184 url: '/pages/login/login'
... ...
lvdao-miniapp/pagesA/rentPay/goPay.vue
  View file @7b38276
... ... @@ -41,7 +41,9 @@
41 41 },
42 42 methods: {
43 43 submit(){
44   -
  44 + uni.navigateTo({
  45 + url: '/pagesA/rentPay/webView'
  46 + })
45 47 }
46 48 }
47 49 }
... ...
lvdao-miniapp/pagesA/rentPay/webView.vue 0 → 100644
  View file @7b38276
  1 +<template>
  2 + <view>
  3 + <web-view src="https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F"></web-view>
  4 + </view>
  5 +</template>
  6 +
  7 +<script>
  8 + export default {
  9 + props: {
  10 + // 定义接收的 prop，类型为 String
  11 + url: {
  12 + type: String,
  13 + required: true
  14 + }
  15 + },
  16 + computed: {
  17 + // 使用计算属性确保 url 被正确绑定到 web-view 的 src 属性
  18 + webUrl() {
  19 + return this.url;
  20 + }
  21 + },
  22 + mounted() {
  23 + // 可选：在组件挂载后进行一些验证或处理
  24 + console.log('加载的网址:', this.webUrl);
  25 + }
  26 + }
  27 +</script>
  28 +
  29 +<style>
  30 +</style>
0 31 \ No newline at end of file
... ...