webapp / GreenwayWeb

Commit 20f3f5804e29b3b29a60e19235e4e30bb9cd71a4

Authored by wesley88
1 parent 3f398c3a

1

Inline Side-by-side
Showing 4 changed files with 63 additions and 39 deletions
lvdao-miniapp/pages/accepting/accepting.vue
  View file @20f3f58
... ... @@ -4,7 +4,7 @@
4 4 <view class="record-list">
5 5 <view class="good-item">
6 6 <view class="img">
7   - <u-image width="100%" height="100%" border-radius="10" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?$img + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?$img + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?$img + record.cereAdvertisingInformation.locationDiagram:''"></u-image>
  7 + <u-image width="100%" height="100%" border-radius="10" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?imgurl + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?imgurl + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?imgurl + record.cereAdvertisingInformation.locationDiagram:''"></u-image>
8 8 </view>
9 9 <view class="info">
10 10 <view class="title">{{
... ... @@ -25,8 +25,8 @@
25 25 }}</text>
26 26 </view>
27 27 <view class="info-item">
28   - <text style="padding-right: 20rpx;" >租金：<span>￥{{moban[0].rentalPrice}}/{{moban[0].leaseTerm}}</span></text>
29   - <text v-if="!record.advertisingSpaceType">面积：<span>81/m²</span></text>
  28 + <text style="padding-right: 20rpx;" >租金：￥{{moban[0].rentalPrice}}/{{moban[0].leaseTerm}}</text>
  29 + <!-- <text v-if="!record.advertisingSpaceType">面积：{{record.actualUsableArea}}/m²</text> -->
30 30 </view>
31 31 </view>
32 32 </view>
... ... @@ -69,7 +69,7 @@
69 69 <view class="form-item" label-top v-if="record.advertisingSpaceType">
70 70 <view class="label">广告图片</view>
71 71 <view class="img">
72   - <u-image width="304rpx" height="182rpx" :src="$img + record.coverImage" ></u-image>
  72 + <u-image width="304rpx" height="182rpx" :src="imgurl + record.coverImage" ></u-image>
73 73 </view>
74 74 </view>
75 75 </view>
... ... @@ -90,15 +90,13 @@
90 90 <view class="label">身份证有效期</view>
91 91 <text>{{record.idValidStart || record.idCardValidStart}}至 {{record.idValidEnd || record.idCardValidEnd}}</text>
92 92 </view> -->
93   - <view class="form-item" label-top>
  93 + <view label-top style="line-height: 70rpx;
  94 + border-bottom: #eee solid 1rpx;
  95 + padding: 10rpx 0;width: 100%;box-sizing: border-box;">
94 96 <view class="label">身份证照片</view>
95   - <view class="deom-box">
96   - <view class="img-deom">
97   - <u-image width="304rpx" height="182rpx" :src="$img+shopMsg.idCardFrontImage"></u-image>
98   - </view>
99   - <view class="img-deom">
100   - <u-image width="304rpx" height="182rpx" :src="$img+shopMsg.idCardBackImage"></u-image>
101   - </view>
  97 + <view style="display: flex;justify-content: space-around;">
  98 + <u-image width="150px" height="200rpx" :src="imgurl+shopMsg.idCardFrontImage"></u-image>
  99 + <u-image width="150px" height="200rpx" :src="imgurl+shopMsg.idCardBackImage"></u-image>
102 100 </view>
103 101 </view>
104 102 <!-- <view class="form-item" label-top>
... ... @@ -120,6 +118,7 @@
120 118 <u-button type="success" shape="circle" @click="Zhicheck()">立即支付</u-button>
121 119 </view>
122 120 </view> -->
  121 + <view style="height: 100rpx;"></view>
