webapp / GreenwayWeb

Commit 2a1090461d75b76c8f46c508e6cc4007b3b68cee

Authored by 杨鑫
1 parent 0fd8b750

'最新小程序'

Inline Side-by-side
Showing 11 changed files with 424 additions and 260 deletions
admin-web-master/src/utils/request.js
  View file @2a10904
@@ -16,7 +16,8 @@ let hostall = window.location.href; @@ -16,7 +16,8 @@ let hostall = window.location.href;
16 let baseURL = '' 16 let baseURL = ''
17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 18 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
19 - baseURL = 'http://192.168.2.225:9003'; 19 + // baseURL = 'http://192.168.2.225:9003';
  20 + baseURL = 'http://172.16.61.125:9003';
20 // baseURL = 'http://192.168.2.36:9003'; 21 // baseURL = 'http://192.168.2.36:9003';
21 } else { 22 } else {
22 console.error('---------------------') 23 console.error('---------------------')
admin-web-master/src/utils/request2.js
  View file @2a10904
@@ -17,8 +17,8 @@ let baseURL = '' @@ -17,8 +17,8 @@ let baseURL = ''
17 // || host === 'localhost:9528' 17 // || host === 'localhost:9528'
18 if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 18 if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
19 // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server'; 19 // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
20 - // baseURL = 'http://172.16.61.125:9004';  
21 - baseURL = 'http://192.168.2.225:9004'; 20 + baseURL = 'http://172.16.61.125:9004';
  21 + // baseURL = 'http://192.168.2.225:9004';
22 } else { 22 } else {
23 console.error('---------------------') 23 console.error('---------------------')
24 console.error(hostall) 24 console.error(hostall)
lvdao-miniapp/main.js
  View file @2a10904
@@ -14,8 +14,9 @@ Vue.prototype.$imgUrl = (url) => { @@ -14,8 +14,9 @@ Vue.prototype.$imgUrl = (url) => {
14 } 14 }
15 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload" 15 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
16 // Vue.prototype.$img = "https://zhld.028wlkj.com:49008/cdwlMall" 16 // Vue.prototype.$img = "https://zhld.028wlkj.com:49008/cdwlMall"
17 -// Vue.prototype.$upload = 'http://172.16.61.125/miniio/upload'  
18 -Vue.prototype.$upload = 'http://192.168.2.225:9003/miniio/upload' 17 +Vue.prototype.$upload = 'http://172.16.61.125:9003/miniio/upload'
  18 +// Vue.prototype.$upload = 'http://172.16.61.125:9003/miniio/uploadQuestion'
  19 +// Vue.prototype.$upload = 'http://192.168.2.225:9003/miniio/upload'
19 Vue.prototype.$img = 'http://172.16.61.125/cdwlMall' 20 Vue.prototype.$img = 'http://172.16.61.125/cdwlMall'
20 // Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload" 21 // Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload"
21 22
lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
  View file @2a10904
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <view> 6 <view>
7 <view v-show="active == 0"> 7 <view v-show="active == 0">
8 <view style="padding:15px;margin-top:10px;"> 8 <view style="padding:15px;margin-top:10px;">
9 - <wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected" color="#3f9b6a" style="border-radius: 10px;"></wu-calendar> 9 + <wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected" color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate" :endDate="endDate"></wu-calendar>
10 </view> 10 </view>
11 11
12 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> 12 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
@@ -291,24 +291,11 @@ @@ -291,24 +291,11 @@
291 ziyuanId: '', 291 ziyuanId: '',
292 ziyuanType:'', 292 ziyuanType:'',
293 selected: [ 293 selected: [
294 - {  
295 - date: '2025-01-08',  
296 - info: '￥850',  
297 - infoColor: '#3f9b6a',  
298 - disable: true // 禁用  
299 - },  
300 - {  
301 - date: '2025-01-11',  
302 - info: '￥950',  
303 - infoColor: '#3f9b6a',  
304 - },  
305 - {  
306 - date: '2025-01-14',  
307 - info: '￥900',  
308 - infoColor: '#6ac695',  
309 - },  
310 ], 294 ],
311 - establishow:false 295 + establishow:false,
  296 + today:['',''],
  297 + startDate:'',
  298 + endDate:''
312 299
313 } 300 }
314 }, 301 },
@@ -321,35 +308,21 @@ @@ -321,35 +308,21 @@
321 308
322 }, 309 },
323 onShow() { 310 onShow() {
324 - let shopId = {  
325 - shopId: uni.getStorageSync('shopId') || ''  
326 - }  
327 - const isLogin = uni.getStorageSync('token');  
328 - if (isLogin == '') {  
329 - // 如果未登录，跳转到登录页面  
330 - uni.navigateTo({  
331 - url: '/pages/login/login'  
332 - })  
333 - } else {  
334 - let page = {  
335 - condition: 2 311 + this.calculateDates()
  312 + let pageHe={
  313 + pageNumber: 0,
  314 + pageSize: 10,
  315 + shopNumber:`gg${this.ziyuanId}`,
  316 + dataStatus:1
  317 + }
  318 + this.$http.sendRequest('/cereContractInformation/getPage', 'POST', pageHe,1).then(res => {
  319 + if(res.data.data.content.length !=0){
  320 + res.data.data.content.map(item=>{
  321 + this.generateDateRange([item.contractTerminationDate,item.leaseStartDate])
  322 + })
  323 +
336 } 324 }
337 - this.$http.sendRequest('/shop/getById', 'POST', shopId).then(res => {  
338 - if (res.data.code != "20004") {  
339 - this.shopMsg = res.data.data  
340 - this.Islogin = false  
341 - this.$http.sendRequest('/index/index', 'POST', page).then(res => {  
342 - //成功回调  
343 - this.tongji = res.data.data  
344 - })  
345 - } else {  
346 - uni.navigateTo({  
347 - url: '/pages/login/login'  
348 - })  
349 - }  
350 - })  
351 - }  
352 - 325 + })
353 }, 326 },
354 methods: { 327 methods: {
355 generateDateRange(datas) { 328 generateDateRange(datas) {
@@ -365,13 +338,14 @@ @@ -365,13 +338,14 @@
365 const month = String(currentDate.getMonth() + 1).padStart(1, '0'); 338 const month = String(currentDate.getMonth() + 1).padStart(1, '0');
366 const day = String(currentDate.getDate()).padStart(1, '0'); 339 const day = String(currentDate.getDate()).padStart(1, '0');
367 const dateString = `${year}-${month}-${day}`; 340 const dateString = `${year}-${month}-${day}`;
368 - result.push({ 341 + this.selected.push({
369 date: dateString, 342 date: dateString,
370 - info: '￥850', 343 + info: '已租',
371 disable: true 344 disable: true
372 }); 345 });
373 currentDate.setDate(currentDate.getDate() + 1); 346 currentDate.setDate(currentDate.getDate() + 1);
374 } 347 }
  348 + console.log( this.selected)
375 return result; 349 return result;
376 }, 350 },
377 calendarChange(e){ 351 calendarChange(e){
@@ -390,6 +364,22 @@ @@ -390,6 +364,22 @@
390 establiChange(val){ 364 establiChange(val){
391 this.model1.establishmentDate = this.timeChange(val) 365 this.model1.establishmentDate = this.timeChange(val)
392 }, 366 },
  367 + calculateDates() {
  368 + const today = new Date();
  369 + const year = today.getFullYear();
  370 + const month = today.getMonth();
  371 + this.startDate = this.formatDate(today);
  372 +
  373 + // 获取后一个月的最后一天
  374 + const nextMonthLastDay = new Date(year, month + 2, 0);
  375 + this.endDate = this.formatDate(nextMonthLastDay);
  376 + },
  377 + formatDate(date) {
  378 + const year = date.getFullYear();
  379 + const month = ('0' + (date.getMonth() + 1)).slice(-2); // 月份是从0开始的
  380 + const day = ('0' + date.getDate()).slice(-2);
  381 + return `${year}-${month}-${day}`;
  382 + },
393 formatter(day) { 383 formatter(day) {
394 const d = new Date() 384 const d = new Date()
395 let month = d.getMonth() + 1 385 let month = d.getMonth() + 1
lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
  View file @2a10904
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <view> 6 <view>
7 <view class="add-list" v-show="active == 0"> 7 <view class="add-list" v-show="active == 0">
8 <view style="padding:15px;margin-top:10px;" v-if="map ==0"> 8 <view style="padding:15px;margin-top:10px;" v-if="map ==0">
9 - <wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected" color="#3f9b6a" style="border-radius: 10px;"></wu-calendar> 9 + <wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected" color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate" :endDate="endDate"></wu-calendar>
10 </view> 10 </view>
11 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> 11 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
12 <u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0"> 12 <u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0">
@@ -290,26 +290,12 @@ @@ -290,26 +290,12 @@
290 zhengce: '', 290 zhengce: '',
291 shuoming: '', 291 shuoming: '',
292 zujin: '', 292 zujin: '',
293 - selected: [  
294 - {  
295 - date: '2025-01-08',  
296 - info: '￥850',  
297 - infoColor: '#3f9b6a',  
298 - disable: true // 禁用  
299 - },  
300 - {  
301 - date: '2025-01-11',  
302 - info: '￥950',  
303 - infoColor: '#3f9b6a',  
304 - },  
305 - {  
306 - date: '2025-01-14',  
307 - info: '￥900',  
308 - infoColor: '#6ac695',  
309 - },  
310 - ], 293 + selected: [],
311 map:0, 294 map:0,
312 - establishow:false 295 + establishow:false,
  296 + today:['',''],
  297 + startDate:'',
  298 + endDate:''
313 }; 299 };
314 }, 300 },
315 onLoad(option) { 301 onLoad(option) {
@@ -339,37 +325,25 @@ @@ -339,37 +325,25 @@
339 console.log(err) 325 console.log(err)
340 //请求失败 326 //请求失败
341 }) 327 })
  328 +
