webapp / GreenwayWeb

Commit b3670a4c30475ad31f3431fe6d3f3810c54e8a0d

Authored by wesley88
2 parents d901fc01 b4a9a1bd

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

Inline Side-by-side
Showing 11 changed files with 434 additions and 257 deletions
admin-web-master/src/utils/request.js
  View file @b3670a4
... ... @@ -15,8 +15,15 @@ let hostall = window.location.href;
15 15 // const baseURL = 'http://192.168.2.38:9003';
16 16 let baseURL = ''
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
  18 +<<<<<<< HEAD
  19 + // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
  20 + // baseURL = 'http://192.168.2.225:9003';
  21 + baseURL = 'http://172.16.61.125:9003';
  22 + // baseURL = 'http://192.168.2.36:9003';
  23 +=======
18 24 baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
19 25 // baseURL = 'http://192.168.2.225:9003';
  26 +>>>>>>> 6ab1cdc6a7eebe6d21d1f3bf2da0133245334a38
20 27 } else {
21 28 console.error('---------------------')
22 29 console.error(hostall)
... ...
admin-web-master/src/utils/request2.js
  View file @b3670a4
... ... @@ -15,6 +15,12 @@ let hostall = window.location.href;
15 15 // const baseURL = 'http://192.168.2.38:9003';
16 16 let baseURL = ''
17 17 // || host === 'localhost:9528'
  18 +<<<<<<< HEAD
  19 +if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
  20 + // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
  21 + baseURL = 'http://172.16.61.125:9004';
  22 + // baseURL = 'http://192.168.2.225:9004';
  23 +=======
18 24 // if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
19 25 // // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
20 26 // baseURL = 'http://192.168.2.36:9003';
... ... @@ -28,6 +34,7 @@ let baseURL = &#39;&#39;
28 34 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
29 35 baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
30 36 // baseURL = 'http://192.168.2.225:9003';
  37 +>>>>>>> 6ab1cdc6a7eebe6d21d1f3bf2da0133245334a38
31 38 } else {
32 39 console.error('---------------------')
33 40 console.error(hostall)
... ...
lvdao-miniapp/main.js
  View file @b3670a4
... ... @@ -14,8 +14,9 @@ Vue.prototype.$imgUrl = (url) =&gt; {
14 14 }
15 15 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
16 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 20 Vue.prototype.$img = 'http://172.16.61.125/cdwlMall'
20 21 // Vue.prototype.$upload = "https://jy.scjysm.asia:18086/admin-server/file/upload"
21 22  
... ...
lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
  View file @b3670a4
... ... @@ -6,7 +6,7 @@
6 6 <view>
7 7 <view v-show="active == 0">
8 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 10 </view>
11 11  
12 12 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
... ... @@ -291,24 +291,11 @@
291 291 ziyuanId: '',
292 292 ziyuanType:'',
293 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 308  
322 309 },
323 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 327 methods: {
355 328 generateDateRange(datas) {
... ... @@ -365,13 +338,14 @@
365 338 const month = String(currentDate.getMonth() + 1).padStart(1, '0');
366 339 const day = String(currentDate.getDate()).padStart(1, '0');
367 340 const dateString = `${year}-${month}-${day}`;
368   - result.push({
  341 + this.selected.push({
369 342 date: dateString,
370   - info: '￥850',
  343 + info: '已租',
371 344 disable: true
372 345 });
373 346 currentDate.setDate(currentDate.getDate() + 1);
374 347 }
  348 + console.log( this.selected)
375 349 return result;
376 350 },
377 351 calendarChange(e){
... ... @@ -390,6 +364,22 @@
390 364 establiChange(val){
391 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 383 formatter(day) {
394 384 const d = new Date()
395 385 let month = d.getMonth() + 1
... ...
lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
  View file @b3670a4
... ... @@ -6,7 +6,7 @@
6 6 <view>
7 7 <view class="add-list" v-show="active == 0">
8 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 10 </view>
11 11 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
12 12 <u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0">
... ... @@ -290,26 +290,12 @@
290 290 zhengce: '',
291 291 shuoming: '',
292 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 294 map:0,
312   - establishow:false
  295 + establishow:false,
  296 + today:['',''],
  297 + startDate:'',
  298 + endDate:''
313 299 };
314 300 },
315 301 onLoad(option) {
... ... @@ -339,37 +325,25 @@
339 325 console.log(err)
340 326 //请求失败
341 327 })
  328 +
342 329 },
343 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 348 methods: {
375 349 generateDateRange(datas) {
... ... @@ -385,9 +359,9 @@
385 359 const month = String(currentDate.getMonth() + 1).padStart(1, '0');
386 360 const day = String(currentDate.getDate()).padStart(1, '0');
387 361 const dateString = `${year}-${month}-${day}`;
388   - result.push({
  362 + this.selected.push({
389 363 date: dateString,
390   - info: '￥850',
  364 + info: '已租',
391 365 disable: true
392 366 });
393 367 currentDate.setDate(currentDate.getDate() + 1);
... ... @@ -407,6 +381,22 @@
407 381 typeChange(e) {
408 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 400 getCurrentTime() {
411 401 const now = new Date();
412 402 const year = now.getFullYear();
... ...
lvdao-miniapp/pages/record/record.vue
  View file @b3670a4
... ... @@ -28,7 +28,7 @@
28 28 return {
29 29 recordList:'',
30 30 pageindex: {
31   - pageNumber: 1,
  31 + pageNumber: 0,
32 32 pageSize: 10
33 33 },
34 34 };
... ...
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
  View file @b3670a4
... ... @@ -11,7 +11,8 @@
11 11 </view>
12 12 <view class="voucher-img">
13 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 16 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
16 17 </view>
17 18 </view>
... ... @@ -27,7 +28,7 @@
27 28 <!-- <text class="star">*</text> -->
28 29 </view>
29 30 <view class="content">
30   - <input type="text" placeholder="请输入" v-model="ruleForm.deviceName">
  31 + <input type="text" placeholder="请输入" v-model="ruleForm.shopName">
31 32 </view>
32 33 </view>
33 34 <view class="item">
... ... @@ -42,7 +43,26 @@
42 43 <view class="voucher-img">
43 44 <view class="voucher-list" style="width: 100%;">
44 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 66 </view>
47 67 </view>
48 68 </view>
... ... @@ -55,7 +75,7 @@
55 75 <!-- <text class="star">*</text> -->
56 76 </view>
57 77 <view class="content">
58   - <input type="text" placeholder="请输入" v-model="ruleForm.deviceName">
  78 + <input type="text" placeholder="请输入" v-model="ruleForm.contactNumber">
59 79 </view>
60 80 </view>
61 81  
... ... @@ -78,15 +98,14 @@
78 98 <view class="voucher-img">
79 99 <view class="voucher-list" style="width: 100%;">
80 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 102 </view>
83 103 </view>
84 104 </view>
85 105 </view>
86 106 </view>
87 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 110 <view class="page-footer">
92 111 <u-button type="success" style="width: 100%;border-radius: 10px;" @click="submit">提交</u-button>
... ... @@ -98,41 +117,43 @@
98 117 export default {
99 118 data() {
100 119 return {
101   - fileList:[],
  120 + fist:[],
102 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 157 methods:{
137 158 chooseLocation(val, item) {
138 159 this.popup1 = true
... ... @@ -148,35 +169,49 @@
148 169 this.ruleForm.deviceType = val[0].label
149 170 },
150 171 check(){
151   - if (this.ruleForm.onSitePhoto.length== 0) {
  172 + if (this.ruleForm.shopPhotos.length== 0) {
152 173 uni.showToast({
153 174 icon: 'none',
154 175 title: '请上传现场图片'
155 176 });
156 177 return false;
157 178 }
158   - if (!this.ruleForm.complaintType) {
  179 + if (!this.ruleForm.shopName) {
159 180 uni.showToast({
160 181 icon: 'none',
161   - title: '请选择投诉类型'
  182 + title: '请输入店铺名称'
162 183 });
163 184 return false;
164 185 }
165   - if (!this.ruleForm.problemDescription) {
  186 + if (!this.ruleForm.shopDescription) {
166 187 uni.showToast({
167 188 icon: 'none',
168   - title: '请输入问题描述'
  189 + title: '请输入店铺介绍'
169 190 });
170 191 return false;
171 192 }
172   - if (!this.ruleForm.remark) {
  193 + if (!this.ruleForm.businessHours) {
173 194 uni.showToast({
174 195 icon: 'none',
175   - title: '请输入备注信息'
  196 + title: '请输入营业时间'
176 197 });
177 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 215 return true;
181 216 },
182 217 submit() {
... ... @@ -184,23 +219,45 @@
184 219 if(show == false){
185 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 227 this.ruleForm.applicationTime = this.currentTime()
191 228 let info = {
192 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 291 filePath: 'xcx', // 其他表单数据
235 292 },
236 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 300 uni.showToast({
239 301 title: '上传成功',
240 302 icon: 'success',
... ... @@ -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 320 </script>
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @b3670a4
... ... @@ -16,67 +16,74 @@
16 16 </view>
17 17 <view class="form-item">
18 18 <view class="label">租赁期限</view>
19   - <text>{{record.contractTerminationDate}}</text>
  19 + <text>{{heData.contractTerminationDate || '无'}}</text>
20 20 </view>
21 21 <view class="form-item">
22 22 <view class="label">租金</view>
23   - <text>{{record.contractAmount}}</text>
  23 + <text>{{heData.contractAmount || '无'}}</text>
24 24 </view>
25 25 <view class="form-item">
26 26 <view class="label">付款日</view>
27   - <text>{{record.paymentCycle}}</text>
  27 + <text>{{heData.paymentDay || '无'}}</text>
28 28 </view>
29 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 32 <view class="form-item">
34 33 <view class="label">商铺名称</view>
35   - <text>{{record.warrantyIssue || record.complaintType}}</text>
  34 + <text>{{record.cereBasicInformationShop.shopName}}</text>
36 35 </view>
37 36 <view class="form-item">
38 37 <view class="label">商铺类型</view>
39   - <text>{{record.applicationTime}}</text>
  38 + <text>{{record.cereBasicInformationShop.shopType=='1'?'移动铺位':record.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}</text>
40 39 </view>
  40 +
41 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 44 </view>
45 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 48 </view>
49 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 60 </view>
53   -
54 61 </u-read-more>
55   - </view>
  62 + </view>
  63 +
56 64 <view class="msglist" v-if="mapType == '广告位'">
57 65 <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
58 66  
59 67 <view class="form-item">
60 68 <view class="label">广告位名称</view>
61   - <text>{{record.warrantyIssue || record.complaintType}}</text>
  69 + <text>{{record.cereAdvertisingInformation.advertisingName}}</text>
62 70 </view>
63 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 76 <view class="label">所属端</view>
65   - <text>{{record.applicationTime}}</text>
  77 + <text>{{record.cereAdvertisingInformation.applicationTime}}</text>
66 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 82 </view>
71 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 86 </view>
75   - <view class="form-item">
76   - <view class="label">付款日</view>
77   - <text>{{record.memo || record.remark}}</text>
78   - </view>
79   -
80 87 </u-read-more>
81 88 </view>
82 89 <view class="msglist" v-if="mapType == '场地'">
... ... @@ -84,71 +91,85 @@
84 91  
85 92 <view class="form-item">
86 93 <view class="label">场地名称</view>
87   - <text>{{record.warrantyIssue || record.complaintType}}</text>
  94 + <text>{{record.cereBasicInformationVenue.venueName}}</text>
88 95 </view>
89 96 <view class="form-item">
90 97 <view class="label">场地类型</view>
91   - <text>{{record.applicationTime}}</text>
  98 + <text>{{record.cereBasicInformationVenue.venueType}}</text>
92 99 </view>
93 100 <view class="form-item">
94 101 <view class="label">实际使用面积</view>
95   - <text>{{record.deviceType || record.problemDescription}}</text>
  102 + <text>{{record.cereBasicInformationVenue.actualArea}}</text>
96 103 </view>
97 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 107 </view>
101 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 111 </view>
105   -
106 112 </u-read-more>
107 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 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 121 </view>
116 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 127 </view>
120 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 133 </view>
124 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 137 </view>
128 138 <view class="form-item">
129   - <view class="label">付款日</view>
130   - <text>{{record.memo || record.remark}}</text>
  139 + <view class="label">位置描述</view>
131 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 151 </view>
135   - <view class="msglist" v-if="mapType == '广告位'">
136 152  
137   -
  153 + <view class="msglist" v-if="mapType == '广告位'" style="margin-bottom:65px;">
138 154 <view class="form-item">
139 155 <view class="label">投放内容</view>
140 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 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 166 <view class="page-footer">
146 167 <u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')"
147 168 >申请退租</u-button>
148 169 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true" >申请续租</u-button>
149 170 <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xiuMsg(2)" v-if="btnShow == false&&mapType == '商铺'">修改资料</u-button>
150 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 173 </view>
153 174  
154 175 </template>
... ... @@ -158,43 +179,122 @@
158 179 data() {
159 180 return {
160 181 record:{},
161   - btnShow:true,
  182 + btnShow:false,
162 183 hoverStyle:{
163 184  
164 185 color:'#3f9b6a'
165 186 },
166   - mapType:'商铺',
167   - content:'<p>露从今夜白，月是故乡明</p>',
  187 + mapType:'',
  188 + content:'',
168 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 208 onLoad(options) {
173 209 const item = JSON.parse(decodeURIComponent(options.item));
174 210 console.log('Received item:', item);
175 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 253 methods: {
178 254 getQuit(urls){
179   - console.log(urls)
180 255 uni.navigateTo({
181   - url: urls
  256 + url: urls+`?ids=${this.heData.id}`
182 257 })
183 258 },
184 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 275 xiuMsg(val){
188 276 if(val == 1){
189 277 uni.navigateTo({
190   - url: '/pagesA/myZiyuan/addMyshop'
  278 + url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}`
191 279 })
192 280 }else{
  281 + let lists = JSON.stringify(this.myshopMsg)
193 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 300 </script>
... ... @@ -205,8 +305,9 @@
205 305 left: 0;
206 306 top: 0;
207 307 width: 100%;
208   - height: 100%;
  308 +
209 309 padding: 0 24rpx;
  310 +
210 311 }
211 312 .zhutu{
212 313 margin: 15px 0;
... ... @@ -366,6 +467,7 @@
366 467 background-color: #FFFFFF;
367 468 padding-bottom: constant(safe-area-inset-bottom);
368 469 padding-bottom: env(safe-area-inset-bottom);
  470 + z-index: 20;
369 471 .footer-buy{
370 472 display: flex;
371 473 align-items: center;
... ... @@ -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 501 </style>
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
  View file @b3670a4
... ... @@ -43,7 +43,7 @@
43 43 typeShow:false,
44 44 recordList:[],
45 45 pageindex: {
46   - pageNumber: 1,
  46 + pageNumber: 0,
47 47 pageSize: 10
48 48 },
49 49 }
... ... @@ -66,6 +66,7 @@
66 66  
67 67 },
68 68 recordXq(item){
  69 +
69 70 const encodedItem = encodeURIComponent(JSON.stringify(item));
70 71 uni.navigateTo({
71 72 url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuanQuit.vue
  View file @b3670a4
... ... @@ -2,16 +2,16 @@
2 2 <view class="page">
3 3  
4 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 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 9 </u-form>
10 10 </view>
11 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 15 placeholder="请选择" :custom-style="selStyle"/>
16 16 <u-picker mode="time" v-model="busStartshow" :params="params"
17 17 @confirm="busStTimeChange"></u-picker>
... ... @@ -30,9 +30,13 @@
30 30 export default {
31 31 data() {
32 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 41 busStartshow: false,
38 42 params: {
... ... @@ -53,9 +57,9 @@
53 57 };
54 58 },
55 59 onLoad(option) {
56   -
57   -
58   -
  60 + if(option.ids){
  61 + this.ruleForm.contractId = Number(option.ids)
  62 + }
59 63 },
60 64 onShow() {},
61 65 methods: {
... ... @@ -71,14 +75,14 @@
71 75 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
72 76 },
73 77 chek() {
74   - if (!this.model1.businessStartDate) {
  78 + if (!this.ruleForm.reasonForApplication) {
75 79 uni.showToast({
76 80 icon: 'none',
77 81 title: '请输入申请原因'
78 82 });
79 83 return;
80 84 }
81   - if (!this.model1.businessPurpose) {
  85 + if (!this.ruleForm.applicationTime) {
82 86 uni.showToast({
83 87 icon: 'none',
84 88 title: '请选择退租申请时间'
... ... @@ -88,20 +92,19 @@
88 92  
89 93 },
90 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 109 timeChange(val) {
107 110 const {
... ... @@ -112,7 +115,7 @@
112 115 return `${year}-${month}-${day}`;
113 116 },
114 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 @b3670a4
... ... @@ -15,8 +15,8 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
15 15 var bases = ''
16 16 if(baseUrl == 1){
17 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 20 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
21 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 24 }else{
25 25 // bases = 'http://8.130.38.56:8027/business-server' + url;
26 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 29 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
30 30 // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
31 31  
... ...