123 122 </view>
124 123 </template>
125 124  
... ... @@ -129,10 +128,12 @@
129 128 return {
130 129 record:{},
131 130 shopMsg:{},
132   - moban:[]
  131 + moban:[],
  132 + imgurl:''
133 133 }
134 134 },
135 135 onLoad(options) {
  136 + this.imgurl = this.$img
136 137 const item = JSON.parse(decodeURIComponent(options.item));
137 138 console.log('Received item:', item);
138 139 this.record = item
... ...
lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
  View file @20f3f58
... ... @@ -9,20 +9,20 @@
9 9 <wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected" color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate"></wu-calendar>
10 10 </view>
11 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 :required="true" label="租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0">
13 13 <u-input v-model="model1.intendedLeaseTerm" type="select" placeholder="请选择上面时间" ></u-input>
14 14 </u-form-item>
15   - <u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-else>
  15 + <u-form-item :required="true" label="租赁周期" prop="intendedLeaseTerm" borderBottom v-else>
16 16 <u-input v-model="model1.intendedLeaseTerm" placeholder="请输入租赁周期" ></u-input>
17 17 </u-form-item>
18   - <u-form-item label="*经营用途" prop="businessPurpose" borderBottom>
  18 + <u-form-item :required="true" label="经营用途" prop="businessPurpose" borderBottom>
19 19 <u-input v-model="model1.businessPurpose"></u-input>
20 20 </u-form-item>
21 21 </u-form>
22 22 </view>
23 23 <view class="add-list" v-show="active == 0 && false">
24 24 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
25   - <u-form-item label="*租金方案" prop="businessPurpose" borderBottom>
  25 + <u-form-item :required="true" label="租金方案" prop="businessPurpose" borderBottom>
26 26 <u-input v-model="model1.fangan" type="select" @click="celueShow = true" placeholder='请选择类型' />
27 27 </u-form-item>
28 28 <view style="padding: 10rpx; color: #31AA6A;font-size: 18px;">
... ... @@ -40,51 +40,51 @@
40 40 </view>
41 41 <view class="add-list" v-show='active == 1'>
42 42 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
43   - <u-form-item label="*主体名称" prop="entityName" borderBottom>
  43 + <u-form-item :required="true" label="主体名称" prop="entityName" borderBottom>
44 44 <u-input v-model="model1.entityName"></u-input>
45 45 </u-form-item>
46   - <u-form-item label="*统一社会信用代码" prop="unifiedSocialCreditCode" borderBottom>
  46 + <u-form-item :required="true" label="统一社会信用代码" prop="unifiedSocialCreditCode" borderBottom>
47 47 <u-input v-model="model1.unifiedSocialCreditCode"></u-input>
48 48 </u-form-item>
49   - <u-form-item label="*主体类型" prop="entityType" borderBottom>
  49 + <u-form-item :required="true" label="主体类型" prop="entityType" borderBottom>
50 50 <u-input v-model="model1.entityType" type="select" @click="typeShow = true"
51 51 placeholder='请选择类型' />
52 52 </u-form-item>
53   - <u-form-item label="*法定代表人" prop="legalRepresentative" borderBottom>
  53 + <u-form-item :required="true" label="法定代表人" prop="legalRepresentative" borderBottom>
54 54 <u-input v-model="model1.legalRepresentative"></u-input>
55 55 </u-form-item>
56   - <u-form-item label="*经营范围" prop="businessScope" borderBottom>
  56 + <u-form-item :required="true" label="经营范围" prop="businessScope" borderBottom>
57 57 <u-input v-model="model1.businessScope"></u-input>
58 58 </u-form-item>
59   - <u-form-item label="*注册资本" prop="registeredCapital" borderBottom>
  59 + <u-form-item :required="true" label="注册资本" prop="registeredCapital" borderBottom>
60 60 <u-input v-model="model1.registeredCapital"></u-input>
61 61 </u-form-item>
62   - <u-form-item label="*成立日期" prop="establishmentDate" borderBottom>
  62 + <u-form-item :required="true" label="成立日期" prop="establishmentDate" borderBottom>
63 63 <!-- <u-input v-model="model1.establishmentDate"></u-input> -->
64 64 <u-input v-model="model1.establishmentDate" type="select" @click="establishow = true"
65 65 placeholder="请选择" />
66 66 <u-picker mode="time" v-model="establishow" :params="params"
67 67 @confirm="establiChange"></u-picker>
68 68 </u-form-item>
69   - <u-form-item label="*住所" prop="residence" borderBottom>
  69 + <u-form-item :required="true" label="住所" prop="residence" borderBottom>
70 70 <u-input v-model="model1.residence"></u-input>
71 71 </u-form-item>
72   - <u-form-item label="*邮箱地址" prop="emailAddress" borderBottom>
  72 + <u-form-item :required="true" label="邮箱地址" prop="emailAddress" borderBottom>
73 73 <u-input v-model="model1.emailAddress"></u-input>
74 74 </u-form-item>
75   - <u-form-item label="*经营开始时间" prop="businessStartDate" borderBottom>
  75 + <u-form-item :required="true" label="经营开始时间" prop="businessStartDate" borderBottom>
76 76 <u-input v-model="model1.businessStartDate" type="select" @click="busStartshow = true"
77 77 placeholder="请选择" />
78 78 <u-picker mode="time" v-model="busStartshow" :params="params"
79 79 @confirm="busStTimeChange"></u-picker>
80 80 </u-form-item>
81   - <u-form-item label="*经营结束时间" prop="businessEndDate" borderBottom>
  81 + <u-form-item :required="true" label="经营结束时间" prop="businessEndDate" borderBottom>
82 82 <u-input v-model="model1.businessEndDate" type="select" @click="busEndtshow = true"
83 83 placeholder="请选择" />
84 84 <u-picker mode="time" v-model="busEndtshow" :params="params"
85 85 @confirm="busEndTimeChange"></u-picker>
86 86 </u-form-item>
87   - <u-form-item label="*营业执照" prop="businessLicense" borderBottom labelPosition="top">
  87 + <u-form-item :required="true" label="营业执照" prop="businessLicense" borderBottom labelPosition="top">
88 88 <u-upload :action="$upload" :auto-upload="false" ref="businessLicense" :max-count="1"
89 89 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'businessLicense')"></u-upload>
90 90 </u-form-item>
... ...
lvdao-miniapp/pages/record/record.vue
  View file @20f3f58