342 }, 329 },
343 onShow() { 330 onShow() {
344 - let shopId = {  
345 - shopId: uni.getStorageSync('shopId') || ''  
346 - }  
347 - const isLogin = uni.getStorageSync('token');  
348 - if (isLogin == '') {  
349 - // 如果未登录，跳转到登录页面  
350 - uni.navigateTo({  
351 - url: '/pages/login/login'  
352 - })  
353 - } else {  
354 - let page = {  
355 - condition: 2  
356 - }  
357 - this.$http.sendRequest('/shop/getById', 'POST', shopId).then(res => {  
358 - if (res.data.code != "20004") {  
359 - this.shopMsg = res.data.data  
360 - this.Islogin = false  
361 - this.$http.sendRequest('/index/index', 'POST', page).then(res => {  
362 - //成功回调  
363 - this.tongji = res.data.data  
364 - })  
365 - } else {  
366 - uni.navigateTo({  
367 - url: '/pages/login/login'  
368 - })  
369 - }  
370 - }) 331 + this.calculateDates()
  332 + let pageHe={
  333 + pageNumber: 0,
  334 + pageSize: 10,
  335 + shopNumber:this.ziyuanId,
  336 + dataStatus:1
371 } 337 }
372 - 338 + this.$http.sendRequest('/cereContractInformation/getPage', 'POST', pageHe,1).then(res => {
  339 + if(res.data.data.content.length !=0){
  340 + res.data.data.content.map(item=>{
  341 + this.generateDateRange([item.contractTerminationDate,item.leaseStartDate])
  342 + })
  343 +
  344 + }
  345 + })
  346 +
373 }, 347 },
374 methods: { 348 methods: {
375 generateDateRange(datas) { 349 generateDateRange(datas) {
@@ -385,9 +359,9 @@ @@ -385,9 +359,9 @@
385 const month = String(currentDate.getMonth() + 1).padStart(1, '0'); 359 const month = String(currentDate.getMonth() + 1).padStart(1, '0');
386 const day = String(currentDate.getDate()).padStart(1, '0'); 360 const day = String(currentDate.getDate()).padStart(1, '0');
387 const dateString = `${year}-${month}-${day}`; 361 const dateString = `${year}-${month}-${day}`;
388 - result.push({ 362 + this.selected.push({
389 date: dateString, 363 date: dateString,
390 - info: '￥850', 364 + info: '已租',
391 disable: true 365 disable: true
392 }); 366 });
393 currentDate.setDate(currentDate.getDate() + 1); 367 currentDate.setDate(currentDate.getDate() + 1);
@@ -407,6 +381,22 @@ @@ -407,6 +381,22 @@
407 typeChange(e) { 381 typeChange(e) {
408 this.model1.entityType = e[0].label; 382 this.model1.entityType = e[0].label;
409 }, 383 },
  384 + calculateDates() {
  385 + const today = new Date();
  386 + const year = today.getFullYear();
  387 + const month = today.getMonth();
  388 + this.startDate = this.formatDate(today);
  389 +
  390 + // 获取后一个月的最后一天
  391 + const nextMonthLastDay = new Date(year, month + 2, 0);
  392 + this.endDate = this.formatDate(nextMonthLastDay);
  393 + },
  394 + formatDate(date) {
  395 + const year = date.getFullYear();
  396 + const month = ('0' + (date.getMonth() + 1)).slice(-2); // 月份是从0开始的
  397 + const day = ('0' + date.getDate()).slice(-2);
  398 + return `${year}-${month}-${day}`;
  399 + },
410 getCurrentTime() { 400 getCurrentTime() {
411 const now = new Date(); 401 const now = new Date();
412 const year = now.getFullYear(); 402 const year = now.getFullYear();
lvdao-miniapp/pages/record/record.vue
  View file @2a10904
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 return { 28 return {
29 recordList:'', 29 recordList:'',
30 pageindex: { 30 pageindex: {
31 - pageNumber: 1, 31 + pageNumber: 0,
32 pageSize: 10 32 pageSize: 10
33 }, 33 },
34 }; 34 };
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
  View file @2a10904
@@ -11,7 +11,8 @@ @@ -11,7 +11,8 @@
11 </view> 11 </view>
12 <view class="voucher-img"> 12 <view class="voucher-img">
13 <view class="voucher-list"> 13 <view class="voucher-list">
14 - <u-upload :action="$upload" :auto-upload="false" ref="coverImage" :max-count="5" 14 + <u-upload :action="$upload" :auto-upload="false" ref="coverImage" :max-count="5" :file-list="fist"
  15 + @on-remove="(response, file, fileList) => removeList(response, file, fileList)"
15 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload> 16 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
16 </view> 17 </view>
17 </view> 18 </view>
@@ -27,7 +28,7 @@ @@ -27,7 +28,7 @@
27 <!-- <text class="star">*</text> --> 28 <!-- <text class="star">*</text> -->
28 </view> 29 </view>
29 <view class="content"> 30 <view class="content">
30 - <input type="text" placeholder="请输入" v-model="ruleForm.deviceName"> 31 + <input type="text" placeholder="请输入" v-model="ruleForm.shopName">
31 </view> 32 </view>
32 </view> 33 </view>
33 <view class="item"> 34 <view class="item">
@@ -42,7 +43,26 @@ @@ -42,7 +43,26 @@
42 <view class="voucher-img"> 43 <view class="voucher-img">
43 <view class="voucher-list" style="width: 100%;"> 44 <view class="voucher-list" style="width: 100%;">
44 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;"> 45 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
45 - <textarea name="" id="" cols="30" rows="10" placeholder="请输入" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx 0;padding:10px;" v-model="ruleForm.memo"></textarea> 46 + <textarea name="" id="" cols="30" rows="10" placeholder="请输入" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;" v-model="ruleForm.shopDescription"></textarea>
  47 + </view>
  48 + </view>
  49 + </view>
  50 + </view>
  51 + </view>
  52 + </view>
  53 + <view class="item">
  54 + <view class="contents" style="background-color:#fff;">
  55 + <view class="feedback-data">
  56 + <view>
  57 + <view class="title">
  58 + <text style="font-weight: bold;">*营业时间</text>
  59 + <!-- <text class="star">*</text> -->
  60 + </view>
  61 + </view>
  62 + <view class="voucher-img">
  63 + <view class="voucher-list" style="width: 100%;">
  64 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
  65 + <textarea name="" id="" cols="30" rows="5" placeholder="请输入" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;" v-model="ruleForm.businessHours"></textarea>
46 </view> 66 </view>
47 </view> 67 </view>
48 </view> 68 </view>
@@ -55,7 +75,7 @@ @@ -55,7 +75,7 @@
55 <!-- <text class="star">*</text> --> 75 <!-- <text class="star">*</text> -->
56 </view> 76 </view>
57 <view class="content"> 77 <view class="content">
58 - <input type="text" placeholder="请输入" v-model="ruleForm.deviceName"> 78 + <input type="text" placeholder="请输入" v-model="ruleForm.contactNumber">
59 </view> 79 </view>
60 </view> 80 </view>
61 81
@@ -78,15 +98,14 @@ @@ -78,15 +98,14 @@
78 <view class="voucher-img"> 98 <view class="voucher-img">
79 <view class="voucher-list" style="width: 100%;"> 99 <view class="voucher-list" style="width: 100%;">
80 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;"> 100 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
81 - <textarea name="" id="" cols="30" rows="10" placeholder="请输入" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding: 20rpx 0;padding:10px;" v-model="ruleForm.memo"></textarea> 101 + <textarea name="" id="" cols="30" rows="10" placeholder="请输入" style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;" v-model="ruleForm.locationDescription"></textarea>
82 </view> 102 </view>
83 </view> 103 </view>
84 </view> 104 </view>
85 </view> 105 </view>
86 </view> 106 </view>
87 </view> 107 </view>
88 - <u-select v-model="popup1" mode="mutil-column-auto" :list="list" @confirm="pops" label-name="label" value-name="value"></u-select>  
89 - <u-select v-model="popup2" mode="mutil-column-auto" :list="list1" @confirm="pops1" label-name="label" value-name="value"></u-select> 108 +
90 <!-- 保存按钮 --> 109 <!-- 保存按钮 -->
91 <view class="page-footer"> 110 <view class="page-footer">
92 <u-button type="success" style="width: 100%;border-radius: 10px;" @click="submit">提交</u-button> 111 <u-button type="success" style="width: 100%;border-radius: 10px;" @click="submit">提交</u-button>
@@ -98,41 +117,43 @@ @@ -98,41 +117,43 @@
98 export default { 117 export default {
99 data() { 118 data() {
100 return { 119 return {
101 - fileList:[], 120 + fist:[],
102 ruleForm:{ 121 ruleForm:{
103 - onSitePhoto:'',  
104 - deviceName:'',  
105 - deviceType:'',  
106 - warrantyIssue:'',  
107 - memo:'',  
108 - applicationTime:'',  
109 - enterpriseAuthorization:[],  
110 - status:'1' 122 + shopName:'',
  123 + shopDescription:'',
  124 + businessHours:'',
  125 + contactNumber:'',
  126 + locationDescription:'',
  127 + shopPhotos:[],
  128 + contractId:''
111 }, 129 },
112 - lableXian:'',  
113 - shelei:'',  
114 - list: [{  
115 - value: '水管问题',  
116 - label: '水管问题'  
117 - },  
118 - {  
119 - value: '物业问题',  
120 - label: '物业问题'  
121 - }  
122 - ],  
123 - list1: [{  
124 - value: '类型1',  
125 - label: '类型1'  
126 - },  
127 - {  
128 - value: '类型2',  
129 - label: '类型2'  
130 - }  
131 - ],  
132 - popup1:false,  
133 - popup2:false 130 + edit:false,
  131 +
134 } 132 }
135 }, 133 },
  134 + onLoad(options) {
  135 +
  136 + if(options.msg!='' && options.msg){
  137 + this.ruleForm = JSON.parse(options.msg)
  138 + // this.ruleForm.shopPhotos = shopPhotos
  139 + this.ruleForm.shopPhotos.map((item,index)=>{
  140 + let obj = {
  141 + url:item
  142 + }
  143 +
  144 + this.fist.push(obj)
  145 + })
  146 +
  147 + // this.fileList = this.ruleForm.shopPhotos
  148 + this.edit =true
  149 + }
  150 + console.log(this.ruleForm,this.fist)
  151 + if(options.ids){
  152 + this.ruleForm.contractId = options.ids
  153 + }
  154 +
  155 +
  156 + },
136 methods:{ 157 methods:{
137 chooseLocation(val, item) { 158 chooseLocation(val, item) {
138 this.popup1 = true 159 this.popup1 = true
@@ -148,35 +169,49 @@ @@ -148,35 +169,49 @@
148 this.ruleForm.deviceType = val[0].label 169 this.ruleForm.deviceType = val[0].label
149 }, 170 },
150 check(){ 171 check(){
151 - if (this.ruleForm.onSitePhoto.length== 0) { 172 + if (this.ruleForm.shopPhotos.length== 0) {
152 uni.showToast({ 173 uni.showToast({
153 icon: 'none', 174 icon: 'none',
154 title: '请上传现场图片' 175 title: '请上传现场图片'
155 }); 176 });
156 return false; 177 return false;
157 } 178 }
158 - if (!this.ruleForm.complaintType) { 179 + if (!this.ruleForm.shopName) {
159 uni.showToast({ 180 uni.showToast({
160 icon: 'none', 181 icon: 'none',
161 - title: '请选择投诉类型' 182 + title: '请输入店铺名称'
162 }); 183 });
163 return false; 184 return false;
164 } 185 }
165 - if (!this.ruleForm.problemDescription) { 186 + if (!this.ruleForm.shopDescription) {
166 uni.showToast({ 187 uni.showToast({
167 icon: 'none', 188 icon: 'none',
168 - title: '请输入问题描述' 189 + title: '请输入店铺介绍'
169 }); 190 });
170 return false; 191 return false;
171 } 192 }
172 - if (!this.ruleForm.remark) { 193 + if (!this.ruleForm.businessHours) {
173 uni.showToast({ 194 uni.showToast({
174 icon: 'none', 195 icon: 'none',
175 - title: '请输入备注信息' 196 + title: '请输入营业时间'
176 }); 197 });
177 return false; 198 return false;
178 } 199 }
179 - 200 + if (!this.ruleForm.contactNumber) {
  201 + uni.showToast({
  202 + icon: 'none',
  203 + title: '请输入联系电话'
  204 + });
  205 + return false;
  206 + }
  207 + if (!this.ruleForm. locationDescription) {
  208 + uni.showToast({
  209 + icon: 'none',
  210 + title: '请输入位置描述'
  211 + });
  212 + return false;
  213 + }
  214 +
180 return true; 215 return true;
181 }, 216 },
182 submit() { 217 submit() {
@@ -184,23 +219,45 @@ @@ -184,23 +219,45 @@
184 if(show == false){ 219 if(show == false){
185 return 220 return
186 } 221 }
187 - this.ruleForm.enterpriseAuthorization.map(item=>{  
188 - item.replace(this.$img,'') 222 + this.ruleForm.shopPhotos.map(item=>{
  223 + item = item.replace(this.$img,'')
189 }) 224 })
  225 + console.log(this.ruleForm)
  226 + // return
190 this.ruleForm.applicationTime = this.currentTime() 227 this.ruleForm.applicationTime = this.currentTime()
191 let info = { 228 let info = {
192 ...this.ruleForm, 229 ...this.ruleForm,
193 - enterpriseAuthorization:this.ruleForm.enterpriseAuthorization.join(','), 230 + shopPhotos:this.ruleForm.shopPhotos.join(','),
  231 + }
  232 +
  233 + if(this.edit){
  234 + this.$http.sendRequest('/cereAssetShopInformation/edit', 'POST',info,1).then(res => {
  235 + uni.showToast({
  236 + title: '修改成功',
  237 + icon: 'none',
  238 + });
  239 + uni.switchTab({
  240 + url: '/pages/my/my'
  241 + });
  242 + }).catch(err => {
  243 + console.log(err)
  244 + //请求失败
  245 + })
  246 + }else{
  247 + this.$http.sendRequest('/cereAssetShopInformation/add', 'POST',info,1).then(res => {
  248 + uni.showToast({
  249 + title: '提交成功',
  250 + icon: 'none',
  251 + });
  252 + uni.switchTab({
  253 + url: '/pages/my/my'
  254 + });
  255 + }).catch(err => {
  256 + console.log(err)
  257 + //请求失败
  258 + })
194 } 259 }
195 260
196 - this.$http.sendRequest('/cereReportIssuesRepairs/add', 'POST',info,1).then(res => {  
197 - uni.navigateTo({  
198 - url: '/pages/serve/serve'  
199 - })  
200 - }).catch(err => {  
201 - console.log(err)  
202 - //请求失败  
203 - })  
204 261
205 }, 262 },
206 // 获取时间 263 // 获取时间
@@ -234,7 +291,12 @@ @@ -234,7 +291,12 @@
234 filePath: 'xcx', // 其他表单数据 291 filePath: 'xcx', // 其他表单数据
235 }, 292 },
236 success: (uploadFileRes) => { 293 success: (uploadFileRes) => {
237 - this.ruleForm.enterpriseAuthorization.push(this.$img + JSON.parse(uploadFileRes.data).data) 294 + console.log(this.fist)
  295 + this.ruleForm.shopPhotos.push(this.$img + JSON.parse(uploadFileRes.data).data)
  296 + // let obj ={
  297 + // url:this.$img + JSON.parse(uploadFileRes.data).data
  298 + // }
  299 + // this.fist.push(obj)
238 uni.showToast({ 300 uni.showToast({
239 title: '上传成功', 301 title: '上传成功',
240 icon: 'success', 302 icon: 'success',
@@ -249,6 +311,10 @@ @@ -249,6 +311,10 @@
249 }, 311 },
250 }); 312 });
251 }, 313 },
  314 + removeList(e, file, fileList){
  315 + this.ruleForm.shopPhotos.splice(e,1)
  316 + this.fist.splice(e,1)
  317 + }
252 } 318 }
253 } 319 }
254 </script> 320 </script>
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @2a10904
@@ -16,67 +16,74 @@ @@ -16,67 +16,74 @@
16 </view> 16 </view>
17 <view class="form-item"> 17 <view class="form-item">
18 <view class="label">租赁期限</view> 18 <view class="label">租赁期限</view>
19 - <text>{{record.contractTerminationDate}}</text> 19 + <text>{{heData.contractTerminationDate || '无'}}</text>
20 </view> 20 </view>
21 <view class="form-item"> 21 <view class="form-item">
22 <view class="label">租金</view> 22 <view class="label">租金</view>
23 - <text>{{record.contractAmount}}</text> 23 + <text>{{heData.contractAmount || '无'}}</text>
24 </view> 24 </view>
25 <view class="form-item"> 25 <view class="form-item">
26 <view class="label">付款日</view> 26 <view class="label">付款日</view>
27 - <text>{{record.paymentCycle}}</text> 27 + <text>{{heData.paymentDay || '无'}}</text>
28 </view> 28 </view>
29 </view> 29 </view>
30 - <view class="msglist" v-if="mapType == '商铺'">  
31 - <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">  
32 - 30 + <view class="msglist">
  31 + <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em" v-if="mapType == '商铺'">
33 <view class="form-item"> 32 <view class="form-item">
34 <view class="label">商铺名称</view> 33 <view class="label">商铺名称</view>
35 - <text>{{record.warrantyIssue || record.complaintType}}</text> 34 + <text>{{record.cereBasicInformationShop.shopName}}</text>
36 </view> 35 </view>
37 <view class="form-item"> 36 <view class="form-item">
38 <view class="label">商铺类型</view> 37 <view class="label">商铺类型</view>
39 - <text>{{record.applicationTime}}</text> 38 + <text>{{record.cereBasicInformationShop.shopType=='1'?'移动铺位':record.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}</text>
40 </view> 39 </view>
  40 +
41 <view class="form-item"> 41 <view class="form-item">
42 - <view class="label">租赁期限</view>  
43 - <text>{{record.deviceType || record.problemDescription}}</text> 42 + <view class="label">实际使用面积</view>
  43 + <text>{{record.cereBasicInformationShop.actualUsableArea || '无'}}</text>
44 </view> 44 </view>
45 <view class="form-item"> 45 <view class="form-item">
46 - <view class="label">租金</view>  
47 - <text>{{record.memo || record.remark}}</text> 46 + <view class="label">产权面积</view>
  47 + <text>{{record.cereBasicInformationShop.propertyArea || '无' }}</text>
48 </view> 48 </view>
49 <view class="form-item"> 49 <view class="form-item">
50 - <view class="label">付款日</view>  
51 - <text>{{record.memo || record.remark}}</text> 50 + <view class="label">所属区域</view>
  51 + <text>{{record.cereBasicInformationShop.belongingRegion}}</text>
  52 + </view>
  53 + <view class="form-item">
  54 + <view class="label">归属部门</view>
  55 + <text>{{record.cereBasicInformationShop.belongingDepartment || '无'}}</text>
  56 + </view>
  57 + <view class="form-item">
  58 + <view class="label">详细地址</view>
  59 + <text>{{record.cereBasicInformationShop.detailedLocation}}</text>
52 </view> 60 </view>
53 -  
54 </u-read-more> 61 </u-read-more>
55 - </view> 62 + </view>
  63 +
56 <view class="msglist" v-if="mapType == '广告位'"> 64 <view class="msglist" v-if="mapType == '广告位'">
57 <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em"> 65 <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
58 66
59 <view class="form-item"> 67 <view class="form-item">
60 <view class="label">广告位名称</view> 68 <view class="label">广告位名称</view>
61 - <text>{{record.warrantyIssue || record.complaintType}}</text> 69 + <text>{{record.cereAdvertisingInformation.advertisingName}}</text>
62 </view> 70 </view>
63 <view class="form-item"> 71 <view class="form-item">
  72 + <view class="label">广告位类型</view>
  73 + <text>{{record.cereAdvertisingInformation.advertisingType}}</text>
  74 + </view>
  75 + <view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '线上广告位'">
64 <view class="label">所属端</view> 76 <view class="label">所属端</view>
65 - <text>{{record.applicationTime}}</text> 77 + <text>{{record.cereAdvertisingInformation.applicationTime}}</text>
66 </view> 78 </view>
67 - <view class="form-item">  
68 - <view class="label">租赁期限</view>  
69 - <text>{{record.deviceType || record.problemDescription}}</text> 79 + <view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '实体广告位'">
  80 + <view class="label">广告材质</view>
  81 + <text>{{record.cereAdvertisingInformation.advertisingMaterial}}</text>
70 </view> 82 </view>
71 <view class="form-item"> 83 <view class="form-item">
72 - <view class="label">租金</view>  
73 - <text>{{record.memo || record.remark}}</text> 84 + <view class="label">广告尺寸</view>
  85 + <text>{{record.cereAdvertisingInformation.dimensions}}</text>
74 </view> 86 </view>
75 - <view class="form-item">  
76 - <view class="label">付款日</view>  
77 - <text>{{record.memo || record.remark}}</text>  
78 - </view>  
79 -  
80 </u-read-more> 87 </u-read-more>
81 </view> 88 </view>
82 <view class="msglist" v-if="mapType == '场地'"> 89 <view class="msglist" v-if="mapType == '场地'">
@@ -84,71 +91,85 @@ @@ -84,71 +91,85 @@
84 91
85 <view class="form-item"> 92 <view class="form-item">
86 <view class="label">场地名称</view> 93 <view class="label">场地名称</view>
87 - <text>{{record.warrantyIssue || record.complaintType}}</text> 94 + <text>{{record.cereBasicInformationVenue.venueName}}</text>
88 </view> 95 </view>
89 <view class="form-item"> 96 <view class="form-item">
90 <view class="label">场地类型</view> 97 <view class="label">场地类型</view>
91 - <text>{{record.applicationTime}}</text> 98 + <text>{{record.cereBasicInformationVenue.venueType}}</text>
92 </view> 99 </view>
93 <view class="form-item"> 100 <view class="form-item">
94 <view class="label">实际使用面积</view> 101 <view class="label">实际使用面积</view>
95 - <text>{{record.deviceType || record.problemDescription}}</text> 102 + <text>{{record.cereBasicInformationVenue.actualArea}}</text>
96 </view> 103 </view>
97 <view class="form-item"> 104 <view class="form-item">
98 - <view class="label">租金</view>  
99 - <text>{{record.memo || record.remark}}</text> 105 + <view class="label">所属区域</view>
  106 + <text>{{record.cereBasicInformationVenue.district}}</text>
100 </view> 107 </view>
101 <view class="form-item"> 108 <view class="form-item">
102 - <view class="label">付款日</view>  
103 - <text>{{record.memo || record.remark}}</text> 109 + <view class="label">详细位置</view>
  110 + <text>{{record.cereBasicInformationVenue.detailedLocation}}</text>
104 </view> 111 </view>
105 -  
106 </u-read-more> 112 </u-read-more>
107 </view> 113 </view>
108 - <view v-if="btnShow&&mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle" :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>  
109 - <view class="msglist" v-if="btnShow == false&&mapType == '商铺'">  
110 - <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em" > 114 +
  115 + <view class="msglist" v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:65px;">
  116 +
111 117
112 <view class="form-item"> 118 <view class="form-item">
113 - <view class="label">商铺名称</view>  
114 - <text>{{record.warrantyIssue || record.complaintType}}</text> 119 + <view class="label">店铺名称</view>
  120 + <text>{{myshopMsg.shopName}}</text>
115 </view> 121 </view>
116 <view class="form-item"> 122 <view class="form-item">
117 - <view class="label">商铺类型</view>  
118 - <text>{{record.applicationTime}}</text> 123 + <view class="label">店铺介绍</view>
  124 + </view>
  125 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
  126 + <view style="padding:10px;">{{myshopMsg.shopDescription}}</view>
119 </view> 127 </view>
120 <view class="form-item"> 128 <view class="form-item">
121 - <view class="label">租赁期限</view>  
122 - <text>{{record.deviceType || record.problemDescription}}</text> 129 + <view class="label">营业时间</view>
  130 + </view>
  131 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
  132 + <view style="padding:10px;">{{myshopMsg.businessHours}}</view>
123 </view> 133 </view>
124 <view class="form-item"> 134 <view class="form-item">
125 - <view class="label">租金</view>  
126 - <text>{{record.memo || record.remark}}</text> 135 + <view class="label">联系电话</view>
  136 + <text>{{myshopMsg.contactNumber}}</text>
127 </view> 137 </view>
128 <view class="form-item"> 138 <view class="form-item">
129 - <view class="label">付款日</view>  
130 - <text>{{record.memo || record.remark}}</text> 139 + <view class="label">位置描述</view>
131 </view> 140 </view>
132 -  
133 - </u-read-more> 141 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
  142 + <view style="padding:10px;">{{myshopMsg.locationDescription}}</view>
  143 + </view>
  144 + <view class="form-item">
  145 + <view class="label">店内照片</view>
  146 + </view>
  147 + <view class="image-container">
  148 + <u-image class="image-item" width="48%" mode="heightFix" height="300rpx" :src="item" v-for="(item,index) in myshopMsg.shopPhotos" :key="index"></u-image>
  149 +
  150 + </view>
134 </view> 151 </view>
135 - <view class="msglist" v-if="mapType == '广告位'">  
136 152
137 - 153 + <view class="msglist" v-if="mapType == '广告位'" style="margin-bottom:65px;">
138 <view class="form-item"> 154 <view class="form-item">
139 <view class="label">投放内容</view> 155 <view class="label">投放内容</view>
140 </view> 156 </view>
141 - <u-parse :html="content"></u-parse> 157 + <!-- <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;padding:10px;">
  158 + <u-parse :html="content"></u-parse>
  159 +
  160 + </view> -->
  161 + <u-image class="image-item" width="100%" mode="heightFix" height="300rpx" :src="$img+record.coverImage" ></u-image>
142 162
143 163
144 </view> 164 </view>
  165 + <view style="margin-bottom: 65px;" v-if="btnShow && mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle" :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>
145 <view class="page-footer"> 166 <view class="page-footer">
146 <u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')" 167 <u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')"
147 >申请退租</u-button> 168 >申请退租</u-button>
148 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true" >申请续租</u-button> 169 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true" >申请续租</u-button>
149 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xiuMsg(2)" v-if="btnShow == false&&mapType == '商铺'">修改资料</u-button> 170 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xiuMsg(2)" v-if="btnShow == false&&mapType == '商铺'">修改资料</u-button>
150 </view> 171 </view>
151 - <u-modal v-model="xuShow" :content="content" @confirm="xufirm" :show-cancel-button="true" ></u-modal> 172 + <u-modal v-model="xuShow" :content="contentxu" @confirm="xufirm" :show-cancel-button="true" ></u-modal>
152 </view> 173 </view>
153 174
154 </template> 175 </template>
@@ -158,43 +179,122 @@ @@ -158,43 +179,122 @@
158 data() { 179 data() {
159 return { 180 return {
160 record:{}, 181 record:{},
161 - btnShow:true, 182 + btnShow:false,
162 hoverStyle:{ 183 hoverStyle:{
163 184
164 color:'#3f9b6a' 185 color:'#3f9b6a'
165 }, 186 },
166 - mapType:'商铺',  
167 - content:'<p>露从今夜白，月是故乡明</p>', 187 + mapType:'',
  188 + content:'',
168 xuShow:false, 189 xuShow:false,
169 - content:'您确定是否需要续租' 190 + contentxu:'您确定是否需要续租',
  191 + pageindex: {
  192 + pageNumber: 0,
  193 + pageSize: 10,
  194 + contractId:''
  195 + },
  196 + myshopMsg:{},
  197 + heData:{},
  198 + xuForm: {
  199 + reasonForApplication:'',
  200 + applicationTime:'',
  201 + contractId:0,
  202 + contractType:1,
  203 + createTime:'',
  204 + createUser:''
  205 + },
170 } 206 }
171 }, 207 },
172 onLoad(options) { 208 onLoad(options) {
173 const item = JSON.parse(decodeURIComponent(options.item)); 209 const item = JSON.parse(decodeURIComponent(options.item));
174 console.log('Received item:', item); 210 console.log('Received item:', item);
175 this.record = item 211 this.record = item
  212 + let pageHe={
  213 + pageNumber: 0,
  214 + pageSize: 10,
  215 + shopNumber:'',
  216 + dataStatus:1
  217 + }
  218 + if(item.cereBasicInformationShop && item.cereBasicInformationShop.shopName){
  219 + this.mapType = '商铺'
  220 + pageHe.shopNumber = `sp${item.cereBasicInformationShop.id}`
  221 + }else if( item.cereBasicInformationVenue && item.cereBasicInformationVenue.venueName){
  222 + this.mapType = '场地'
  223 + pageHe.shopNumber = `cd${item.cereBasicInformationVenue.id}`
  224 + }else if(item.cereAdvertisingInformation && item.cereAdvertisingInformation.advertisingName){
  225 + this.mapType = '广告位'
  226 + pageHe.shopNumber = `gg${item.cereAdvertisingInformation.id}`
  227 + }
  228 +
  229 + this.$http.sendRequest('/cereContractInformation/getPage', 'POST', pageHe,1).then(res => {
  230 +
  231 + this.heData = res.data.data.content[0] || {}
  232 +
  233 + })
  234 + },
  235 + onShow() {
  236 + if(this.mapType == '商铺'){
  237 + this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex,1).then(res => {
  238 + if(res.data.data.content.length == 0){
  239 + this.btnShow = true
  240 + }else{
  241 + this.btnShow = false
  242 + this.myshopMsg = res.data.data.content[0]
  243 + this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
  244 +
  245 + this.myshopMsg.shopPhotos.map(item=>{
  246 + item = this.$img + item
  247 + })
  248 +
  249 + }
  250 + })
  251 + }
176 }, 252 },
177 methods: { 253 methods: {
178 getQuit(urls){ 254 getQuit(urls){
179 - console.log(urls)  
180 uni.navigateTo({ 255 uni.navigateTo({
181 - url: urls 256 + url: urls+`?ids=${this.heData.id}`
182 }) 257 })
183 }, 258 },
184 xufirm(){ 259 xufirm(){
  260 + console.log('11111s')
  261 + this.xuForm.createUser = uni.getStorageSync('user').phone
  262 + this.xuForm.createTime = this.getCurrentTime()
  263 + this.xuForm.contractId = Number(this.heData.id)
  264 + this.$http.sendRequest('/changeContractInformation/add', 'POST',this.xuForm, 1).then(res => {
  265 + uni.showToast({
  266 + title: '提交成功',
  267 + icon: 'none',
  268 + })
  269 + uni.switchTab({
  270 + url: '/pages/my/my'
  271 + })
185 272
  273 + })
186 }, 274 },
187 xiuMsg(val){ 275 xiuMsg(val){
188 if(val == 1){ 276 if(val == 1){
189 uni.navigateTo({ 277 uni.navigateTo({
190 - url: '/pagesA/myZiyuan/addMyshop' 278 + url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}`
191 }) 279 })
192 }else{ 280 }else{
  281 + let lists = JSON.stringify(this.myshopMsg)
193 uni.navigateTo({ 282 uni.navigateTo({
194 - url: '/pagesA/myZiyuan/addMyshop' 283 + url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&msg=${lists}`
195 }) 284 })
196 } 285 }
197 - } 286 + },
  287 + getCurrentTime() {
  288 + const now = new Date();
  289 + const year = now.getFullYear();
  290 + const month = ('0' + (now.getMonth() + 1)).slice(-2);
  291 + const day = ('0' + now.getDate()).slice(-2);
  292 + const hours = ('0' + now.getHours()).slice(-2);
  293 + const minutes = ('0' + now.getMinutes()).slice(-2);
  294 + const seconds = ('0' + now.getSeconds()).slice(-2);
  295 +
  296 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  297 + },
198 } 298 }
199 } 299 }
200 </script> 300 </script>
@@ -205,8 +305,9 @@ @@ -205,8 +305,9 @@
205 left: 0; 305 left: 0;
206 top: 0; 306 top: 0;
207 width: 100%; 307 width: 100%;
208 - height: 100%; 308 +
209 padding: 0 24rpx; 309 padding: 0 24rpx;
  310 +
