webapp / GreenwayWeb

Commit e3789a759da70f04337b8e04afa6b345aad4f4d4

Authored by 杨鑫
1 parent eeb2763c

'最新'

Inline Side-by-side
Showing 36 changed files with 813 additions and 157 deletions
admin-web-master/dist.zip deleted
View file @eeb2763
No preview for this file type
lvdao-miniapp/pages.json
  View file @e3789a7
... ... @@ -431,6 +431,27 @@
431 431 "navigationBarBackgroundColor": "#FFFFFF",
432 432 "navigationBarTitleText": "店铺信息"
433 433 }
  434 + },
  435 + {
  436 + "path": "rentPay/rentPay",
  437 + "style": {
  438 + "navigationBarBackgroundColor": "#FFFFFF",
  439 + "navigationBarTitleText": "租金缴费"
  440 + }
  441 + },
  442 + {
  443 + "path": "rentPay/rentPayDetails",
  444 + "style": {
  445 + "navigationBarBackgroundColor": "#FFFFFF",
  446 + "navigationBarTitleText": "缴费记录"
  447 + }
  448 + },
  449 + {
  450 + "path": "rentPay/goPay",
  451 + "style": {
  452 + "navigationBarBackgroundColor": "#FFFFFF",
  453 + "navigationBarTitleText": "支付"
  454 + }
434 455 }
435 456 ]
436 457 }],
... ...
lvdao-miniapp/pages/advertisement/advertisement.scss
  View file @e3789a7