... ... @@ -2,7 +2,7 @@
2 2 <view class="page">
3 3 <view class="screen-list">
4 4 <view class="list">
5   - <u-input v-model="pageindex.start" type="select" @click="typeShow = true" placeholder='租赁申请记录' />
  5 + <u-input type="select" @click="typeShow = true":placeholder="pageindex.auditStatus == '1'?'待审核':pageindex.auditStatus == '2'?'待签约':pageindex.auditStatus == '3'?'已驳回':'状态筛选'" />
6 6 </view>
7 7 </view>
8 8 <!-- 记录列表 -->
... ... @@ -18,6 +18,7 @@
18 18 </view>
19 19 </view>
20 20 </view>
  21 + <view v-if="recordList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
21 22 <u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
22 23 </view>
23 24 </template>
... ... @@ -56,6 +57,22 @@
56 57 this.pageindex.applicant =uni.getStorageSync('user').phone
57 58 this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
58 59 //成功回调
  60 + this.recordList = res.data.data.content
  61 + this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
  62 +
  63 + if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
  64 + item.data.data.content.map(val=>{
  65 + this.recordList.push(val)
  66 + })
  67 + }
  68 +
  69 +
  70 + })
  71 + })
  72 + return
  73 + this.pageindex.applicant =uni.getStorageSync('user').phone
  74 + this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
  75 + //成功回调
59 76  
60 77 this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
61 78  
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
  View file @20f3f58
... ... @@ -2,23 +2,24 @@
2 2 <view class="page">
3 3 <view class="screen-list">
4 4 <view class="list">
5   - <u-input v-model="pageindex.start" type="select" @click="typeShow = true" placeholder='状态筛选' />
  5 + <u-input type="select" @click="typeShow = true" :placeholder="pageindex.auditStatus == '1'?'申请中':pageindex.auditStatus == '4'?'租赁中':pageindex.auditStatus == '7'?'已终止':'状态筛选'" />
6 6 </view>
7 7 </view>
8 8 <!-- 记录列表 -->
9 9 <view class="record-list">
10   - <view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="recordXq(item)">
  10 + <view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="item.auditStatus =='4' || item.auditStatus =='7'?recordXq(item):''">
11 11 <view class="list">
12 12 <view class="title" style="padding-bottom: 20rpx;">
13 13 <view class="left">{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}</view>
14   - <view class="right"><u-icon name="arrow-right"></u-icon></view>
  14 + <view class="right" v-if="item.auditStatus =='4' || item.auditStatus =='7'"><u-icon name="arrow-right"></u-icon></view>
15 15 </view>
16 16 <view class="info-item">申请时间：{{item.applicationTime}}</view>
17 17 <view class="info-item">租赁时间 ：{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}</view>
18   - <!-- <view class="info-item">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view> -->
  18 + <view class="info-item" v-if="item.auditStatus =='1'">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view>
19 19 </view>
20 20 </view>
21 21 </view>
  22 + <view v-if="recordList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
22 23 <u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
23 24 </view>
24 25 </template>
... ... @@ -27,7 +28,12 @@
27 28 export default {
28 29 data() {
29 30 return {
30   - activesType: [{
  31 + activesType: [
  32 + // {
  33 + // value: 1,
  34 + // label: '申请中'
  35 + // },
  36 + {
31 37 value: 4,
32 38 label: '租赁中'
33 39 },
... ... @@ -68,11 +74,11 @@
68 74  
69 75 },
70 76 recordXq(item){
71   -
72   - const encodedItem = encodeURIComponent(JSON.stringify(item));
  77 +
  78 + const encodedItem = encodeURIComponent(JSON.stringify(item));
73 79 uni.navigateTo({
74   - url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
75   - })
  80 + url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
  81 + })
76 82 },
77 83 contractdetail(){
78 84 // uni.navigateTo({
... ...