210 } 311 }
211 .zhutu{ 312 .zhutu{
212 margin: 15px 0; 313 margin: 15px 0;
@@ -366,6 +467,7 @@ @@ -366,6 +467,7 @@
366 background-color: #FFFFFF; 467 background-color: #FFFFFF;
367 padding-bottom: constant(safe-area-inset-bottom); 468 padding-bottom: constant(safe-area-inset-bottom);
368 padding-bottom: env(safe-area-inset-bottom); 469 padding-bottom: env(safe-area-inset-bottom);
  470 + z-index: 20;
369 .footer-buy{ 471 .footer-buy{
370 display: flex; 472 display: flex;
371 align-items: center; 473 align-items: center;
@@ -386,4 +488,14 @@ @@ -386,4 +488,14 @@
386 } 488 }
387 } 489 }
388 } 490 }
  491 + .image-container {
  492 + display: flex;
  493 + flex-wrap: wrap; /* 启用换行 */
  494 + justify-content: space-between; /* 图片之间均匀分布 */
  495 + }
  496 +
  497 + .image-item {
  498 + box-sizing: border-box;
  499 + margin-bottom: 10rpx; /* 图片之间的垂直间距 */
  500 + }
389 </style> 501 </style>
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
  View file @2a10904
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 typeShow:false, 43 typeShow:false,
44 recordList:[], 44 recordList:[],
45 pageindex: { 45 pageindex: {
46 - pageNumber: 1, 46 + pageNumber: 0,
47 pageSize: 10 47 pageSize: 10
48 }, 48 },
49 } 49 }
@@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
66 66
67 }, 67 },
68 recordXq(item){ 68 recordXq(item){
  69 +
69 const encodedItem = encodeURIComponent(JSON.stringify(item)); 70 const encodedItem = encodeURIComponent(JSON.stringify(item));
70 uni.navigateTo({ 71 uni.navigateTo({
71 url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`, 72 url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue
  View file @2a10904
@@ -2,16 +2,16 @@ @@ -2,16 +2,16 @@
2 <view class="page"> 2 <view class="page">
3 3
4 <view class="add-list"> 4 <view class="add-list">
5 - <u-form labelPosition="left" :model="model1" ref="uForm" :labelWidth="250">  
6 - <u-form-item label="*申请原因" prop="businessPurpose" borderBottom> 5 + <u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250">
  6 + <u-form-item label="*申请原因" prop="reasonForApplication" borderBottom>
7 </u-form-item> 7 </u-form-item>
8 - <u-input v-model="model1.businessPurpose" type="textarea" :custom-style="customStyle"></u-input> 8 + <u-input v-model="ruleForm.reasonForApplication" type="textarea" :custom-style="customStyle"></u-input>
9 </u-form> 9 </u-form>
10 </view> 10 </view>
11 <view class="add-list"> 11 <view class="add-list">
12 - <u-form labelPosition="left" :model="model1" ref="uForm" :labelWidth="250">  
13 - <u-form-item label="*申请退租时间" prop="businessStartDate" borderBottom>  
14 - <u-input v-model="model1.businessStartDate" type="select" @click="busStartshow = true" 12 + <u-form labelPosition="left" :model="ruleForm" ref="uForm" :labelWidth="250">
  13 + <u-form-item label="*申请退租时间" prop="applicationTime" borderBottom>
  14 + <u-input v-model="ruleForm.applicationTime" type="select" @click="busStartshow = true"
15 placeholder="请选择" :custom-style="selStyle"/> 15 placeholder="请选择" :custom-style="selStyle"/>
16 <u-picker mode="time" v-model="busStartshow" :params="params" 16 <u-picker mode="time" v-model="busStartshow" :params="params"
17 @confirm="busStTimeChange"></u-picker> 17 @confirm="busStTimeChange"></u-picker>
@@ -30,9 +30,13 @@ @@ -30,9 +30,13 @@
30 export default { 30 export default {
31 data() { 31 data() {
32 return { 32 return {
33 - model1: {  
34 - businessStartDate:'',  
35 - businessPurpose:'' 33 + ruleForm: {
  34 + reasonForApplication:'',
  35 + applicationTime:'',
  36 + contractId:0,
  37 + contractType:0,
  38 + createTime:'',
  39 + createUser:''
36 }, 40 },
37 busStartshow: false, 41 busStartshow: false,
38 params: { 42 params: {
@@ -53,9 +57,9 @@ @@ -53,9 +57,9 @@
53 }; 57 };
54 }, 58 },
55 onLoad(option) { 59 onLoad(option) {
56 -  
57 -  
58 - 60 + if(option.ids){
  61 + this.ruleForm.contractId = Number(option.ids)
  62 + }
59 }, 63 },
60 onShow() {}, 64 onShow() {},
61 methods: { 65 methods: {
@@ -71,14 +75,14 @@ @@ -71,14 +75,14 @@
71 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; 75 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
72 }, 76 },
73 chek() { 77 chek() {
74 - if (!this.model1.businessStartDate) { 78 + if (!this.ruleForm.reasonForApplication) {
75 uni.showToast({ 79 uni.showToast({
76 icon: 'none', 80 icon: 'none',
77 title: '请输入申请原因' 81 title: '请输入申请原因'
78 }); 82 });
79 return; 83 return;
80 } 84 }
81 - if (!this.model1.businessPurpose) { 85 + if (!this.ruleForm.applicationTime) {
82 uni.showToast({ 86 uni.showToast({
83 icon: 'none', 87 icon: 'none',
84 title: '请选择退租申请时间' 88 title: '请选择退租申请时间'
@@ -88,20 +92,19 @@ @@ -88,20 +92,19 @@
88 92
89 }, 93 },
90 go() { 94 go() {
91 - this.model1.rentalResourcesId = ''  
92 - this.model1.applicant = uni.getStorageSync('user').phone  
93 - this.model1.applicationTime = this.getCurrentTime()  
94 - this.chek()  
95 - // this.$http.sendRequest('/cereBusinessInfo/add', 'POST',info, 1).then(res => {  
96 - // uni.showToast({  
97 - // title: '提交成功',  
98 - // icon: 'none',  
99 - // });  
100 - // setTimeout(() => {  
101 - // uni.navigateBack()  
102 - // }, 1000) 95 + this.ruleForm.createUser = uni.getStorageSync('user').phone
  96 + this.ruleForm.createTime = this.getCurrentTime()
  97 + this.chek()
  98 + this.$http.sendRequest('/changeContractInformation/add', 'POST',this.ruleForm, 1).then(res => {
  99 + uni.showToast({
  100 + title: '提交成功',
  101 + icon: 'none',
  102 + });
  103 + uni.switchTab({
  104 + url: '/pages/my/my'
  105 + });
103 106
104 - // }) 107 + })
105 }, 108 },
106 timeChange(val) { 109 timeChange(val) {
107 const { 110 const {
@@ -112,7 +115,7 @@ @@ -112,7 +115,7 @@
112 return `${year}-${month}-${day}`; 115 return `${year}-${month}-${day}`;
113 }, 116 },
114 busStTimeChange(val) { 117 busStTimeChange(val) {
115 - this.model1.businessStartDate = this.timeChange(val) 118 + this.ruleForm.applicationTime = this.timeChange(val)
116 }, 119 },
117 120
118 121
lvdao-miniapp/utils/request.js
  View file @2a10904
@@ -15,8 +15,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -15,8 +15,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
15 var bases = '' 15 var bases = ''
16 if(baseUrl == 1){ 16 if(baseUrl == 1){
17 // bases = 'http://8.130.38.56:8027/admin-server' + url; 17 // bases = 'http://8.130.38.56:8027/admin-server' + url;
18 - // bases = 'http://172.16.61.125:9003' + url;  
19 - bases = 'http://192.168.2.225:9003' + url; 18 + bases = 'http://172.16.61.125:9003' + url;
  19 + // bases = 'http://192.168.2.225:9003' + url;
20 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; 20 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
21 // bases = 'https://jy.scjysm.asia:18086/admin-server' + url; 21 // bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
22 22
@@ -24,8 +24,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -24,8 +24,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
24 }else{ 24 }else{
25 // bases = 'http://8.130.38.56:8027/business-server' + url; 25 // bases = 'http://8.130.38.56:8027/business-server' + url;
26 // bases = 'http://172.16.61.48/business-server' + url; 26 // bases = 'http://172.16.61.48/business-server' + url;
27 - // bases = 'http://172.16.61.125:9004' + url;  
28 - bases = 'http://192.168.2.225:9004' + url; 27 + bases = 'http://172.16.61.125:9004' + url;
  28 + // bases = 'http://192.168.2.225:9004' + url;
29 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; 29 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
30 // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url; 30 // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
31 31