... ... @@ -6,16 +6,11 @@
6 6 height: 100%;
7 7 }
8 8 .head-search{
9   - display: flex;
10   - align-items: center;
11   - justify-content: space-between;
12   - position: relative;
13   - margin: 20rpx 0;
14   - background-color: #FFFFFF;
15   - border-radius: 35rpx;
16   - padding: 0 10rpx;
17   - border: 2rpx solid #E8E8E8;
18   - margin: 22rpx 24rpx;
  9 + display: flex;
  10 + align-items: center;
  11 + justify-content: space-between;
  12 + position: relative;
  13 + padding: 20rpx;
19 14 .u-search {
20 15 position: relative;
21 16 }
... ... @@ -33,7 +28,7 @@
33 28 display: flex;
34 29 align-items: center;
35 30 width: 100%;
36   - margin: 40rpx 0;
  31 + margin: 20rpx 0;
37 32 .list {
38 33 display: flex;
39 34 justify-content: center;
... ...
lvdao-miniapp/pages/advertisement/advertisement.vue
  View file @e3789a7
... ... @@ -7,7 +7,7 @@
7 7 </view> -->
8 8 <!-- 搜索 -->
9 9 <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
10   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  10 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.advertisingName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
11 11 </view>
12 12 <view class="screen-list">
13 13 <view class="list" @click="typeshow = true">
... ... @@ -172,8 +172,6 @@
172 172 this.show = true
173 173 },
174 174 handleCompanyConfirm(val){
175   - console.log(val)
176   -
177 175 let page = {
178 176 pageNumber: 1,
179 177 pageSize: 10,
... ...
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
  View file @e3789a7
... ... @@ -130,10 +130,15 @@ export default {
130 130 leaseAdd(url){
131 131  
132 132 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
133   - //成功回调
  133 + if(res.data.code == '20004' || res.data.code == '20003'){
  134 + uni.navigateTo({
  135 + url: '/pages/login/login'
  136 + })
  137 +
  138 + }
134 139 if(res.data.data.content.length>0) {
135 140 let c1 = res.data.data.content[0]
136   - console.error({...c1})
  141 +
137 142 if(c1.checkState == '1') {
138 143 uni.showToast({
139 144 icon:'none',
... ...
lvdao-miniapp/pages/complaint/complaint.scss
  View file @e3789a7
... ... @@ -3,7 +3,6 @@
3 3 left: 0;
4 4 top: 0;
5 5 width: 100%;
6   - height: 100%;
7 6 background-color: #f6f6f6;
8 7 }
9 8  
... ... @@ -63,28 +62,23 @@
63 62 left: 0;
64 63 bottom: 0;
65 64 display: flex;
  65 + align-items: center;
  66 + justify-content: center;
66 67 width: 100%;
67   - height: 100rpx;
  68 + height: 60px;
68 69 background-color: #FFFFFF;
69   - padding-bottom: constant(safe-area-inset-bottom);
70   - padding-bottom: env(safe-area-inset-bottom);
71   - .footer-buy{
  70 +
  71 + .footer-btn {
  72 + display: flex;
  73 + width: 90%;
  74 + }
  75 + .footer-service {
72 76 display: flex;
  77 + flex-direction: column;
73 78 align-items: center;
74   - justify-content: space-between;
75   - width: 100%;
76   - height: 100%;
77   - .cart-add{
78   - display: flex;
79   - align-items: center;
80   - justify-content: center;
81   - width: 100%;
82   - height: 100rpx;
83   - background-color: #3f9b6a;
84   - text{
85   - font-size: 28rpx;
86   - color: #FFFFFF;
87   - }
  79 + text {
  80 + margin-top: 6rpx;
  81 + line-height: 32rpx;
88 82 }
89 83 }
90 84 }
... ...
lvdao-miniapp/pages/complaint/complaint.vue
  View file @e3789a7
... ... @@ -68,8 +68,14 @@
68 68 </view>
69 69 <u-select v-model="popup1" mode="mutil-column-auto" :list="list" @confirm="pops" label-name="label" value-name="value"></u-select>
70 70 <!-- 保存按钮 -->
  71 +
  72 + <!-- <view class="page-footer">
  73 + <u-button type="success" style="flex: 1; margin: 0 10px;" >提交</u-button>
  74 + </view> -->
71 75 <view class="page-footer">
72   - <u-button type="success" style="flex: 1; margin: 0 10px;" @click="submit">提交</u-button>
  76 + <view class="footer-btn">
  77 + <u-button type="success" style="width: 100%;border-radius: 10px;" @click="submit">提交</u-button>
  78 + </view>
73 79 </view>
74 80 </view>
75 81 </template>
... ... @@ -105,24 +111,25 @@
105 111  
106 112 },
107 113 check(){
108   - if (this.ruleForm.onSitePhoto.length== 0) {
  114 +
  115 + if (!this.ruleForm.complaintType) {
109 116 uni.showToast({
110 117 icon: 'none',
111   - title: '请上传现场图片'
  118 + title: '请选择投诉类型'
112 119 });
113 120 return false;
114 121 }
115   - if (!this.ruleForm.complaintType) {
  122 + if (!this.ruleForm.problemDescription) {
116 123 uni.showToast({
117 124 icon: 'none',
118   - title: '请选择投诉类型'
  125 + title: '请输入问题描述'
119 126 });
120 127 return false;
121 128 }
122   - if (!this.ruleForm.problemDescription) {
  129 + if (this.ruleForm.onSitePhoto.length== 0) {
123 130 uni.showToast({
124 131 icon: 'none',
125   - title: '请输入问题描述'
  132 + title: '请上传现场图片'
126 133 });
127 134 return false;
128 135 }
... ...
lvdao-miniapp/pages/details/details.scss
  View file @e3789a7
... ... @@ -144,10 +144,9 @@
144 144 align-items: center;
145 145 justify-content: center;
146 146 width: 100%;
147   - height: 125rpx;
  147 + height: 60px;
148 148 background-color: #FFFFFF;
149   - padding-bottom: constant(safe-area-inset-bottom);
150   - padding-bottom: env(safe-area-inset-bottom);
  149 +
151 150 .footer-btn {
152 151 display: flex;
153 152 width: 90%;
... ...
lvdao-miniapp/pages/details/details.vue
  View file @e3789a7
... ... @@ -173,10 +173,13 @@ export default {
173 173 methods: {
174 174 leaseAdd(url){
175 175 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
176   - //成功回调
  176 + if(res.data.code == '20004' || res.data.code == '20003'){
  177 + uni.navigateTo({
  178 + url: '/pages/login/login'
  179 + })
  180 + }
177 181 if(res.data.data.content.length>0) {
178 182 let c1 = res.data.data.content[0]
179   - console.error({...c1})
180 183 if(c1.checkState == '1') {
181 184 uni.showToast({
182 185 icon:'none',
... ...
lvdao-miniapp/pages/field/field.scss
  View file @e3789a7
... ... @@ -10,7 +10,7 @@
10 10 align-items: center;
11 11 justify-content: space-between;
12 12 position: relative;
13   - margin: 20rpx;
  13 + padding: 20rpx;
14 14 .search{
15 15 display: flex;
16 16 width:100%;
... ... @@ -40,7 +40,7 @@
40 40 display: flex;
41 41 align-items: center;
42 42 width: 100%;
43   - margin: 40rpx 0;
  43 + margin: 20rpx 0;
44 44 .list {
45 45 display: flex;
46 46 justify-content: center;
... ...
lvdao-miniapp/pages/field/field.vue
  View file @e3789a7
... ... @@ -7,8 +7,8 @@
7 7 <u-search bg-color="#fff" placeholder="请输入" v-model="query.venueName" :show-action="false" @search="search" @clear="clearGet"></u-search>
8 8 <u-button type="success" @click="search">搜索</u-button>
9 9 </view> -->
10   - <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
11   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  10 + <view style="background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8;overflow: hidden;width: 100%;" >
  11 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.venueName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
12 12 </view>
13 13 </view>
14 14 <view class="screen-list">
... ...
lvdao-miniapp/pages/home/home.scss
  View file @e3789a7
... ... @@ -7,6 +7,7 @@
7 7 // overflow-x: hidden;
8 8 // overflow-y: auto;
9 9 position: absolute;
  10 +
10 11 }
11 12 .top-img {
12 13 width: 750rpx;
... ... @@ -362,6 +363,9 @@
362 363 color: #232323;
363 364 }
364 365 }
  366 +.cardHome:last-child {
  367 + margin-bottom: 20px;
  368 +}
365 369 .other-business {
366 370 .scroll-view_H {
367 371 white-space: nowrap;
... ...
lvdao-miniapp/pages/home/home.vue
  View file @e3789a7
... ... @@ -229,7 +229,7 @@
229 229 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
230 230 <view v-for="(item, index) in tableData" :key="index" class="scroll-view-item_H" @click="details(item)">
231 231 <view class="business-card">
232   - <u-image :showLoading="true" :src="imgurl + (item.displayMainImage || item.locationDiagram || item.displayImage) | getimgurl" width="100%" height="210rpx"></u-image>
  232 + <u-image :showLoading="true" :src="imgurl + (item.displayMainImage || item.locationDiagram || item.displayImage) | getimgurl" width="100%" height="210rpx" border-radius="20"></u-image>
233 233 <view class="business-card-title">
234 234 {{ item.shopName || item.advertisingName || item.venueName}}
235 235 </view>
... ... @@ -258,7 +258,7 @@
258 258 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
259 259 <view v-for="(item, index) in activity" :key="index" class="scroll-view-item_H" @click="toDetail(item.id, '/pages/activityDetail/activityDetail')" >
260 260 <view class="business-card">
261   - <u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx"></u-image>
  261 + <u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx" border-radius="20"></u-image>
262 262 <view class="business-card-title">
263 263 {{item.activityName || '标题'}}
264 264 </view>
... ... @@ -281,7 +281,7 @@
281 281 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
282 282 <view v-for="(item, index) in yingxiaoData" :key="item.id" class="scroll-view-item_H" @click="toDetail(item.id, '/pages/marketing/marketingDetail/marketingDetail')">
283 283 <view class="business-card">
284   - <u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx"></u-image>
  284 + <u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx" border-radius="20"></u-image>
285 285 <view class="business-card-title">
286 286 {{item.title}}
287 287 </view>
... ... @@ -303,7 +303,7 @@
303 303 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120" >
304 304 <view v-for="(item, index) in shangwuData" :key="item.id" class="scroll-view-item_H" @click="toDetailTwo(item, '/pages/business/businessDetail/businessDetail')">
305 305 <view class="business-card">
306   - <u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx"></u-image>
  306 + <u-image :showLoading="true" :src="imgurl+item.coverImage" width="100%" height="210rpx" border-radius="20"></u-image>
307 307 <view class="business-card-title">
308 308 {{item.title}}
309 309 </view>
... ...
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss
  View file @e3789a7
... ... @@ -69,7 +69,7 @@
69 69 padding-bottom: constant(safe-area-inset-bottom);
70 70 padding-bottom: env(safe-area-inset-bottom);
71 71 .footer-btn {
72   - // padding: 0 10%;
  72 + padding: 0 20px;
73 73 margin-top: 20rpx;
74 74 }
75 75 .footer-service {
... ...
lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue
  View file @e3789a7
... ... @@ -26,13 +26,13 @@
26 26  
27 27 <!-- 底部 -->
28 28 <view style="height: 125rpx;"></view>
29   - <view class="page-footer">
  29 + <view class="page-footer" v-if="tableData.activeState == 1">
30 30 <!-- <view class="footer-service">
31 31 <u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')" width="30rpx" height="30rpx"></u-image>
32 32 <text>客服</text>
33 33 </view> -->
34 34 <view class="footer-btn">
35   - <u-button type="success" style="width:90%" @click="baoShow">报名参加</u-button>
  35 + <u-button type="success" @click="baoShow">报名参加</u-button>
36 36 </view>
37 37 <!-- <view class="footer-service">
38 38 <u-image :showLoading="true" :src="$imgUrl('/share-icon.png')" width="30rpx" height="30rpx"></u-image>
... ...
lvdao-miniapp/pages/my/my.vue
  View file @e3789a7
... ... @@ -48,7 +48,7 @@
48 48 </view>
49 49 <view class="my-service">
50 50 <view class="service-list">
51   - <view class="service-list-list">
  51 + <!-- <view class="service-list-list">
52 52 <view class="thumb">
53 53 <text v-if="Islogin">0</text>
54 54 <text v-else>{{wenjuanNum}}</text>
... ... @@ -56,7 +56,7 @@
56 56 <view class="name" @click="questionnaire">
57 57 <text>我的问卷</text>
58 58 </view>
59   - </view>
  59 + </view> -->
60 60 <view class="service-list-list">
61 61 <view class="thumb">
62 62 <text v-if="Islogin">0</text>
... ...
lvdao-miniapp/pages/mycreated/mycreated.scss
  View file @e3789a7
... ... @@ -64,6 +64,7 @@
64 64 margin-bottom: 24rpx;
65 65 .body {
66 66 display: flex;
  67 + justify-content: space-between;
67 68 width: 100%;
68 69 height: calc(100% - 70rpx);
69 70 padding: 15rpx 18rpx;
... ...
lvdao-miniapp/pages/mycreated/mycreated.vue
  View file @e3789a7
... ... @@ -10,13 +10,15 @@
10 10 <u-button type="success" @click="search">搜索</u-button>
11 11 </view> -->
12 12 <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
13   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  13 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
14 14 </view>
15 15 <view class="goods-data">
16 16 <view class="goods-list">
17 17 <view class="good-item" v-for="(v, i) in datalist" :key="i">
18 18 <view class="body">
19   - <u-image width="40%" :src="$img+v.coverImage" border-radius="10" mode="widthFix" style="margin-top:8px;margin-right:8px;" ></u-image>
  19 +
  20 + <u-image width="260rpx" height="180rpx" :src="imgurl+v.coverImage" borderRadius="10" mode="heightFix" style="margin-top:3px;margin-right:8px;" ></u-image>
  21 +
20 22 <!-- <image :src="$img+v.coverImage" style="border-raidus"></image> -->
21 23 <view class="info">
22 24 <view class="title">{{v.activityName}}</view>
... ... @@ -79,12 +81,14 @@
79 81 pageNumber: 0,
80 82 pageSize: 10,
81 83 createUser:uni.getStorageSync('user').phone
82   - }
  84 + },
  85 + imgurl:''
83 86 };
84 87 },
85 88 onLoad(option) {
86 89 this.num = option.id;
87 90 this.statuslist = 'nomore';
  91 + this.imgurl = this.$img
88 92 },
89 93  
90 94 // onPullDownRefresh(e) {
... ...
lvdao-miniapp/pages/participation/participation.vue
  View file @e3789a7
... ... @@ -14,7 +14,7 @@
14 14 <u-button type="success" @click="search">搜索</u-button>
15 15 </view> -->
16 16 <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
17   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  17 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
18 18 </view>
19 19 <view class="screen-list">
20 20 <u-dropdown menu-icon="arrow-down-fill" :title-size="24" :height="40">
... ...
lvdao-miniapp/pages/questionnaire/questionnaire.vue
  View file @e3789a7
... ... @@ -5,7 +5,7 @@
5 5 <u-button type="success" @click="search">搜索</u-button>
6 6 </view> -->
7 7 <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
8   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  8 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
9 9 </view>
10 10 <view class="screen-list">
11 11 <view class="list" @click="show = true">
... ...
lvdao-miniapp/pages/record/record.scss
  View file @e3789a7
... ... @@ -26,7 +26,7 @@
26 26 justify-content: center;
27 27 align-items: center;
28 28 // width: 30%;
29   - height: 100%;
  29 + height: 32px;
30 30 background-color: #fff;
31 31 padding: 10rpx 16rpx;
32 32 border-radius: 18rpx;
... ...
lvdao-miniapp/pages/serve/jiDed.vue
  View file @e3789a7
... ... @@ -23,7 +23,10 @@
23 23 <view style="padding: 10px 0; border-bottom: #eee solid 1rpx;">{{record.estimate || '无'}}</view>
24 24 <view style="padding: 5px 0;line-height: 36px;">现场照片</view>
25 25 <view class="imgList">
26   - <u-image width="48%" height="280" border-radius="10" :src="$img+item" v-for="(item,index) in this.record.onSitePhoto"></u-image>
  26 + <view style="width: 48%;" v-for="(item,index) in record.onSitePhoto" :key="index">
  27 + <u-image width="100%" height="280" border-radius="10" :src="srcUrl+item" ></u-image>
  28 + </view>
  29 +
27 30 </view>
28 31 </view>
29 32  
... ... @@ -36,11 +39,12 @@
36 39 data() {
37 40 return {
38 41 record:{},
  42 + srcUrl:''
39 43 }
40 44 },
41 45 onLoad(options) {
  46 + this.srcUrl = this.$img
42 47 const item = JSON.parse(decodeURIComponent(options.item));
43   - console.log('Received item:', item);
44 48 this.record = item
45 49 if(typeof this.record.onSitePhoto == 'string'){
46 50 this.record.onSitePhoto = this.record.onSitePhoto.split(',')
... ... @@ -58,7 +62,6 @@
58 62 left: 0;
59 63 top: 0;
60 64 width: 100%;
61   - height: 100%;
62 65 padding: 0 24rpx;
63 66 }
64 67 /* 记录列表 */
... ...
lvdao-miniapp/pages/serve/serve.scss
  View file @e3789a7
... ... @@ -26,7 +26,7 @@
26 26 justify-content: center;
27 27 align-items: center;
28 28 // width: 30%;
29   - height: 100%;
  29 + height: 32px;
30 30 background-color: #fff;
31 31 padding: 10rpx 16rpx;
32 32 border-radius: 18rpx;
... ...
lvdao-miniapp/pages/shops/shops.scss
  View file @e3789a7
... ... @@ -137,7 +137,7 @@
137 137 .retail-price {
138 138 display: flex;
139 139 align-items: flex-end;
140   - width: 100%;
  140 + width: 50%;
141 141 color: #676767;
142 142 font-size: 24rpx;
143 143 .min {
... ...
lvdao-miniapp/pages/shops/shops.vue
  View file @e3789a7
... ... @@ -6,7 +6,7 @@
6 6 <u-button type="success" @click="search" style="height:32px;">搜索</u-button>
7 7 </view> -->
8 8 <view style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;" >
9   - <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="pagesize.title" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
  9 + <u-search :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}" bg-color="#fff" placeholder="请输入关键词" v-model="query.shopName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search>
10 10 </view>
11 11 <view class="screen-list">
12 12 <view class="list" @click="show = true">
... ... @@ -49,7 +49,11 @@
49 49 <text class="one-omit">{{item.detailedLocation}}</text>
50 50 </view>
51 51 <view class="like-goods">
52   - <view class="retail-price" v-if="item.actualUsableArea">
  52 + <view class="retail-price" v-if="item.belongingRegion">
  53 + <text>所属区域:</text>
  54 + <text class="max">{{item.belongingRegion}}</text>
  55 + </view>
  56 + <view class="retail-price" >
53 57 <!-- <text>租金:</text>
54 58 <text class="min">￥</text>
55 59 <text class="max">{{item.id * 10}}</text>
... ... @@ -57,7 +61,7 @@
57 61 <text class="line"></text> -->
58 62 <text>面积:</text>
59 63 <text class="max">{{item.actualUsableArea}}</text>
60   - <text class="min">/m²</text>
  64 + <text class="min" >/m²</text>
61 65 </view>
62 66 </view>
63 67 </view>
... ... @@ -67,13 +71,6 @@
67 71 <u-popup v-model="zidongS" mode="center" width="90%" border-radius="20" :mask-close-able="false" :closeable="true" close-icon-pos="top-right">
68 72 <view class="zulinY">
69 73 <view style="font-size: 32rpx;font-weight: 600;margin-bottom: 20rpx;">请填写您的租赁意向</view>
70   - <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
71   - <text class="sc" style="color: #979797;font-size: 30rpx;">意向租赁管理</text>
72   - <view @click="showS(1)">
73   - <text class="mc" style="margin-right: 10rpx;"> {{formList.zulei ==''?'请选择':formList.zulei}}</text>
74   - <u-icon name="arrow-down"></u-icon>
75   - </view>
76   - </view>
77 74 <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
78 75 <text class="sc" style="color: #979797;font-size: 30rpx;">意向区域</text>
79 76 <view @click="showS(2)">
... ... @@ -81,20 +78,13 @@
81 78 <u-icon name="arrow-down"></u-icon>
82 79 </view>
83 80 </view>
84   - <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
85   - <text class="sc" style="color: #979797;font-size: 30rpx;">意向租期</text>
86   - <view @click="showS(3)">
87   - <text class="mc" style="margin-right: 10rpx;"> {{formList.zuqi ==''?'请选择':formList.zuqi}}</text>
88   - <u-icon name="arrow-down"></u-icon>
89   - </view>
90   - </view>
91   - <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
92   - <text class="sc" style="color: #979797;font-size: 30rpx;">意向租金</text>
  81 + <!-- <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
  82 + <text class="sc" style="color: #979797;font-size: 30rpx;">意向租金(月)</text>
93 83 <view @click="showS(4)">
94 84 <text class="mc" style="margin-right: 10rpx;"> {{formList.zujin ==''?'请选择':formList.zujin}}</text>
95 85 <u-icon name="arrow-down"></u-icon>
96 86 </view>
97   - </view>
  87 + </view> -->
98 88 <view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
99 89 <text class="sc" style="color: #979797;font-size: 30rpx;">意向面积</text>
100 90 <view @click="showS(5)">
... ... @@ -118,7 +108,7 @@
118 108 确定
119 109 </view>
120 110 </view>
121   - <u-select v-model="show" :list="companys" @confirm="handleCompanyConfirm" mini borderless></u-select>
  111 + <u-select v-model="showList" :list="companys" @confirm="handleCompanyConfirm" mini borderless></u-select>
122 112  
123 113 </u-popup>
124 114  
... ... @@ -153,7 +143,7 @@
153 143 {value: '温江区', label: '温江区'},
154 144 ], // 区域列表
155 145  
156   -
  146 + showList:false,
157 147 zidongS: false,
158 148 formList: {
159 149 zulei: '',
... ... @@ -163,17 +153,13 @@
163 153 mianji:'',
164 154 name:'',
165 155 phone:'',
166   - pageNumber: 1,
  156 + pageNumber: 0,
167 157 pageSize: 10,
  158 + publishStatus:2
168 159 },
169 160 showSex: false,
170 161 show:false,
171 162 index:1,
172   - zujinList:[
173   - {price:'4800'},
174   - {price:'3400'},
175   - {price:'3000'}
176   - ],
177 163 companys: [
178 164 {
179 165 value: '1',
... ... @@ -330,7 +316,7 @@
330 316 }
331 317 ]
332 318 }
333   - this.show = true
  319 + this.showList = true
334 320 },
335 321 handleCompanyConfirm(e){
336 322 if(this.index == 1){
... ... @@ -368,7 +354,7 @@
368 354 },
369 355 confirm(val){
370 356 let page = {
371   - pageNumber: 1,
  357 + pageNumber: 0,
372 358 pageSize: 10,
373 359 belongingRegion:val[0].label
374 360 }
... ... @@ -396,8 +382,9 @@
396 382 mianji:'',
397 383 name:'',
398 384 phone:'',
399   - pageNumber: 1,
  385 + pageNumber: 0,
400 386 pageSize: 10,
  387 + publishStatus:2
401 388  
402 389 }
403 390 this.zidongS = false
... ...
lvdao-miniapp/pages/workbench/workbench.scss
  View file @e3789a7
... ... @@ -3,7 +3,7 @@
3 3 left: 0;
4 4 top: 0;
5 5 width: 100%;
6   - height: 100%;
  6 + min-height: 100vh;
7 7 }
8 8 .my-top{
9 9 position: absolute;
... ... @@ -74,13 +74,14 @@
74 74 .main {
75 75 position: relative;
76 76 top: 90rpx;
77   - padding-bottom: 20px;
  77 +
78 78 /* #ifdef MP */
79 79 top: 170rpx;
80   - padding-bottom: 20px;
  80 +
81 81 /* #endif */
82 82 margin: 0 20rpx;
83 83 }
  84 +
84 85 .banner {
85 86 height: 330rpx;
86 87 image {
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @e3789a7
... ... @@ -13,7 +13,7 @@
13 13 <view class="setting-mess"></view>
14 14 </view>
15 15 </view>
16   - <view class="main">
  16 + <!-- <view class="main">
17 17 <view class="bg-white" v-for="item in pageList1" :key="item.id">
18 18 <view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view>
19 19 <view class="wallet-info">
... ... @@ -27,7 +27,7 @@
27 27 </view>
28 28 </view>
29 29 </view>
30   - </view>
  30 + </view> -->
31 31 <view class="main">
32 32 <view class="bg-white" v-for="item in pageList2" :key="item.id">
33 33 <view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view>
... ... @@ -58,6 +58,21 @@
58 58 </view>
59 59 </view>
60 60 </view>
  61 + <view class="main">
  62 + <view class="bg-white" v-for="item in pageList4" :key="item.id">
  63 + <view class="bidding-title"><view class="bidding-title-line"></view>{{item.title}}</view>
  64 + <view class="wallet-info">
  65 + <view class="list" v-for="v in item.children" :key="v.name" @click="toPath(v.path)">
  66 + <view class="icon">
  67 + <image :src="$imgUrl(`${v.img}`)"></image>
  68 + </view>
  69 + <view class="title">
  70 + <text>{{v.name}}</text>
  71 + </view>
  72 + </view>
  73 + </view>
  74 + </view>
  75 + </view>
61 76 <!-- tabbar -->
62 77 <tabbar :tabBarShow="1"></tabbar>
63 78 </view>
... ... @@ -72,17 +87,14 @@
72 87 data() {
73 88 return {
74 89 pageList1: [
75   - {
76   - id: 1,
77   - title: '招商服务',
78   - children: [
79   - { name: '问卷调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
80   - { name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' },
81   - // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
82   - // { name: '活动参与', img: '/workbench3.png', path: '/pages/participation/participation' },
83   - // { name: '我的活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
84   - ]
85   - },
  90 + // {
  91 + // id: 1,
  92 + // title: '招商服务',
  93 + // children: [
  94 + // { name: '问卷调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
  95 + // { name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' },
  96 + // ]
  97 + // },
86 98 // {
87 99 // id: 2,
88 100 // title: '推广策划',
... ... @@ -117,13 +129,13 @@
117 129 pageList2: [
118 130 {
119 131 id: 1,
120   - title: '活动管理',
  132 + title: '活动与意向申请',
121 133 children: [
122 134 // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
123 135 // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
124 136 { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' },
125 137 { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
126   - // { name: '销售上报', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' },
  138 + { name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' },
127 139 ]
128 140 },
129 141 ],
... ... @@ -141,6 +153,19 @@
141 153 ]
142 154 },
143 155 ],
  156 + pageList4: [
  157 + {
  158 + id: 1,
  159 + title: '商铺缴费',
  160 + children: [
  161 + // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' },
  162 + // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
  163 + // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' },
  164 + // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' },
  165 + { name: '租金缴费', img: '/workbench1.png', path: '/pagesA/rentPay/rentPay' },
  166 + ]
  167 + },
  168 + ],
144 169 scrollTop: 0,
145 170 };
146 171 },
... ...
lvdao-miniapp/pagesA/myZiyuan/addMyshop.vue
  View file @e3789a7
... ... @@ -86,7 +86,7 @@
86 86  
87 87  
88 88  
89   - <view class="item">
  89 + <view class="item" style="margin-bottom: 60px;">
90 90 <view class="contents" style="background-color:#fff;padding:10px 20px;">
91 91 <view class="feedback-data">
92 92 <view>
... ... @@ -138,7 +138,7 @@
138 138 // this.ruleForm.shopPhotos = shopPhotos
139 139 this.ruleForm.shopPhotos.map((item,index)=>{
140 140 let obj = {
141   - url:item
  141 + url:this.$img+item
142 142 }
143 143  
144 144 this.fist.push(obj)
... ... @@ -147,7 +147,7 @@
147 147 // this.fileList = this.ruleForm.shopPhotos
148 148 this.edit =true
149 149 }
150   - console.log(this.ruleForm,this.fist)
  150 +
151 151 if(options.ids){
152 152 this.ruleForm.contractId = options.ids
153 153 }
... ... @@ -219,11 +219,11 @@
219 219 if(show == false){
220 220 return
221 221 }
222   - this.ruleForm.shopPhotos.map(item=>{
223   - item = item.replace(this.$img,'')
224   - })
  222 + this.ruleForm.shopPhotos = this.ruleForm.shopPhotos.map(item=>{
  223 + return item.replace(this.$img,'');
  224 + })
  225 +
225 226  
226   - // return
227 227 this.ruleForm.applicationTime = this.currentTime()
228 228 let info = {
229 229 ...this.ruleForm,
... ... @@ -282,28 +282,32 @@
282 282 return strDate;
283 283 },
284 284 onsuccess1(e, file, fileList, ziduan) {
285   - console.error(e, file, fileList, ziduan)
  285 +
  286 + let index = 0
  287 + if(this.ruleForm.shopPhotos.length !=0){
  288 + index = this.ruleForm.shopPhotos.length
  289 + }
  290 +
286 291 uni.uploadFile({
287 292 url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
288   - filePath: e[0].url,
  293 + filePath: e[index].url,
289 294 name: 'file', // 后端接收的文件参数名
290 295 formData: {
291 296 filePath: 'xcx', // 其他表单数据
292 297 },
293 298 success: (uploadFileRes) => {
294   - console.log(this.fist)
  299 +
  300 +
295 301 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)
  302 +
300 303 uni.showToast({
301 304 title: '上传成功',
302 305 icon: 'success',
303 306 });
304 307 },
305 308 fail: (err) => {
306   - console.error('上传失败', err);
  309 + console.log('上传失败',this.fist)
  310 +
307 311 uni.showToast({
308 312 title: '上传失败',
309 313 icon: 'none',
... ... @@ -325,7 +329,6 @@
325 329 left: 0;
326 330 top: 0;
327 331 width: 100%;
328   - height: 100%;
329 332 background-color: #f6f6f6;
330 333 }
331 334  
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @e3789a7
... ... @@ -112,7 +112,7 @@
112 112 </u-read-more>
113 113 </view>
114 114  
115   - <view class="msglist" v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:65px;">
  115 + <view class="msglist" v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:80px;">
116 116  
117 117  
118 118 <view class="form-item">
... ... @@ -145,24 +145,24 @@
145 145 <view class="label">店内照片</view>
146 146 </view>
147 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>
  148 + <view style="width: 48%;" v-for="(item,index) in myshopMsg.shopPhotos" :key="index">
  149 + <u-image class="image-item" width="100%" height="180rpx" border-raduis="10" :src="imgurl+item" ></u-image>
  150 + </view>
  151 +
149 152  
150 153 </view>
151 154 </view>
152 155  
153   - <view class="msglist" v-if="mapType == '广告位'" style="margin-bottom:65px;">
  156 + <view class="msglist" v-if="mapType == '广告位'" style="margin-bottom:80px;">
154 157 <view class="form-item">
155 158 <view class="label">投放内容</view>
156 159 </view>
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="imgurl+record.coverImage" ></u-image>
  160 +
  161 + <u-image class="image-item" width="100%" border-raduis="10" mode="heightFix" height="300rpx" :src="imgurl+record.coverImage" ></u-image>
162 162  
163 163  
164 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>
  165 + <view style="margin-bottom: 80px;" v-if="btnShow && mapType == '商铺'"><u-button @click="xiuMsg(1)" shape="circle" :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>
166 166 <view class="page-footer">
167 167 <u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;" @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')"
168 168 >申请退租</u-button>
... ... @@ -209,7 +209,7 @@
209 209 onLoad(options) {
210 210 this.imgurl = this.$img
211 211 const item = JSON.parse(decodeURIComponent(options.item));
212   - console.log('Received item:', item);
  212 +
213 213 this.record = item
214 214 let pageHe={
215 215 pageNumber: 0,
... ... @@ -243,8 +243,8 @@
243 243 this.btnShow = false
244 244 this.myshopMsg = res.data.data.content[0]
245 245 this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
246   -
247   - this.myshopMimgurlhopPhotos.map(item=>{
  246 + console.log(this.myshopMsg.shopPhotos)
  247 + this.myshopMsg.shopPhotos.map(item=>{
248 248 item = this.imgurl + item
249 249 })
250 250  
... ... @@ -259,7 +259,7 @@
259 259 })
260 260 },
261 261 xufirm(){
262   - console.log('11111s')
  262 +
263 263 this.xuForm.createUser = uni.getStorageSync('user').phone
264 264 this.xuForm.createTime = this.getCurrentTime()
265 265 this.xuForm.contractId = Number(this.heData.id)
... ... @@ -465,11 +465,9 @@
465 465 display: flex;
466 466 align-items: center;
467 467 width: 100%;
468   - height: 125rpx;
469 468 background-color: #FFFFFF;
470   - padding-bottom: constant(safe-area-inset-bottom);
471   - padding-bottom: env(safe-area-inset-bottom);
472 469 z-index: 20;
  470 + padding: 15px 0;
473 471 .footer-buy{
474 472 display: flex;
475 473 align-items: center;
... ... @@ -491,6 +489,7 @@
491 489 }
492 490 }
493 491 .image-container {
  492 + padding: 10rpx 0;
494 493 display: flex;
495 494 flex-wrap: wrap; /* 启用换行 */
496 495 justify-content: space-between; /* 图片之间均匀分布 */
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
  View file @e3789a7
... ... @@ -3,7 +3,6 @@
3 3 left: 0;
4 4 top: 0;
5 5 width: 100%;
6   - height: 100%;
7 6 }
8 7 .screen-list {
9 8 display: flex;
... ... @@ -25,7 +24,7 @@
25 24 justify-content: center;
26 25 align-items: center;
27 26 width: 30%;
28   - height: 100%;
  27 + height: 32px;
29 28 background-color: #fff;
30 29 padding: 0rpx 15px;
31 30 border-radius: 18rpx;
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
  View file @e3789a7
... ... @@ -54,12 +54,12 @@
54 54 //成功回调
55 55 this.recordList = res.data.data.content
56 56 this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
57   - console.log(item.data.data.content.length)
58   - if(item.data.data.content.length !=0){
  57 +
  58 + if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
59 59 item.data.data.content.map(val=>{
60 60 this.recordList.push(val)
61 61 })
62   - }
  62 + }
63 63  
64 64  
65 65 })
... ...
lvdao-miniapp/pagesA/rentPay/goPay.vue 0 → 100644
  View file @e3789a7
  1 +<template>
  2 + <view class="page">
  3 + <view class="timsg">
  4 + <view class="msgtitle">您正在成都锦江绿道有限公司支付金额</view>
  5 + <view class="price">
  6 + <u-icon name="rmb" style="font-size: 24rpx;" />
  7 + 800
  8 + </view>
  9 + </view>
  10 + <view style="height: 120rpx;"></view>
  11 + <view class="page-footer">
  12 + <u-button style="width: 100%;border-radius: 15px;" type="success" @click="submit">支付</u-button>
  13 + </view>
  14 + </view>
  15 +</template>
  16 +
  17 +<script>
  18 + export default {
  19 + data() {
  20 + return {
  21 + }
  22 + },
  23 + onShow() {
  24 + const isLogin = uni.getStorageSync('token');
  25 + if (isLogin == '') {
  26 + // 如果未登录，跳转到登录页面
  27 + uni.navigateTo({
  28 + url: '/pages/login/login'
  29 + })
  30 + } else {
  31 +
  32 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
  33 + if(res.data.code == '20004' || res.data.code == '20003'){
  34 + uni.navigateTo({
  35 + url: '/pages/login/login'
  36 + })
  37 + }
  38 + })
  39 + }
  40 +
  41 + },
  42 + methods: {
  43 + submit(){
  44 +
  45 + }
  46 + }
  47 +}
  48 +
  49 +</script>
  50 +
  51 +<style scoped lang="scss">
  52 + .page{
  53 + position: absolute;
  54 + left: 0;
  55 + top: 0;
  56 + width: 100%;
  57 + height: 100%;
  58 + padding: 0 20rpx;
  59 + }
  60 + .timsg{
  61 + height:20vh;
  62 + text-align: center;
  63 + padding: 50px 0;
  64 + .msgtitle{
  65 + margin-bottom: 20px;
  66 + font-size: 30rpx;
  67 + color: #A4A4A4;
  68 + }
  69 + .price {
  70 + color: #0FBB59;
  71 + font-size: 50rpx;
  72 + font-weight: 700;
  73 + }
  74 + }
  75 + .page-footer{
  76 + position: fixed;
  77 + left: 0;
  78 + bottom: 0;
  79 + width: 100%;
  80 +
  81 + background-color: #FFFFFF;
  82 + padding: 20rpx 20rpx;
  83 + padding-bottom: constant(safe-area-inset-bottom);
  84 + padding-bottom: env(safe-area-inset-bottom);
  85 + z-index: 999;
  86 +
  87 + }
  88 +</style>
0 89 \ No newline at end of file
... ...
lvdao-miniapp/pagesA/rentPay/rentPay.scss 0 → 100644
  View file @e3789a7
  1 +.page{
  2 + position: absolute;
  3 + left: 0;
  4 + top: 0;
  5 + width: 100%;
  6 + height: 100%;
  7 + padding: 0 20rpx;
  8 +}
  9 +.search-box {
  10 + background-color: #FFFFFF;
  11 + border-radius: 20rpx;
  12 + padding: 20rpx 30rpx;
  13 + margin-top: 26rpx;
  14 +
  15 +}
  16 +.search-total {
  17 + background-color: #FFFFFF;
  18 + border-radius: 20rpx;
  19 + padding: 40rpx;
  20 + margin-top: 26rpx;
  21 + display: flex;
  22 + flex-direction: row;
  23 + align-items: flex-end;
  24 + justify-content: space-between;
  25 + font-size: 24rpx;
  26 +
  27 + .left {
  28 + color: #757575;
  29 + .price-total {
  30 + color: #0FBB59;
  31 + font-size: 50rpx;
  32 + font-weight: 700;
  33 + margin-bottom: 10rpx;
  34 + }
  35 + }
  36 + .right {
  37 + width: 30vw;
  38 + text-align: right;
  39 + }
  40 + }
  41 +.price {
  42 + color: #0FBB59;
  43 + font-size: 32rpx;
  44 + font-weight: 700;
  45 +}
  46 +/* 记录列表 */
  47 +.record-list{
  48 + margin-top: 20rpx;
  49 + // margin: 0 20rpx;
  50 + .record-list-box {
  51 + background-color: #FFFFFF;
  52 + border-radius: 20rpx;
  53 + padding: 20rpx 30rpx;
  54 + margin-bottom: 20rpx;
  55 + width: 100%;
  56 + .list {
  57 + width: 100%;
  58 + display: flex;
  59 + padding: 20rpx 30rpx;
  60 + border-bottom: #f6f6f6 solid 1rpx;
  61 + align-items: center;
  62 + .list-item {
  63 + flex: 1;
  64 + }
  65 +
  66 + .list-info {
  67 + display: flex;
  68 + align-items: center;
  69 + .img {
  70 + width: 72rpx;
  71 + height: 72rpx;
  72 + border-radius: 50%;
  73 + overflow: hidden;
  74 + image {
  75 + width: 100%;
  76 + height: 100%;
  77 + }
  78 + }
  79 + .info-items {
  80 + margin-left: 20rpx;
  81 + .info-title {
  82 + font-size: 30rpx;
  83 + line-height: 40rpx;
  84 + margin-bottom: 20rpx;
  85 + }
  86 +
  87 + }
  88 + }
  89 +
  90 + }
  91 + }
  92 +}
  93 +.page-footer{
  94 + position: fixed;
  95 + left: 0;
  96 + bottom: 0;
  97 + width: 100%;
  98 + background-color: #FFFFFF;
  99 + padding: 10rpx 20rpx;
  100 + padding-bottom: constant(safe-area-inset-bottom);
  101 + padding-bottom: env(safe-area-inset-bottom);
  102 + z-index: 999;
  103 + .footer-buy{
  104 + display: flex;
  105 + align-items: center;
  106 + justify-content: space-between;
  107 + width: 100%;
  108 + height: 100%;
  109 + .cart-add{
  110 + align-items: center;
  111 + display: flex;
  112 + min-width: 20%;
  113 + height: 70rpx;
  114 + }
  115 + .buttons{
  116 + font-size: 30rpx;
  117 +
  118 + margin: 0 10rpx !important;
  119 + height: 32px !important;
  120 + border-radius: 10rpx !important;
  121 + margin-top: 20rpx !important;
  122 +}
  123 +.u-size-default.data-v-3bf2dba7 {
  124 + font-size: 30rpx;
  125 + height: 100% !important;
  126 + line-height: 200% !important;
  127 +}
  128 +
  129 + }
  130 +}
... ...
lvdao-miniapp/pagesA/rentPay/rentPay.vue 0 → 100644
  View file @e3789a7
  1 +<template>
  2 + <view class="page">
  3 + <view class="search-box">
  4 + <view>
  5 + <u-input v-model="value" type="select" @click="show = true" style="background-color: #fff;" placeholder="-" :border="false"/>
  6 + <u-select v-model="show" :list="list1" @confirm="confirm"></u-select>
  7 + </view>
  8 +
  9 + </view>
  10 + <view class="search-total">
  11 + <view class="left">
  12 + <view class="price-total"><u-icon name="rmb" style="font-size: 24rpx;" />100.00</view>
  13 + <view>（当前租金欠费金额)</view>
  14 + </view>
  15 + <div class="right" @click='toDetail'>
  16 + <view>缴费记录 <u-icon name="arrow-right" size="28" /></view>
  17 + </div>
  18 +
  19 + </view>
  20 + <view style="text-align: center;color:#0EBB5A;padding: 30rpx 0;">每月1日为付款日</view>
  21 + <!-- 记录列表 -->
  22 + <view class="record-list">
  23 + <view class="record-list-box" v-for="(item,index) in recordList" :key="index">
  24 + <u-checkbox-group class="list-group" style="width: 100%;" >
  25 + <view class="list">
  26 + <u-checkbox v-model="recordList[index].gouxuan" shape="circle" :label-disabled="false" active-color="#0EBB5A" @change="xuanAll(item,$event)"/>
  27 +
  28 + <view class="list-item">
  29 + <view class="list-info">
  30 + <view class="info-items">
  31 + <view class="info-title">{{item.name}}：</view>
  32 + <view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.price}}</view>
  33 + </view>
  34 + </view>
  35 + </view>
  36 + </view>
  37 +
  38 + </u-checkbox-group>
  39 + </view>
  40 + </view>
  41 + <view style="height: 120rpx;"></view>
  42 + <view class="page-footer">
  43 + <view class="footer-buy">
  44 + <u-checkbox-group >
  45 + <u-checkbox
  46 + shape="circle"
  47 + @change="quanxuan"
  48 + v-model="showAll"
  49 + active-color="#0EBB5A"
  50 + >全选</u-checkbox>
  51 + </u-checkbox-group>
  52 + <view class="cart-add">
  53 + 合计：<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{payAll}}</view>
  54 + </view>
  55 + <u-button type="success" class="buttons" @click="joinShow" size="mini">去支付</u-button>
  56 + </view>
  57 + </view>
  58 + <!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> -->
  59 + </view>
  60 +
  61 +</template>
  62 +
  63 +<script>
  64 + export default {
  65 + data() {
  66 + return {
  67 + show: false,
  68 + payAll:0,
  69 + value: '',
  70 + list1: [{ value: '0', label: '全部' },{ value: '1', label: '物业费' }, { value: '2', label: '水费' },{ value: '3', label: '卫生费' }, { value: '4', label: '燃气费' },{ value: '5', label: '电费' } ],
  71 + checked: [],
  72 + recordList:[
  73 + {
  74 + img: '',
  75 + name: '物业费',
  76 + price: 1500,
  77 + rate: '100%',
  78 + chilren: [],
  79 + showItem: false,
  80 + gouxuan:false
  81 + },
  82 + {
  83 + img: '',
  84 + name: '卫生费',
  85 + price: 5000,
  86 + rate: '100%',
  87 + chilren: [],
  88 + showItem: false,
  89 + gouxuan:false
  90 + },
  91 + {
  92 + img: '',
  93 + name: '水费',
  94 + price: 2000,
  95 + rate: '100%',
  96 + chilren: [],
  97 + showItem: false,
  98 + gouxuan:false
  99 + }
  100 + ],
  101 + recordList1:[
  102 + {
  103 + img: '',
  104 + name: '物业费',
  105 + price: 15,
  106 + rate: '100%',
  107 + chilren: [],
  108 + showItem: false,
  109 + gouxuan:false
  110 + },
  111 + {
  112 + img: '',
  113 + name: '卫生费',
  114 + price: 15,
  115 + rate: '100%',
  116 + chilren: [],
  117 + showItem: false,
  118 + gouxuan:false
  119 + },
  120 + {
  121 + img: '',
  122 + name: '水费',
  123 + price: 15,
  124 + rate: '100%',
  125 + chilren: [],
  126 + showItem: false,
  127 + gouxuan:false
  128 + },
  129 + {
  130 + img: '',
  131 + name: '电费',
  132 + price: 15,
  133 + rate: '100%',
  134 + chilren: [],
  135 + showItem: false,
  136 + gouxuan:false
  137 + },
  138 + {
  139 + img: '',
  140 + name: '燃气费',
  141 + price: 15,
  142 + rate: '100%',
  143 + chilren: [],
  144 + showItem: false,
  145 + gouxuan:false
  146 + },
  147 + ],
  148 +
  149 + loadShow:false,
  150 + showAll:false,
  151 +
  152 + };
  153 + },
  154 + watch:{
  155 + recordList:{
  156 + deep:true,
  157 + handler(newVal){
  158 + const allTrue = this.recordList.every(item => item.gouxuan)
  159 + this.showAll = allTrue
  160 + }
  161 + }
  162 + },
  163 + onShow() {
  164 + const isLogin = uni.getStorageSync('token');
  165 + if (isLogin == '') {
  166 + // 如果未登录，跳转到登录页面
  167 + uni.navigateTo({
  168 + url: '/pages/login/login'
  169 + })
  170 + } else {
  171 +
  172 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
  173 + if(res.data.code == '20004' || res.data.code == '20003'){
  174 + uni.navigateTo({
  175 + url: '/pages/login/login'
  176 + })
  177 + }
  178 + })
  179 + }
  180 +
  181 + },
  182 + methods: {
  183 + quanxuan(e){
  184 +
  185 + const allTrue = this.recordList.every(item => item.gouxuan)
  186 + if(allTrue){
  187 + this.payAll= 0
  188 + this.showAll = !this.showAll
  189 + this.recordList.forEach(item => {
  190 + item.gouxuan = !allTrue;
  191 +
  192 + });
  193 + }else{
  194 + this.showAll = true
  195 +
  196 + this.recordList.forEach(item => {
  197 + item.gouxuan = !allTrue;
  198 + this.payAll += item.price
  199 + });
  200 + }
  201 +
  202 +
  203 + },
  204 + xuanAll(item,e){
  205 +
  206 + if(e.value){
  207 + this.payAll += item.price
  208 + }else{
  209 + this.payAll -= item.price
  210 + }
  211 + },
  212 + recordXq(item){
  213 + const encodedItem = encodeURIComponent(JSON.stringify(item));
  214 + uni.navigateTo({
  215 + url: `/pages/accepting/accepting?item=${encodedItem}`,
  216 + })
  217 + },
  218 + toDetail() {
  219 + uni.navigateTo({
  220 + url: '/pagesA/rentPay/rentPayDetails'
  221 + })
  222 + },
  223 + joinShow(){
  224 + if(this.payAll == 0){
  225 + uni.showToast({
  226 + icon: 'error',
  227 + title: '请选择支付订单'
  228 + })
  229 + }else{
  230 + uni.navigateTo({
  231 + url: '/pagesA/rentPay/goPay'
  232 + })
  233 + }
  234 + },
  235 + confirm(e){
  236 + console.log(e)
  237 + let arr =[]
  238 + if(e[0].label == '全部'){
  239 + this.recordList = this.recordList1
  240 + }else{
  241 + this.recordList1.map(item =>{
  242 + if(item.name == e[0].label){
  243 + arr.push(item)
  244 + }
  245 + })
  246 + this.recordList = arr
  247 + }
  248 + this.value = e[0].label
  249 +
  250 + },
  251 + }
  252 + }
  253 +</script>
  254 +
  255 +<style scoped lang="scss">
  256 + @import 'rentPay.scss';
  257 +</style>
... ...
lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss 0 → 100644
  View file @e3789a7
  1 +.page{
  2 + position: absolute;
  3 + left: 0;
  4 + top: 0;
  5 + width: 100%;
  6 + height: 100%;
  7 + padding: 0 30rpx;
  8 +}
  9 +.title-top {
  10 + display: flex;
  11 + align-items: center;
  12 + justify-content: space-between;
  13 + margin: 40rpx 0 16rpx;
  14 + .right {
  15 + font-size: 32rpx;
  16 + font-weight: 700;
  17 + }
  18 +}
  19 +.record-list {
  20 + width: 100%;
  21 + .record-item {
  22 + background-color: #fff;
  23 + padding: 34rpx;
  24 + border-radius: 14rpx;
  25 + margin-bottom: 20rpx;
  26 + .info-title {
  27 + display: flex;
  28 + flex-direction: row;
  29 + align-items: center;
  30 + justify-content: space-between;
  31 + padding-bottom: 20rpx;
  32 + border-bottom: #f6f6f6 solid 1rpx;
  33 + .title {
  34 + font-weight: 700;
  35 + }
  36 + .price {
  37 + font-size: 32rpx;
  38 + font-weight: 700;
  39 + color: #0FBB59;
  40 + }
  41 + }
  42 + .info-items {
  43 + border-bottom: #f6f6f6 solid 1rpx;
  44 + margin-top: 16rpx;
  45 + padding-bottom: 16rpx;
  46 + .info-item {
  47 + width: 100%;
  48 + display: flex;
  49 + flex-direction: row;
  50 + align-items: center;
  51 + justify-content: space-between;
  52 + // line-height: 50rpx;
  53 + padding: 8rpx 10rpx;
  54 + .title {
  55 + font-weight: 700;
  56 + }
  57 + .price {
  58 + font-size: 28rpx;
  59 + font-weight: 700;
  60 + color: #0FBB59;
  61 + }
  62 + }
  63 + }
  64 + :last-child {
  65 + border-bottom: unset;
  66 + }
  67 + }
  68 +}
0 69 \ No newline at end of file
... ...
lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue 0 → 100644
  View file @e3789a7
  1 +<template>
  2 + <view class="page">
  3 + <view class="title-top">
  4 + <div class="left">
  5 + <view @click="show = true">{{pageIndex.time}}年<u-icon name="arrow-down"></u-icon></view>
  6 + <u-picker v-model="show" mode="time" :params="{year: true}" @confirm="confirm"></u-picker>
  7 + </div>
  8 + <div class="right"><view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></div>
  9 + </view>
  10 + <view class="record-list">
  11 + <view class="record-item" v-for="(item, index) in dataList" :key="index" >
  12 + <view class="info-title">
  13 + <view class="title">7月</view>
  14 + <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />6451.00</view></view>
  15 + </view>
  16 + <view class="info-items" v-for="(v, i) in item.children" :key="i">
  17 + <view class="info-item">
  18 + <view class="left title">支付订单编号</view>
  19 + <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />500.00</view></view>
  20 + </view>
  21 + <view class="info-item">
  22 + <view class="left" style="color: #0FBB59;">支付成功</view>
  23 + <view class="right" style="color: #8A8A8A;">07.11 15:21</view>
  24 + </view>
  25 + </view>
  26 + </view>
  27 + </view>
  28 + </view>
  29 +</template>
  30 +
  31 +<script>
  32 + export default {
  33 + data() {
  34 + return {
  35 + show: false,
  36 + dataList: [
  37 + {
  38 + children: [{}, {}]
  39 + }
  40 +
  41 + ],
  42 + pageIndex:{
  43 + time:''
  44 + }
  45 + }
  46 + },
  47 + onShow() {
  48 + this.pageIndex.time = this.getCurrentYear()
  49 + },
  50 + methods: {
  51 + getCurrentYear() {
  52 + const year = new Date().getFullYear();
  53 + return `${year}`;
  54 + },
  55 + confirm(e){
  56 +
  57 + this.pageIndex.time = e.year
  58 + }
  59 + }
  60 + }
  61 +</script>
  62 +
  63 +<style scoped lang="scss">
  64 + @import 'rentPayDetails.scss';
  65 +</style>
0 66 \ No newline at end of file
... ...