webapp / GreenwayWeb

Commit 2210df3056c193d3b661724c80575de4fe395f4b

Authored by wesley88
1 parent 8b1196f9

1

Inline Side-by-side
Showing 50 changed files with 395 additions and 313 deletions
admin-web-master/src/components/add/addmb.vue
  View file @2210df3
@@ -205,7 +205,7 @@ import { Input } from "element-ui"; @@ -205,7 +205,7 @@ import { Input } from "element-ui";
205 value: '', 205 value: '',
206 }, 206 },
207 { 207 {
208 - name: '押金', 208 + name: '押金（元）',
209 key: 'earnestMoney', 209 key: 'earnestMoney',
210 type: '单行数字文本', 210 type: '单行数字文本',
211 isrequired: '是', 211 isrequired: '是',
@@ -258,7 +258,7 @@ import { Input } from "element-ui"; @@ -258,7 +258,7 @@ import { Input } from "element-ui";
258 ] 258 ]
259 }, 259 },
260 { 260 {
261 - name: '租金', 261 + name: '租金（元）',
262 key: 'contractAmount', 262 key: 'contractAmount',
263 type: '单行数字文本', 263 type: '单行数字文本',
264 isrequired: '是', 264 isrequired: '是',
admin-web-master/src/components/chakan/fa.vue
  View file @2210df3
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 <div class="duiqi" v-if="editbgid.summary" v-html="editbgid.summary"></div> 24 <div class="duiqi" v-if="editbgid.summary" v-html="editbgid.summary"></div>
25 <div class="duiqi" v-else>无</div> 25 <div class="duiqi" v-else>无</div>
26 </el-form-item> 26 </el-form-item>
27 - <el-form-item label="附件信息" prop="mainPurpose" >  
28 - <div class="duiqi" :class="editbgid.mainPurpose?'greens':''" @click ="editbgid.mainPurpose?openfile($baseURL+editbgid.mainPurpose):''">{{editbgid.mainPurpose?'查看详情':'无'}}</div> 27 + <el-form-item label="附件信息" prop="attachmentInfo" >
  28 + <div class="duiqi" :class="editbgid.attachmentInfo?'greens':''" @click ="editbgid.attachmentInfo?openfile($baseURL+editbgid.attachmentInfo):''">{{editbgid.attachmentInfo?'查看详情':'无'}}</div>
29 </el-form-item> 29 </el-form-item>
30 </el-form> 30 </el-form>
31 </div> 31 </div>
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </el-table-column> --> 61 </el-table-column> -->
62 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 62 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
63 <template slot-scope="scope"> 63 <template slot-scope="scope">
64 - {{scope.row.info.publishStatus=='0'?'空置中':scope.row.info.publishStatus=='1'?'待审核':scope.row.info.publishStatus=='2'?'已发布':scope.row.info.publishStatus=='3'?'不通过':'-'}} 64 + {{scope.row.info.publishStatus=='0'?'待发布':scope.row.info.publishStatus=='1'?'待审核':scope.row.info.publishStatus=='2'?'已发布':scope.row.info.publishStatus=='3'?'不通过':'-'}}
65 </template> 65 </template>
66 </el-table-column> 66 </el-table-column>
67 <el-table-column label="操作" fixed="right" prop="sh"> 67 <el-table-column label="操作" fixed="right" prop="sh">
admin-web-master/src/components/chakan/sam.vue
  View file @2210df3
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </el-col> --> 32 </el-col> -->
33 <el-col :span="8"> 33 <el-col :span="8">
34 <el-form-item label="租金" prop="rentalPrice"> 34 <el-form-item label="租金" prop="rentalPrice">
35 - <div class="duiqi">{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}} <span v-if="editbgid.applicableResources == '商铺'">/M²</span></div> 35 + <div class="duiqi">{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}} <span v-if="editbgid.applicableResources == '商铺'">/m²</span></div>
36 </el-form-item> 36 </el-form-item>
37 </el-col> 37 </el-col>
38 <el-col :span="8"> 38 <el-col :span="8">
admin-web-master/src/components/change/cl.vue
  View file @2210df3
@@ -25,11 +25,12 @@ @@ -25,11 +25,12 @@
25 </el-table-column> 25 </el-table-column>
26 <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip></el-table-column> 26 <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip></el-table-column>
27 <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column> 27 <el-table-column label="适用资源" prop="applicableResources" show-overflow-tooltip></el-table-column>
28 - <el-table-column label="租金价格(/M²)" prop="rentalPrice" show-overflow-tooltip>  
29 - <template slot-scope="scope">  
30 - {{scope.row.rentalPrice}}/M²  
31 - </template>  
32 - </el-table-column> 28 + <el-table-column label="租金价格(元/m²)" prop="rentalPrice" show-overflow-tooltip>
  29 + <template slot-scope="scope" >
  30 + <span v-if="scope.row.rentalPrice!=''">{{scope.row.rentalPrice}}元/m²</span>
  31 + <span v-else>无</span>
  32 + </template>
  33 + </el-table-column>
33 <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column> 34 <el-table-column label="付款周期" prop="leaseTerm" show-overflow-tooltip></el-table-column>
34 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> --> 35 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> -->
35 </el-table> 36 </el-table>
admin-web-master/src/components/newmap/index.vue
  View file @2210df3
@@ -96,6 +96,12 @@ @@ -96,6 +96,12 @@
96 }); 96 });
97 }, 97 },
98 initMap() { 98 initMap() {
  99 + if (this.isx) {
  100 +
  101 + } else {
  102 + this.lat = this.message.split(',')[0]
  103 + this.lng = this.message.split(',')[1]
  104 + }
99 // 将经纬度转换为腾讯地图的LatLng对象 105 // 将经纬度转换为腾讯地图的LatLng对象
100 const centerLatLng = new qq.maps.LatLng(this.lat, this.lng); 106 const centerLatLng = new qq.maps.LatLng(this.lat, this.lng);
101 107
admin-web-master/src/components/newmap/indexall.vue
  View file @2210df3
@@ -309,7 +309,7 @@ body { @@ -309,7 +309,7 @@ body {
309 position: absolute; 309 position: absolute;
310 top: 10px; 310 top: 10px;
311 left: 10px; 311 left: 10px;
312 - z-index: 99; 312 + z-index: 1000;
313 background: #fff; 313 background: #fff;
314 padding: 10px; 314 padding: 10px;
315 border-radius: 5px; 315 border-radius: 5px;
admin-web-master/src/components/newmap/map.vue
  View file @2210df3
@@ -95,7 +95,7 @@ export default { @@ -95,7 +95,7 @@ export default {
95 <div style="padding:10px 0;border-radius: 18px;"> 95 <div style="padding:10px 0;border-radius: 18px;">
96 <p style="padding-top:10px;">资源名称:${item.name}</p> 96 <p style="padding-top:10px;">资源名称:${item.name}</p>
97 <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p> 97 <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
98 - <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p> 98 + <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
99 </div> 99 </div>
100 `; 100 `;
101 // <div style="background: #fff;padding:5px 15px;border-radius: 18px;"> 101 // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
admin-web-master/src/components/newmap/map2.vue
  View file @2210df3
@@ -188,7 +188,7 @@ export default { @@ -188,7 +188,7 @@ export default {
188 <div style="padding:10px 0;border-radius: 18px;"> 188 <div style="padding:10px 0;border-radius: 18px;">
189 <p style="padding-top:10px;">资源名称:${item.name}</p> 189 <p style="padding-top:10px;">资源名称:${item.name}</p>
190 <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p> 190 <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p>
191 - <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p> 191 + <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p>
192 </div> 192 </div>
193 `; 193 `;
194 // <div style="background: #fff;padding:5px 15px;border-radius: 18px;"> 194 // <div style="background: #fff;padding:5px 15px;border-radius: 18px;">
admin-web-master/src/components/resourceCommodity/index.vue
  View file @2210df3
@@ -169,9 +169,9 @@ @@ -169,9 +169,9 @@
169 <!-- <el-table-column label="经营类型" prop="businessType" min-width="100"> 169 <!-- <el-table-column label="经营类型" prop="businessType" min-width="100">
170 170
171 </el-table-column> --> 171 </el-table-column> -->
172 - <el-table-column label="租金价格(/M²)" prop="rentalPrice"> 172 + <el-table-column label="租金价格(元/m²)" prop="rentalPrice">
173 <template slot-scope="scope"> 173 <template slot-scope="scope">
174 - {{scope.row.rentalPrice}}/M² 174 + {{scope.row.rentalPrice}}元/m²
175 </template> 175 </template>
176 </el-table-column> 176 </el-table-column>
177 <el-table-column label="付款周期" prop="leaseTerm"> 177 <el-table-column label="付款周期" prop="leaseTerm">
admin-web-master/src/layout/index.vue
  View file @2210df3
@@ -197,17 +197,17 @@ @@ -197,17 +197,17 @@
197 } 197 }
198 } 198 }
199 return { 199 return {
200 - msg: [],  
201 - list: [],  
202 - // msg: ['招商服务系统'],  
203 - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],  
204 - // list: [  
205 - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],  
206 - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'],  
207 - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],  
208 - // ['联机交易', '对账处理', '日志管理', '商户服务'],  
209 - // ['渠道售票统计分析', '销售额统计分析'],  
210 - // ], 200 + // msg: [],
  201 + // list: [],
  202 + msg: ['招商服务系统'],
  203 + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  204 + list: [
  205 + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
  206 + ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
  207 + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
  208 + ['联机交易', '对账处理', '日志管理', '商户服务'],
  209 + ['渠道售票统计分析', '销售额统计分析'],
  210 + ],
211 listMune: [], 211 listMune: [],
212 mumeList: [], 212 mumeList: [],
213 mumeChildren1: [], 213 mumeChildren1: [],
@@ -296,10 +296,10 @@ @@ -296,10 +296,10 @@
296 this.userAvatar = getUserAvatar() 296 this.userAvatar = getUserAvatar()
297 }, 297 },
298 mounted() { 298 mounted() {
299 - this.getMemu()  
300 - this.address()  
301 - this.waibu()  
302 - // this.neibu() 299 + // this.getMemu()
  300 + // this.address()
  301 + // this.waibu()
  302 + this.neibu()
303 }, 303 },
304 304
305 methods: { 305 methods: {
@@ -780,12 +780,12 @@ @@ -780,12 +780,12 @@
780 ['联机交易', '对账处理', '日志管理', '商户服务'], 780 ['联机交易', '对账处理', '日志管理', '商户服务'],
781 ['渠道售票统计分析', '销售额统计分析'], 781 ['渠道售票统计分析', '销售额统计分析'],
782 ] 782 ]
783 - // this.neibu() 783 + this.neibu()
784 784
785 785
786 - this.getMemu()  
787 - this.waibu()  
788 - this.list = this.mumeList 786 + // this.getMemu()
  787 + // this.waibu()
  788 + // this.list = this.mumeList
789 789
790 790
791 }, 791 },
admin-web-master/src/utils/request.js
  View file @2210df3
@@ -17,12 +17,12 @@ let baseURL = &#39;&#39; @@ -17,12 +17,12 @@ let baseURL = &#39;&#39;
17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18
19 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; 19 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20 - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; 20 + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23
24 24
25 - baseURL = 'http://128.10.249.8:9003'; 25 + // baseURL = 'http://128.10.249.8:9003';
26 26
27 27
28 } else { 28 } else {
admin-web-master/src/views/detect/admap.vue
  View file @2210df3
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <el-table-column label="提交时间" prop="createDate"> </el-table-column> 74 <el-table-column label="提交时间" prop="createDate"> </el-table-column>
75 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 75 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
76 <template slot-scope="scope"> 76 <template slot-scope="scope">
77 - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} 77 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
78 </template> 78 </template>
79 </el-table-column> 79 </el-table-column>
80 <el-table-column label="操作" min-width="100" fixed="right"> 80 <el-table-column label="操作" min-width="100" fixed="right">
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 <el-table-column label="提交时间" prop="createDate"> </el-table-column> 107 <el-table-column label="提交时间" prop="createDate"> </el-table-column>
108 <!-- <el-table-column prop="publishStatus" label="发布状态" > 108 <!-- <el-table-column prop="publishStatus" label="发布状态" >
109 <template slot-scope="scope"> 109 <template slot-scope="scope">
110 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 110 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
111 </template> 111 </template>
112 </el-table-column> 112 </el-table-column>
113 <el-table-column prop="leaseExpirationDate" label="租赁到期时间" > 113 <el-table-column prop="leaseExpirationDate" label="租赁到期时间" >
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 </el-table-column> --> 126 </el-table-column> -->
127 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 127 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
128 <template slot-scope="scope"> 128 <template slot-scope="scope">
129 - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} 129 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
130 </template> 130 </template>
131 </el-table-column> 131 </el-table-column>
132 <el-table-column label="操作" min-width="100" fixed="right"> 132 <el-table-column label="操作" min-width="100" fixed="right">
@@ -155,9 +155,9 @@ @@ -155,9 +155,9 @@
155 </el-table-column> 155 </el-table-column>
156 <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip> 156 <el-table-column label="场地类型" prop="venueType" show-overflow-tooltip>
157 </el-table-column> 157 </el-table-column>
158 - <el-table-column label="实际使用面积(/M²)" prop="actualArea" show-overflow-tooltip> 158 + <el-table-column label="实际使用面积(元/m²)" prop="actualArea" show-overflow-tooltip>
159 <template slot-scope="scope"> 159 <template slot-scope="scope">
160 - {{scope.row.actualArea}}/M² 160 + {{scope.row.actualArea}}元/m²
161 </template> 161 </template>
162 </el-table-column> 162 </el-table-column>
163 <el-table-column label="所属区域" prop="district" show-overflow-tooltip> 163 <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
166 </el-table-column> --> 166 </el-table-column> -->
167 <!-- <el-table-column prop="publishStatus" label="发布状态"> 167 <!-- <el-table-column prop="publishStatus" label="发布状态">
168 <template slot-scope="scope"> 168 <template slot-scope="scope">
169 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 169 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
170 </template> 170 </template>
171 </el-table-column> 171 </el-table-column>
172 <el-table-column label="操作" fixed="right"> 172 <el-table-column label="操作" fixed="right">
@@ -182,7 +182,7 @@ @@ -182,7 +182,7 @@
182 </el-table-column> --> 182 </el-table-column> -->
183 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 183 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
184 <template slot-scope="scope"> 184 <template slot-scope="scope">
185 - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}} 185 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
186 </template> 186 </template>
187 </el-table-column> 187 </el-table-column>
188 <el-table-column label="操作" min-width="100" fixed="right"> 188 <el-table-column label="操作" min-width="100" fixed="right">
admin-web-master/src/views/detect/examine/index.vue
  View file @2210df3
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 </el-table-column> 68 </el-table-column>
69 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip> 69 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
70 <template slot-scope="scope"> 70 <template slot-scope="scope">
71 - <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span> 71 + <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span>
72 <span v-else>无</span> 72 <span v-else>无</span>
73 </template> 73 </template>
74 </el-table-column> 74 </el-table-column>
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 </el-table-column> --> 79 </el-table-column> -->
80 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 80 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
81 <template slot-scope="scope"> 81 <template slot-scope="scope">
82 - {{scope.row.cereBasicInformationShop.publishStatus=='0'?'空置中':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} 82 + {{scope.row.cereBasicInformationShop.publishStatus=='0'?'待发布':scope.row.cereBasicInformationShop.publishStatus=='1'?'待审核':scope.row.cereBasicInformationShop.publishStatus=='2'?'已发布':scope.row.cereBasicInformationShop.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
83 </template> 83 </template>
84 </el-table-column> 84 </el-table-column>
85 <el-table-column label="操作" fixed="right" prop="sh"> 85 <el-table-column label="操作" fixed="right" prop="sh">
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 </el-table-column> 114 </el-table-column>
115 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip> 115 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
116 <template slot-scope="scope"> 116 <template slot-scope="scope">
117 - <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span> 117 + <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span>
118 <span v-else>无</span> 118 <span v-else>无</span>
119 </template> 119 </template>
120 </el-table-column> 120 </el-table-column>
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 </el-table-column> --> 125 </el-table-column> -->
126 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 126 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
127 <template slot-scope="scope"> 127 <template slot-scope="scope">
128 - {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'空置中':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} 128 + {{scope.row.cereAdvertisingInformation.publishStatus=='0'?'待发布':scope.row.cereAdvertisingInformation.publishStatus=='1'?'待审核':scope.row.cereAdvertisingInformation.publishStatus=='2'?'已发布':scope.row.cereAdvertisingInformation.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
129 </template> 129 </template>
130 </el-table-column> 130 </el-table-column>
131 <el-table-column label="操作" fixed="right" prop="sh"> 131 <el-table-column label="操作" fixed="right" prop="sh">
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 </el-table-column> 160 </el-table-column>
161 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip> 161 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
162 <template slot-scope="scope"> 162 <template slot-scope="scope">
163 - <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}</span> 163 + <span v-if="scope.row.shopinfo.rentalPrice!=''">{{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}</span>
164 <span v-else>无</span> 164 <span v-else>无</span>
165 </template> 165 </template>
166 </el-table-column> 166 </el-table-column>
@@ -171,7 +171,7 @@ @@ -171,7 +171,7 @@
171 </el-table-column> --> 171 </el-table-column> -->
172 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 172 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
173 <template slot-scope="scope"> 173 <template slot-scope="scope">
174 - {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'空置中':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} 174 + {{scope.row.cereBasicInformationVenue.publishStatus=='0'?'待发布':scope.row.cereBasicInformationVenue.publishStatus=='1'?'待审核':scope.row.cereBasicInformationVenue.publishStatus=='2'?'已发布':scope.row.cereBasicInformationVenue.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
175 </template> 175 </template>
176 </el-table-column> 176 </el-table-column>
177 <el-table-column label="操作" fixed="right" prop="sh"> 177 <el-table-column label="操作" fixed="right" prop="sh">
admin-web-master/src/views/detect/information/index.vue
  View file @2210df3
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <el-table-column label="提交时间" prop="createDate" > </el-table-column> 68 <el-table-column label="提交时间" prop="createDate" > </el-table-column>
69 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 69 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
70 <template slot-scope="scope"> 70 <template slot-scope="scope">
71 - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} 71 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
72 </template> 72 </template>
73 </el-table-column> 73 </el-table-column>
74 <el-table-column label="操作" min-width="100" fixed="right"> 74 <el-table-column label="操作" min-width="100" fixed="right">
admin-web-master/src/views/detect/map/index.vue
  View file @2210df3
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 70
71 <!-- <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 71 <!-- <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
72 <template slot-scope="scope"> 72 <template slot-scope="scope">
73 - {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 73 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'待发布':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
74 </template> 74 </template>
75 </el-table-column> 75 </el-table-column>
76 <el-table-column prop="leaseExpirationDate" label="租赁到期时间" show-overflow-tooltip> 76 <el-table-column prop="leaseExpirationDate" label="租赁到期时间" show-overflow-tooltip>
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <el-table-column label="提交时间" prop="createDate" > </el-table-column> 90 <el-table-column label="提交时间" prop="createDate" > </el-table-column>
91 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip> 91 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
92 <template slot-scope="scope"> 92 <template slot-scope="scope">
93 - {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}} 93 + {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':scope.row.publishStatus=='4'?'已租赁':'-'}}
94 </template> 94 </template>
95 </el-table-column> 95 </el-table-column>
96 <el-table-column label="操作" min-width="100" fixed="right"> 96 <el-table-column label="操作" min-width="100" fixed="right">
admin-web-master/src/views/scheme/sam.vue
  View file @2210df3
@@ -61,9 +61,10 @@ @@ -61,9 +61,10 @@
61 <el-table-column label="经营类型" prop="businessType" min-width="100"> 61 <el-table-column label="经营类型" prop="businessType" min-width="100">
62 62
63 </el-table-column> 63 </el-table-column>
64 - <el-table-column label="租金价格(/M²)" prop="rentalPrice" min-width="150"> 64 + <el-table-column label="租金价格(元/m²)" prop="rentalPrice" min-width="150">
65 <template slot-scope="scope"> 65 <template slot-scope="scope">
66 - {{scope.row.rentalPrice}}/M² 66 + <span v-if="scope.row.rentalPrice!=''">{{scope.row.rentalPrice}}元/m²</span>
  67 + <span v-else>无</span>
67 </template> 68 </template>
68 </el-table-column> 69 </el-table-column>
69 <el-table-column label="租期" prop="leaseTerm" min-width="100"> 70 <el-table-column label="租期" prop="leaseTerm" min-width="100">
lvdao-miniapp/pages.json
  View file @2210df3
@@ -448,6 +448,13 @@ @@ -448,6 +448,13 @@
448 } 448 }
449 }, 449 },
450 { 450 {
  451 + "path": "weball/web",
  452 + "style": {
  453 + "navigationBarBackgroundColor": "#FFFFFF",
  454 + "navigationBarTitleText": ""
  455 + }
  456 + },
  457 + {
451 "path": "tishi/tishi", 458 "path": "tishi/tishi",
452 "style": { 459 "style": {
453 "navigationBarBackgroundColor": "#FFFFFF", 460 "navigationBarBackgroundColor": "#FFFFFF",
lvdao-miniapp/pages/activityAdd/activityAdd.vue
  View file @2210df3
@@ -2,36 +2,36 @@ @@ -2,36 +2,36 @@
2 <view class="page"> 2 <view class="page">
3 <u-form :model="form" ref="uForm" label-position="left" :label-width="180"> 3 <u-form :model="form" ref="uForm" label-position="left" :label-width="180">
4 <view class="add-list" style="padding-bottom: 0;"> 4 <view class="add-list" style="padding-bottom: 0;">
5 - <u-form-item label="*封面图片" borderBottom labelPosition="top"> 5 + <u-form-item :required="true" label="封面图片" borderBottom labelPosition="top">
6 <!-- <u-upload :action="$upload" :auto-upload="true" ref="uUpload" :max-count="1" ></u-upload> --> 6 <!-- <u-upload :action="$upload" :auto-upload="true" ref="uUpload" :max-count="1" ></u-upload> -->
7 <u-upload :action="$upload" :auto-upload="false" ref="coverImage" :max-count="1" :file-list="fist" 7 <u-upload :action="$upload" :auto-upload="false" ref="coverImage" :max-count="1" :file-list="fist"
8 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload> 8 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
9 </u-form-item> 9 </u-form-item>
10 </view> 10 </view>
11 <view class="add-list" style="padding-bottom: 0;"> 11 <view class="add-list" style="padding-bottom: 0;">
12 - <u-form-item label="*活动名称" borderBottom> 12 + <u-form-item :required="true" label="活动名称" borderBottom>
13 <u-input v-model="form.activityName" /> 13 <u-input v-model="form.activityName" />
14 </u-form-item> 14 </u-form-item>
15 - <u-form-item label="*开始时间" borderBottom> 15 + <u-form-item :required="true" label="开始时间" borderBottom>
16 <u-input v-model="form.startTime" type="select" @click="startShow = true" placeholder="请选择"/> 16 <u-input v-model="form.startTime" type="select" @click="startShow = true" placeholder="请选择"/>
17 <u-picker mode="time" v-model="startShow" :params="params" @confirm="startTimeChange"></u-picker> 17 <u-picker mode="time" v-model="startShow" :params="params" @confirm="startTimeChange"></u-picker>
18 </u-form-item> 18 </u-form-item>
19 - <u-form-item label="*结束时间" borderBottom> 19 + <u-form-item :required="true" label="结束时间" borderBottom>
20 <u-input v-model="form.endTime" type="select" @click="endShow = true" placeholder="请选择"/> 20 <u-input v-model="form.endTime" type="select" @click="endShow = true" placeholder="请选择"/>
21 <u-picker mode="time" v-model="endShow" :params="params" @confirm="endTimeChange"></u-picker> 21 <u-picker mode="time" v-model="endShow" :params="params" @confirm="endTimeChange"></u-picker>
22 </u-form-item> 22 </u-form-item>
23 - <u-form-item label="*活动类型" borderBottom> 23 + <u-form-item :required="true" label="活动类型" borderBottom>
24 <u-input v-model="form.activityType" type="select" @click="typeShow = true" placeholder="请选择"/> 24 <u-input v-model="form.activityType" type="select" @click="typeShow = true" placeholder="请选择"/>
25 <u-select v-model="typeShow" :list="typeList" @confirm="typeChange"></u-select> 25 <u-select v-model="typeShow" :list="typeList" @confirm="typeChange"></u-select>
26 </u-form-item> 26 </u-form-item>
27 - <u-form-item label="*可参与人数" borderBottom> 27 + <u-form-item :required="true" label="可参与人数" borderBottom>
28 <u-number-box v-model="form.maxParticipants" :input-width="'100%'" :min="0"></u-number-box> 28 <u-number-box v-model="form.maxParticipants" :input-width="'100%'" :min="0"></u-number-box>
29 </u-form-item> 29 </u-form-item>
30 - <u-form-item label="*举办区域" borderBottom> 30 + <u-form-item :required="true" label="举办区域" borderBottom>
31 <u-input v-model="form.region" /> 31 <u-input v-model="form.region" />
32 </u-form-item> 32 </u-form-item>
33 - <u-form-item label="*活动内容" type = 'textarea' borderBottom auto-height="100">  
34 - <u-input v-model="form.content" /> 33 + <u-form-item :required="true" label="活动内容" borderBottom label-position="top">
  34 + <u-input border type="textarea" height="150" v-model="form.content" />
35 </u-form-item> 35 </u-form-item>
36 </view> 36 </view>
37 37
lvdao-miniapp/pages/advertisement/advertisement.vue
  View file @2210df3
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <view> 42 <view>
43 <view class="goods-list-text"> 43 <view class="goods-list-text">
44 <view class="goods-list-txt">广告位类型：{{item.advertisingType}}</view> 44 <view class="goods-list-txt">广告位类型：{{item.advertisingType}}</view>
45 - <view class="goods-list-txt">广告尺寸：{{item.dimensions}}</view> 45 + <view class="goods-list-txt">广告尺寸：{{item.dimensions || '--'}}</view>
46 </view> 46 </view>
47 <view class="goods-list-text" v-if="item.advertisingType == '线上广告位'"> 47 <view class="goods-list-text" v-if="item.advertisingType == '线上广告位'">
48 <view class="goods-list-txt">轮播顺序：<text>{{item.rotationOrder}}</text></view> 48 <view class="goods-list-txt">轮播顺序：<text>{{item.rotationOrder}}</text></view>
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
139 let items = JSON.stringify(item) 139 let items = JSON.stringify(item)
140 console.log(items) 140 console.log(items)
141 uni.navigateTo({ 141 uni.navigateTo({
142 - url: `/pages/advertisementDetail/advertisementDetail?item=${items}` 142 + url: `/pages/advertisementDetail/advertisementDetail?item=${encodeURIComponent(items)}`
143 }) 143 })
144 }, 144 },
145 145
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
  View file @2210df3
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 <text>{{tableData.playDuration || '--'}}</text> 57 <text>{{tableData.playDuration || '--'}}</text>
58 </view> 58 </view>
59 </u-col> 59 </u-col>
60 - <u-col span="5" > 60 + <u-col span="12" >
61 <view class="form-item"> 61 <view class="form-item">
62 <view class="label">推送地址：</view> 62 <view class="label">推送地址：</view>
63 <text>{{tableData.pushAddress || '--'}}</text> 63 <text>{{tableData.pushAddress || '--'}}</text>
@@ -66,10 +66,11 @@ @@ -66,10 +66,11 @@
66 <u-col span="12"> 66 <u-col span="12">
67 <view class="form-item"> 67 <view class="form-item">
68 <view class="label">介绍：</view> 68 <view class="label">介绍：</view>
69 - <view style='flex: 1;'>  
70 - <rich-text v-if="tableData.memo" :nodes="tableData.memo"></rich-text>  
71 - <text v-else>无</text>  
72 - </view> 69 + <text v-if="!tableData.memo">无</text>
  70 + </view>
  71 + <view style='flex: 1;'>
  72 + <rich-text v-if="tableData.memo" :nodes="tableData.memo"></rich-text>
  73 +
73 </view> 74 </view>
74 </u-col> 75 </u-col>
75 </view> 76 </view>
@@ -196,7 +197,7 @@ @@ -196,7 +197,7 @@
196 }, 197 },
197 onLoad(option) { 198 onLoad(option) {
198 this.imgurl = this.$img 199 this.imgurl = this.$img
199 - let data = JSON.parse(option.item) 200 + let data = JSON.parse(decodeURIComponent(option.item))
200 console.log(data) 201 console.log(data)
201 this.tableData = data 202 this.tableData = data
202 this.resourcesId = `gg${data.id}` 203 this.resourcesId = `gg${data.id}`
lvdao-miniapp/pages/field/field.vue
  View file @2210df3
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <view class="retail-price"> 96 <view class="retail-price">
97 <text>面积:</text> 97 <text>面积:</text>
98 <text class="max">{{item.actualArea}}</text> 98 <text class="max">{{item.actualArea}}</text>
99 - <text class="min">/m²</text> 99 + <text class="min">m²</text>
100 </view> 100 </view>
101 </view> 101 </view>
102 </view> 102 </view>
lvdao-miniapp/pages/home/home.scss
  View file @2210df3
@@ -183,6 +183,7 @@ @@ -183,6 +183,7 @@
183 padding: 30rpx 0; 183 padding: 30rpx 0;
184 margin-top: 20rpx; 184 margin-top: 20rpx;
185 flex-wrap: wrap; 185 flex-wrap: wrap;
  186 + justify-content: space-around;
186 // justify-content: center; 187 // justify-content: center;
187 .list{ 188 .list{
188 display: flex; 189 display: flex;
lvdao-miniapp/pages/home/home.vue
  View file @2210df3
@@ -65,14 +65,22 @@ @@ -65,14 +65,22 @@
65 <text>租广告</text> 65 <text>租广告</text>
66 </view> 66 </view>
67 </view> 67 </view>
68 - <view class="list" @click="wuye"> 68 + <!-- <view class="list" @click="wuye">
  69 + <view class="icon">
  70 + <image :src="$imgUrl('/gouwulan.png')"></image>
  71 + </view>
  72 + <view class="title">
  73 + <text>商城</text>
  74 + </view>
  75 + </view> -->
  76 + <!-- <view class="list" @click="wuye">
69 <view class="icon"> 77 <view class="icon">
70 <image :src="$imgUrl('/home4.png')"></image> 78 <image :src="$imgUrl('/home4.png')"></image>
71 </view> 79 </view>
72 <view class="title"> 80 <view class="title">
73 <text>物业缴费</text> 81 <text>物业缴费</text>
74 </view> 82 </view>
75 - </view> 83 + </view> -->
76 <!-- <view class="list" @click="gopath('/pagesA/hxlist/hxlist')"> 84 <!-- <view class="list" @click="gopath('/pagesA/hxlist/hxlist')">
77 <view class="icon"> 85 <view class="icon">
78 <image :src="$imgUrl('/home4.png')"></image> 86 <image :src="$imgUrl('/home4.png')"></image>
@@ -635,7 +643,7 @@ @@ -635,7 +643,7 @@
635 }) 643 })
636 } else { 644 } else {
637 uni.navigateTo({ 645 uni.navigateTo({
638 - url: `/pages/advertisementDetail/advertisementDetail?item=${items}` 646 + url: `/pages/advertisementDetail/advertisementDetail?item=${encodeURIComponent(items)}`
639 }) 647 })
640 } 648 }
641 649
@@ -685,15 +693,18 @@ @@ -685,15 +693,18 @@
685 693
686 }, 694 },
687 wuye() { 695 wuye() {
688 - if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){  
689 - uni.navigateTo({  
690 - url: `/pages/propertyPay/propertyPayList/propertyPayList`  
691 - })  
692 - }else{  
693 - uni.navigateTo({  
694 - url: `/pages/login/login`  
695 - })  
696 - } 696 + uni.navigateTo({
  697 + url: `/pagesA/weball/web?url=https://zhgw-uat.028wlkj.com/cdwlMall/meh5/`
  698 + })
  699 + // if(uni.getStorageSync('user').phone&& uni.getStorageSync('user').phone!=''){
  700 + // uni.navigateTo({
  701 + // url: `/pages/propertyPay/propertyPayList/propertyPayList`
  702 + // })
  703 + // }else{
  704 + // uni.navigateTo({
  705 + // url: `/pages/login/login`
  706 + // })
  707 + // }
697 708
698 709
699 }, 710 },
lvdao-miniapp/pages/marketing/marketingList/marketingList.vue
  View file @2210df3
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <u-image :src="imgurl+item.coverImage" border-radius="10" height="110px" width="100%" style="margin-top:8px;margin-right:8px;" ></u-image> 23 <u-image :src="imgurl+item.coverImage" border-radius="10" height="110px" width="100%" style="margin-top:8px;margin-right:8px;" ></u-image>
24 <!-- <u-image :src="$img+item.coverImage" border-radius="10" mode="heightFix" style="margin-right:8px;height:110px" ></u-image> --> 24 <!-- <u-image :src="$img+item.coverImage" border-radius="10" mode="heightFix" style="margin-right:8px;height:110px" ></u-image> -->
25 <view class="info"> 25 <view class="info">
26 - <view class="title">{{item.title}}</view> 26 + <view class="title one-omit">{{item.title}}</view>
27 <view class="name">活动时间：{{item.startTime}}至{{item.endTime}}</view> 27 <view class="name">活动时间：{{item.startTime}}至{{item.endTime}}</view>
28 <view style="margin-top: 5px;height:23px;"> 28 <view style="margin-top: 5px;height:23px;">
29 <u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1"/> 29 <u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1"/>
lvdao-miniapp/pages/my/my.vue
  View file @2210df3
@@ -50,12 +50,12 @@ @@ -50,12 +50,12 @@
50 <text>我的问卷</text> 50 <text>我的问卷</text>
51 </view> 51 </view>
52 </view> --> 52 </view> -->
53 - <view class="service-list-list"> 53 + <view class="service-list-list" @click="myativity">
54 <view class="thumb"> 54 <view class="thumb">
55 <text v-if="Islogin">0</text> 55 <text v-if="Islogin">0</text>
56 <text v-else>{{activityNum}}</text> 56 <text v-else>{{activityNum}}</text>
57 </view> 57 </view>
58 - <view class="name" @click="myativity"> 58 + <view class="name" >
59 <text>我的活动</text> 59 <text>我的活动</text>
60 </view> 60 </view>
61 </view> 61 </view>
lvdao-miniapp/pages/participation/participation.scss
  View file @2210df3
@@ -170,10 +170,6 @@ @@ -170,10 +170,6 @@
170 } 170 }
171 } 171 }
172 .huo-card-item{ 172 .huo-card-item{
173 - font-size: 20rpx;  
174 - line-height: 1.5;  
175 - white-space: nowrap; /* 防止文本换行 */  
176 - text-overflow: ellipsis; /* 显示省略号 */  
177 - /* 如果需要设置宽度，可以添加 width 属性 */  
178 - overflow:hidden;  
179 - }  
180 \ No newline at end of file 173 \ No newline at end of file
  174 + font-size: 20rpx;
  175 +}
  176 +
181 \ No newline at end of file 177 \ No newline at end of file
lvdao-miniapp/pages/participation/participation.vue
  View file @2210df3
@@ -2,48 +2,54 @@ @@ -2,48 +2,54 @@
2 <!-- 活动参与 --> 2 <!-- 活动参与 -->
3 <view class="page"> 3 <view class="page">
4 <view class="more page-box" @click="toMyAdd"> 4 <view class="more page-box" @click="toMyAdd">
5 - <u-section :bold="false" title="我的活动申请" sub-title='' :show-line="false" color="#0FBB59" > 5 + <u-section :bold="false" title="我的活动申请" sub-title='' :show-line="false" color="#0FBB59">
6 <view slot="right"> 6 <view slot="right">
7 <u-icon name="arrow-rightward" color="#0FBB59" size="28"></u-icon> 7 <u-icon name="arrow-rightward" color="#0FBB59" size="28"></u-icon>
8 </view> 8 </view>
9 </u-section> 9 </u-section>
10 </view> 10 </view>
11 <!-- 搜索 --> 11 <!-- 搜索 -->
12 - <!-- <view class="head-search"> 12 + <!-- <view class="head-search">
13 <u-search bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" :show-action="false" @search="search"></u-search> 13 <u-search bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" :show-action="false" @search="search"></u-search>
14 <u-button type="success" @click="search">搜索</u-button> 14 <u-button type="success" @click="search">搜索</u-button>
15 </view> --> 15 </view> -->
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="pageIndex.activityName" action-text="搜索" @clear="search" @search="search" @custom="search"></u-search> 16 + <view
  17 + style="margin: 20rpx 0;background-color: #FFFFFF;border-radius: 18rpx;border: 2rpx solid #E8E8E8; margin: 22rpx 24rpx;overflow: hidden;">
  18 + <u-search
  19 + :action-style="{'background':'#19be6b','color':'#fff','height':'32px','line-height':'32px','border-radius':'18rpx'}"
  20 + bg-color="#fff" placeholder="请输入关键词" v-model="pageIndex.activityName" action-text="搜索" @clear="search"
  21 + @search="search" @custom="search"></u-search>
18 </view> 22 </view>
19 <view class="screen-list"> 23 <view class="screen-list">
20 <u-dropdown menu-icon="arrow-down-fill" :title-size="24" :height="40"> 24 <u-dropdown menu-icon="arrow-down-fill" :title-size="24" :height="40">
21 - <u-dropdown-item v-model="pageIndex.orderingRule" title="时间排序" :options="sortTypeOptions" @change="search"></u-dropdown-item>  
22 - <u-dropdown-item v-model="pageIndex.activeState" title="活动状态" :options="statusOptions" @change="search"></u-dropdown-item> 25 + <u-dropdown-item v-model="pageIndex.orderingRule" title="时间排序" :options="sortTypeOptions"
  26 + @change="search"></u-dropdown-item>
  27 + <u-dropdown-item v-model="pageIndex.activeState" title="活动状态" :options="statusOptions"
  28 + @change="search"></u-dropdown-item>
23 </u-dropdown> 29 </u-dropdown>
24 </view> 30 </view>
25 - <!-- 订单列表 -->  
26 <view class="goods-data"> 31 <view class="goods-data">
27 - <u-row gutter="16" class="goods-list">  
28 - <u-col span="6" v-for="(item,index) in datalist" :key="index" @click="toDetail(item.id, '/pages/activityDetail/activityDetail')" >  
29 - <view class="demo-layout good-item" style="margin-bottom: 30rpx;">  
30 - <u-image :src="imgurl+item.coverImage" border-radius="10" mode="heightFix" height="110px" style="margin-top:8px;margin-right:8px;" ></u-image> 32 + <view style="width: 100%;display: flex;flex-wrap: wrap;">
  33 + <view style="width: 47%;margin-left: 2%;background: #fff;margin-bottom: 30rpx;padding: 20rpx;border-radius: 18rpx;" v-for="(item,index) in datalist" :key="index" @click="toDetail(item.id)">
  34 + <view class="demo-layout good-item">
  35 + <u-image :src="imgurl+item.coverImage" border-radius="10" height="110px" width="100%"
  36 + style="margin-top:8px;margin-right:8px;"></u-image>
  37 + <!-- <u-image :src="$img+item.coverImage" border-radius="10" mode="heightFix" style="margin-right:8px;height:110px" ></u-image> -->
31 <view class="info"> 38 <view class="info">
32 - <view class="title">{{item.activityName}}</view>  
33 - <view class="huo-card-item">活动日期：<span>{{item.startTime}}至{{item.endTime}}</span></view> 39 + <view class="title one-omit" >{{item.activityName}}</view>
  40 + <view class="huo-card-item one-omit" style="margin: 14rpx 0;">活动日期：<span>{{item.startTime}}至{{item.endTime}}</span></view>
34 <view class="huo-card-item">参与人数：<span>{{item.maxParticipants}}</span></view> 41 <view class="huo-card-item">参与人数：<span>{{item.maxParticipants}}</span></view>
35 - <view style="margin-top: 5px;height:23px">  
36 - <u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1"/>  
37 - <u-tag text="未开始" type="info" mode="dark" v-if="item.activeState==0"/>  
38 - <u-tag text="已结束" type="warning" mode="dark" v-if="item.activeState==2"/>  
39 - </view> 42 + <view style="margin-top: 5px;height:23px">
  43 + <u-tag text="进行中" type="success" mode="dark" v-if="item.activeState==1" />
  44 + <u-tag text="未开始" type="info" mode="dark" v-if="item.activeState==0" />
  45 + <u-tag text="已结束" type="warning" mode="dark" v-if="item.activeState==2" />
  46 + </view>
40 </view> 47 </view>
41 </view> 48 </view>
42 - </u-col>  
43 -  
44 - </u-row>  
45 - <!-- <u-loadmore :status="status" @loadmore='loading'/> --> 49 + </view>
  50 + </view>
46 </view> 51 </view>
  52 +
47 <view style="height: 120rpx;"></view> 53 <view style="height: 120rpx;"></view>
48 <view class="page-footer"> 54 <view class="page-footer">
49 <u-button type="success" @click="toAdd">活动申请</u-button> 55 <u-button type="success" @click="toAdd">活动申请</u-button>
@@ -59,24 +65,37 @@ @@ -59,24 +65,37 @@
59 datalist: [], 65 datalist: [],
60 total: 1, 66 total: 1,
61 67
62 - sortTypeOptions: [  
63 - { label: '正序', value: 1 },  
64 - { label: '倒序', value: 2 }, 68 + sortTypeOptions: [{
  69 + label: '正序',
  70 + value: 1
  71 + },
  72 + {
  73 + label: '倒序',
  74 + value: 2
  75 + },
65 ], 76 ],
66 - statusOptions: [  
67 - { label: '进行中', value: 1 },  
68 - { label: '已结束', value: 2 },  
69 - { label: '未开始', value: 0 }, 77 + statusOptions: [{
  78 + label: '进行中',
  79 + value: 1
  80 + },
  81 + {
  82 + label: '已结束',
  83 + value: 2
  84 + },
  85 + {
  86 + label: '未开始',
  87 + value: 0
  88 + },
70 ], 89 ],
71 - pageIndex :{ 90 + pageIndex: {
72 activityName: '', // 搜索项 91 activityName: '', // 搜索项
73 orderingRule: 1, // 排序方式 92 orderingRule: 1, // 排序方式
74 - activeState:null, // 活动状态 93 + activeState: null, // 活动状态
75 pageNumber: 1, 94 pageNumber: 1,
76 pageSize: 10, 95 pageSize: 10,
77 - auditStatus:'3', 96 + auditStatus: '3',
78 }, 97 },
79 - imgurl:'' 98 + imgurl: ''
80 } 99 }
81 }, 100 },
82 onLoad() { 101 onLoad() {
@@ -100,9 +119,9 @@ @@ -100,9 +119,9 @@
100 this.getAll() 119 this.getAll()
101 }, 120 },
102 methods: { 121 methods: {
103 - getAll(val){  
104 - this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST',this.pageIndex,1).then(res => {  
105 - this.datalist = res.data.data.content 122 + getAll(val) {
  123 + this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST', this.pageIndex, 1).then(res => {
  124 + this.datalist = res.data.data.content
106 }).catch(err => { 125 }).catch(err => {
107 console.log(err) 126 console.log(err)
108 //请求失败 127 //请求失败
@@ -115,13 +134,13 @@ @@ -115,13 +134,13 @@
115 }) 134 })
116 }, 135 },
117 search() { 136 search() {
118 -  
119 - this.getAll() 137 +
  138 + this.getAll()
120 }, 139 },
121 - 140 +
122 loading() { 141 loading() {
123 let that = this 142 let that = this
124 - if(that.status == 'nomore') return; 143 + if (that.status == 'nomore') return;
125 that.status = 'loading'; 144 that.status = 'loading';
126 that.page = ++that.page; 145 that.page = ++that.page;
127 setTimeout(() => { 146 setTimeout(() => {
@@ -129,22 +148,22 @@ @@ -129,22 +148,22 @@
129 that.status = that.list >= that.total ? 'nomore' : 'loadmore'; 148 that.status = that.list >= that.total ? 'nomore' : 'loadmore';
130 }, 300) 149 }, 300)
131 }, 150 },
132 - join(){ 151 + join() {
133 uni.navigateTo({ 152 uni.navigateTo({
134 url: '/pages/mycreated/mycreated?id=1' 153 url: '/pages/mycreated/mycreated?id=1'
135 }) 154 })
136 }, 155 },
137 toAdd() { 156 toAdd() {
138 - uni.navigateTo({ 157 + uni.navigateTo({
139 url: '/pages/activityAdd/activityAdd' 158 url: '/pages/activityAdd/activityAdd'
140 }) 159 })
141 }, 160 },
142 toDetail(item, path) { 161 toDetail(item, path) {
143 - 162 +
144 uni.navigateTo({ 163 uni.navigateTo({
145 url: `${path}?item=${item}` 164 url: `${path}?item=${item}`
146 }) 165 })
147 - 166 +
148 }, 167 },
149 } 168 }
150 } 169 }
@@ -152,4 +171,4 @@ @@ -152,4 +171,4 @@
152 171
153 <style scoped lang="scss"> 172 <style scoped lang="scss">
154 @import 'participation.scss'; 173 @import 'participation.scss';
155 -</style> 174 -</style>
  175 +</style>
156 \ No newline at end of file 176 \ No newline at end of file
lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue
  View file @2210df3
@@ -13,14 +13,14 @@ @@ -13,14 +13,14 @@
13 <view class="info-items"> 13 <view class="info-items">
14 <view class="info-item"> 14 <view class="info-item">
15 <view class="title">{{item.itemName}}</view> 15 <view class="title">{{item.itemName}}</view>
16 - <view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.payPrice}}</text></view> 16 + <view class="right"><text class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{ item.detailsVOList | jsitem}}</text></view>
17 </view> 17 </view>
18 <view class="info-item" style="color: #808080;"> 18 <view class="info-item" style="color: #808080;">
19 <view class="left">单价：￥{{item.itemStandard}}</view> 19 <view class="left">单价：￥{{item.itemStandard}}</view>
20 <view class="right">费率：{{item.cheapRate}}%</view> 20 <view class="right">费率：{{item.cheapRate}}%</view>
21 </view> 21 </view>
22 <view v-if="item.itemDetailsVOList&& item.itemDetailsVOList.length>0"> 22 <view v-if="item.itemDetailsVOList&& item.itemDetailsVOList.length>0">
23 - <view class="list" v-for="(item1,index1) in item.itemDetailsVOList"> 23 + <view v-if="item1.isshowxz" class="list" v-for="(item1,index1) in item.itemDetailsVOList">
24 <view class="info-item">周期：{{item1.startDate}} - {{item1.endDate}}</view> 24 <view class="info-item">周期：{{item1.startDate}} - {{item1.endDate}}</view>
25 <view class="info-item" style="margin-top: 6rpx;"> 25 <view class="info-item" style="margin-top: 6rpx;">
26 <text style="margin-right: 20rpx;">数量：{{item1.number}}{{item1.itemUnit}}</text> 26 <text style="margin-right: 20rpx;">数量：{{item1.number}}{{item1.itemUnit}}</text>
@@ -103,6 +103,20 @@ @@ -103,6 +103,20 @@
103 cent:{} 103 cent:{}
104 } 104 }
105 }, 105 },
  106 + filters: {
  107 +
  108 + jsitem(e) {
  109 + // console.error(e)
  110 + let num = 0
  111 + for (let n = 0; n < e.length; n++) {
  112 + // num = num + Number(e[n].payPrice)
  113 + if(e[n].isshowxz){
  114 + num = num + Number(e[n].payPrice)
  115 + }
  116 + }
  117 + return num.toFixed(2)
  118 + }
  119 + },
106 onLoad(e) { 120 onLoad(e) {
107 this.cent = JSON.parse(e.cent) 121 this.cent = JSON.parse(e.cent)
108 console.error(this.cent) 122 console.error(this.cent)
lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
  View file @2210df3
@@ -123,6 +123,7 @@ @@ -123,6 +123,7 @@
123 </template> 123 </template>
124 124
125 <script> 125 <script>
  126 + import { toMiniPay } from "@/utils/tool.js"
126 export default { 127 export default {
127 data() { 128 data() {
128 return { 129 return {
@@ -313,7 +314,7 @@ @@ -313,7 +314,7 @@
313 314
314 // }) 315 // })
315 }, 316 },
316 - submit() { 317 + async submit() {
317 318
318 // console.log(this.recordList) 319 // console.log(this.recordList)
319 let c1 = [] 320 let c1 = []
@@ -350,80 +351,21 @@ @@ -350,80 +351,21 @@
350 "paymentContent": JSON.stringify(c1) 351 "paymentContent": JSON.stringify(c1)
351 } 352 }
352 console.log(info) 353 console.log(info)
353 - this.$http.sendRequest('/cerePaymentInfo/payWy', 'POST',info, 1).then(res => { 354 + const payId = await this.$http.sendRequest('/cerePaymentInfo/payWy', 'POST',info, 1).then(res => {
354 console.error(res.data) 355 console.error(res.data)
  356 + let c1 = res.data.data.split('=')[1]
  357 + console.error(c1)
355 if(res.data.code =='200') { 358 if(res.data.code =='200') {
356 - uni.navigateTo({  
357 - url:'/pagesA/payweb/payweb?url='+escape(res.data.data)  
358 - }) 359 + return c1
  360 +
  361 + // uni.navigateTo({
  362 + // url:'/pagesA/payweb/payweb?url='+escape(res.data.data)
  363 + // })
359 } 364 }
360 }) 365 })
361 - return  
362 - // this.loadShow = true  
363 - // setTimeout(()=>{  
364 - // this.loadShow = false  
365 - // },2000)  
366 - if (this.fangshi == '付款码扫码支付') {  
367 - this.joinShow = false  
368 -  
369 - } else {  
370 - let payList = {  
371 - additional: "附加交易授权",  
372 - backUrl: "",  
373 - channelId: "",  
374 - expireTime: 1800,  
375 - finishUrl: "",  
376 - latitude: "1",  
377 - longitude: "1",  
378 - orderNo: "",  
379 - payId: "",  
380 - payMerData: [{  
381 - amount: 1,  
382 - body: "物业缴费",  
383 - }],  
384 - payType: "Online",  
385 - returnUrl: "",  
386 - showBtn: "1",  
387 - siteId: "",  
388 - toApp: "0",  
389 - totalAmount: 1,  
390 - uid: "1693617316237021185",  
391 - universalLink: ""  
392 - }  
393 - const randomNumber = Math.floor(Math.random() * 10000); // 生成一个0到9999之间的随机数  
394 - const timestamp = new Date().getTime(); // 获取当前时间的时间戳  
395 - payList.orderNo = `${randomNumber}${timestamp}`  
396 -  
397 - payList.uid = uni.getStorageSync('shopId')  
398 - this.$http.sendRequest('/aggregationPayment/createOrder', 'POST', payList, 1).then(res => {  
399 - console.log(JSON.parse(res.data.data).data.codeUrl)  
400 - let url = JSON.parse(res.data.data).data.codeUrl  
401 -  
402 - // window.location.href = url  
403 - // plus.runtime.openURL(url , function(e) {console.log(e)})  
404 - uni.showModal({  
405 - title: res.data.message,  
406 - showCancel: false,  
407 - success: ress => {  
408 - uni.switchTab({  
409 - url: '/pages/home/home'  
410 - })  
411 - }  
412 - })  
413 - })  
414 -  
415 - this.joinShow = false  
416 - // uni.showModal({  
417 - // title: '支付成功 ',  
418 - // showCancel:false,  
419 - // success:ress => {  
420 - // uni.switchTab({  
421 - // url: '/pages/home/home'  
422 - // })  
423 - // }  
424 - // })  
425 - }  
426 - 366 + const payIdbackPath= '/pages/home/home'
  367 + await toMiniPay(payId,payIdbackPath)
  368 +
427 }, 369 },
428 confirm(e) { 370 confirm(e) {
429 console.log(e) 371 console.log(e)
lvdao-miniapp/pages/shops/shops.vue
  View file @2210df3
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 <text class="line"></text> --> 67 <text class="line"></text> -->
68 <text>面积:</text> 68 <text>面积:</text>
69 <text class="max">{{item.actualUsableArea}}</text> 69 <text class="max">{{item.actualUsableArea}}</text>
70 - <text class="min">/m²</text> 70 + <text class="min">m²</text>
71 </view> 71 </view>
72 </view> 72 </view>
73 </view> 73 </view>
lvdao-miniapp/pages/workbench/workbench.vue
  View file @2210df3
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 path: '/pages/activityAdd/activityAdd' 190 path: '/pages/activityAdd/activityAdd'
191 }, 191 },
192 { 192 {
193 - name: '意向申请', 193 + name: '寻租申请',
194 img: '/yxsq.png', 194 img: '/yxsq.png',
195 path: '/pages/rsaManagement/rsaManagement' 195 path: '/pages/rsaManagement/rsaManagement'
196 }, 196 },
@@ -252,9 +252,14 @@ @@ -252,9 +252,14 @@
252 img: '/zjjf.png', 252 img: '/zjjf.png',
253 path: '/pagesA/rentPay/rentPay' 253 path: '/pagesA/rentPay/rentPay'
254 }, 254 },
  255 + {
  256 + name: '物业缴费',
  257 + img: '/shuidichou.png',
  258 + path: '/pages/propertyPay/propertyPayList/propertyPayList'
  259 + },
255 ] 260 ]
256 }, ], 261 }, ],
257 -pageList6: [{ 262 + pageList6: [{
258 id: 5, 263 id: 5,
259 title: '推广管理', 264 title: '推广管理',
260 children: [{ 265 children: [{
@@ -305,8 +310,13 @@ pageList6: [{ @@ -305,8 +310,13 @@ pageList6: [{
305 async toPath1(path) { 310 async toPath1(path) {
306 let c1 = uni.getStorageSync('user').phone 311 let c1 = uni.getStorageSync('user').phone
307 // let c1 = '18188305496' 312 // let c1 = '18188305496'
308 - await this.$http.sendRequest('/check/getAll','POST',{"shopPhone":c1,"checkState":"1","page":1,"pageSize":1}, 1).then(res => {  
309 - if(res.data.data.list.length>0) { 313 + await this.$http.sendRequest('/check/getAll', 'POST', {
  314 + "shopPhone": c1,
  315 + "checkState": "1",
  316 + "page": 1,
  317 + "pageSize": 1
  318 + }, 1).then(res => {
  319 + if (res.data.data.list.length > 0) {
310 uni.setStorageSync('shopId', res.data.data.list[0].shopId); 320 uni.setStorageSync('shopId', res.data.data.list[0].shopId);
311 } else { 321 } else {
312 // uni.show 322 // uni.show
lvdao-miniapp/pagesA/addsb/addsb.vue
  View file @2210df3
@@ -2,23 +2,23 @@ @@ -2,23 +2,23 @@
2 <view class="appbox"> 2 <view class="appbox">
3 3
4 <view style="display: flex;" v-if="type == '1'"> 4 <view style="display: flex;" v-if="type == '1'">
5 - <view @click="changeonindex('意见反馈')" :class="onindex == '意见反馈'?'onclasst1':'classt1'">  
6 - 意见反馈 5 + <view @click="changeonindex('事件上报')" :class="onindex == '事件上报'?'onclasst1':'classt1'">
  6 + 事件上报
7 <view class="onindex"></view> 7 <view class="onindex"></view>
8 </view> 8 </view>
9 - <view @click="changeonindex('我的反馈')" :class="onindex == '我的反馈'?'onclasst1':'classt1'">  
10 - 我的反馈 9 + <view @click="changeonindex('我的上报')" :class="onindex == '我的上报'?'onclasst1':'classt1'">
  10 + 我的上报
11 <view class="onindex"></view> 11 <view class="onindex"></view>
12 </view> 12 </view>
13 </view> 13 </view>
14 <view style="display: flex;" v-if="type == '2'"> 14 <view style="display: flex;" v-if="type == '2'">
15 - <view :class="onindex == '意见反馈编辑'?'onclasst1':'classt1'">  
16 - 意见反馈编辑 15 + <view :class="onindex == '事件上报编辑'?'onclasst1':'classt1'">
  16 + 事件上报编辑
17 <view class="onindex"></view> 17 <view class="onindex"></view>
18 </view> 18 </view>
19 </view> 19 </view>
20 <view style="flex: 1;overflow-y: scroll;"> 20 <view style="flex: 1;overflow-y: scroll;">
21 - <view v-if="onindex == '意见反馈'" style="overflow-y: scroll;height: 100%;"> 21 + <view v-if="onindex == '事件上报'" style="overflow-y: scroll;height: 100%;">
22 <view class="fromitem"> 22 <view class="fromitem">
23 <view class="t1 tit1"> 23 <view class="t1 tit1">
24 上报位置 24 上报位置
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <u-button style="width: 100%;" type="success" @click="submit">提交</u-button> 54 <u-button style="width: 100%;" type="success" @click="submit">提交</u-button>
55 </view> 55 </view>
56 </view> 56 </view>
57 - <scroll-view style="height: 100%;" scroll-y v-if="onindex == '我的反馈'" @scrolltolower="scrolltolower"> 57 + <scroll-view style="height: 100%;" scroll-y v-if="onindex == '我的上报'" @scrolltolower="scrolltolower">
58 <view v-if="mylist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view> 58 <view v-if="mylist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
59 <view style="background: #fff;border-radius: 18rpx;padding: 30rpx;margin-top: 30rpx;" 59 <view style="background: #fff;border-radius: 18rpx;padding: 30rpx;margin-top: 30rpx;"
60 v-for="(item,index) in mylist"> 60 v-for="(item,index) in mylist">
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 </view> 86 </view>
87 </view> 87 </view>
88 </scroll-view> 88 </scroll-view>
89 - <view v-if="onindex == '意见反馈编辑'"> 89 + <view v-if="onindex == '事件上报编辑'">
90 <view class="fromitem"> 90 <view class="fromitem">
91 <view class="t1 tit1"> 91 <view class="t1 tit1">
92 上报位置 92 上报位置
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 typeShow: false, 142 typeShow: false,
143 typeList: [], 143 typeList: [],
144 ontype: null, 144 ontype: null,
145 - onindex: '意见反馈', 145 + onindex: '事件上报',
146 form: { 146 form: {
147 problemDescribe: '', 147 problemDescribe: '',
148 reportLocation: '', 148 reportLocation: '',
@@ -190,7 +190,7 @@ @@ -190,7 +190,7 @@
190 }, 190 },
191 qux() { 191 qux() {
192 this.type = '1' 192 this.type = '1'
193 - this.changeonindex('我的反馈') 193 + this.changeonindex('我的上报')
194 }, 194 },
195 remove(e) { 195 remove(e) {
196 this.removeinfo = e 196 this.removeinfo = e
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 }) 202 })
203 this.ontype = this.removeinfo.eventTypeName; 203 this.ontype = this.removeinfo.eventTypeName;
204 console.error(this.fist) 204 console.error(this.fist)
205 - this.onindex = '意见反馈编辑' 205 + this.onindex = '事件上报编辑'
206 this.type = '2' 206 this.type = '2'
207 }, 207 },
208 removeonfo() { 208 removeonfo() {
@@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
219 }) 219 })
220 setTimeout(() => { 220 setTimeout(() => {
221 this.type = '1' 221 this.type = '1'
222 - this.changeonindex('我的反馈') 222 + this.changeonindex('我的上报')
223 }, 1000); 223 }, 1000);
224 } else{ 224 } else{
225 uni.showToast({ 225 uni.showToast({
@@ -253,9 +253,9 @@ @@ -253,9 +253,9 @@
253 this.mylist = [] 253 this.mylist = []
254 this.ontype = null 254 this.ontype = null
255 this.page = 0 255 this.page = 0
256 - if (this.onindex == '意见反馈') { 256 + if (this.onindex == '事件上报') {
257 257
258 - } else if (this.onindex == '我的反馈') { 258 + } else if (this.onindex == '我的上报') {
259 this.gain() 259 this.gain()
260 } 260 }
261 }, 261 },
@@ -291,7 +291,7 @@ @@ -291,7 +291,7 @@
291 userPhone: uni.getStorageSync('user').phone, 291 userPhone: uni.getStorageSync('user').phone,
292 } 292 }
293 setTimeout(() => { 293 setTimeout(() => {
294 - this.changeonindex('我的反馈') 294 + this.changeonindex('我的上报')
295 }, 1000); 295 }, 1000);
296 } else{ 296 } else{
297 uni.showToast({ 297 uni.showToast({
lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
  View file @2210df3
@@ -49,12 +49,12 @@ @@ -49,12 +49,12 @@
49 49
50 <view class="form-item"> 50 <view class="form-item">
51 <view class="label">实际使用面积</view> 51 <view class="label">实际使用面积</view>
52 - <text v-if='record.cereBasicInformationShop.actualUsableArea'>{{record.cereBasicInformationShop.actualUsableArea}}/M²</text> 52 + <text v-if='record.cereBasicInformationShop.actualUsableArea'>{{record.cereBasicInformationShop.actualUsableArea}}m²</text>
53 <text v-else>无</text> 53 <text v-else>无</text>
54 </view> 54 </view>
55 <view class="form-item"> 55 <view class="form-item">
56 <view class="label">产权面积</view> 56 <view class="label">产权面积</view>
57 - <text v-if='record.cereBasicInformationShop.propertyArea'>{{record.cereBasicInformationShop.propertyArea}}/M²</text> 57 + <text v-if='record.cereBasicInformationShop.propertyArea'>{{record.cereBasicInformationShop.propertyArea}}m²</text>
58 <text v-else>无</text> 58 <text v-else>无</text>
59 </view> 59 </view>
60 <view class="form-item"> 60 <view class="form-item">
lvdao-miniapp/pagesA/rentPay/goPay.vue
  View file @2210df3
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 </view> 9 </view>
10 <view style="height: 120rpx;"></view> 10 <view style="height: 120rpx;"></view>
11 <view class="page-footer"> 11 <view class="page-footer">
12 - <u-button style="width: 100%;border-radius: 15px;" type="success" @click="submit">支付</u-button> 12 + <u-button style="width: 100%;border-radius: 15px;" type="success" @click="submit">支付</u-button>
13 </view> 13 </view>
14 </view> 14 </view>
15 </template> 15 </template>
@@ -18,68 +18,71 @@ @@ -18,68 +18,71 @@
18 export default { 18 export default {
19 data() { 19 data() {
20 return { 20 return {
21 - receivedMsg:[],  
22 - allPay:0  
23 - } 21 + receivedMsg: [],
  22 + allPay: 0
  23 + }
24 }, 24 },
25 onLoad(options) { 25 onLoad(options) {
26 - if(options.msg){  
27 - let receivedMsg = JSON.parse(options.msg)  
28 - this.receivedMsg = receivedMsg  
29 - receivedMsg.map(item=>{  
30 - this.allPay += item.paymentAmount  
31 - })  
32 - } 26 + if (options.msg) {
  27 + let receivedMsg = JSON.parse(options.msg)
  28 + this.receivedMsg = receivedMsg
  29 + receivedMsg.map(item => {
  30 + this.allPay += item.paymentAmount
  31 + })
  32 + }
33 }, 33 },
34 onShow() { 34 onShow() {
35 - const isLogin = uni.getStorageSync('token');  
36 - if (isLogin == '') {  
37 - // 如果未登录，跳转到登录页面  
38 - uni.navigateTo({  
39 - url: '/pages/login/login'  
40 - })  
41 - } else {  
42 -  
43 - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {  
44 - if(res.data.code == '20004' || res.data.code == '20003'){  
45 - uni.navigateTo({  
46 - url: '/pages/login/login'  
47 - })  
48 - }  
49 - })  
50 - }  
51 -  
52 - },  
53 - methods: {  
54 - submit(){  
55 -  
56 - let arr = []  
57 - this.receivedMsg.map(item=>{  
58 - let obj = {  
59 - orderId:item.tenementOrder,  
60 - money:item.paymentAmount,  
61 - }  
62 - arr.push(obj) 35 + const isLogin = uni.getStorageSync('token');
  36 + if (isLogin == '') {
  37 + // 如果未登录，跳转到登录页面
  38 + uni.navigateTo({
  39 + url: '/pages/login/login'
  40 + })
  41 + } else {
  42 +
  43 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
  44 + "pageSize": 10,
  45 + pageNumber: 0,
  46 + phone: uni.getStorageSync('user').phone
  47 + }).then(res => {
  48 + if (res.data.code == '20004' || res.data.code == '20003') {
  49 + uni.navigateTo({
  50 + url: '/pages/login/login'
63 }) 51 })
64 -  
65 - // return  
66 - this.$http.sendRequest('/order/rentAggregatePayment','POST',arr,3).then(res => {  
67 - console.log(JSON.parse(res.data.data).data.codeUrl)  
68 - if(res.data.data){  
69 - uni.redirectTo({  
70 - url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`  
71 - })  
72 - } 52 + }
  53 + })
  54 + }
  55 +
  56 + },
  57 + methods: {
  58 + submit() {
  59 +
  60 + let arr = []
  61 + this.receivedMsg.map(item => {
  62 + let obj = {
  63 + orderId: item.tenementOrder,
  64 + money: item.paymentAmount,
  65 + }
  66 + arr.push(obj)
  67 + })
  68 +
  69 + // return
  70 + this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
  71 + console.log(JSON.parse(res.data.data).data.codeUrl)
  72 + if (res.data.data) {
  73 + uni.redirectTo({
  74 + url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
73 }) 75 })
74 -  
75 } 76 }
76 - }  
77 -}  
78 - 77 + })
  78 +
  79 + }
  80 + }
  81 + }
79 </script> 82 </script>
80 83
81 <style scoped lang="scss"> 84 <style scoped lang="scss">
82 - .page{ 85 + .page {
83 position: absolute; 86 position: absolute;
84 left: 0; 87 left: 0;
85 top: 0; 88 top: 0;
@@ -87,32 +90,36 @@ @@ -87,32 +90,36 @@
87 height: 100%; 90 height: 100%;
88 padding: 0 20rpx; 91 padding: 0 20rpx;
89 } 92 }
90 - .timsg{  
91 - height:20vh; 93 +
  94 + .timsg {
  95 + height: 20vh;
92 text-align: center; 96 text-align: center;
93 padding: 50px 0; 97 padding: 50px 0;
94 - .msgtitle{ 98 +
  99 + .msgtitle {
95 margin-bottom: 20px; 100 margin-bottom: 20px;
96 font-size: 30rpx; 101 font-size: 30rpx;
97 color: #A4A4A4; 102 color: #A4A4A4;
98 } 103 }
  104 +
99 .price { 105 .price {
100 color: #0FBB59; 106 color: #0FBB59;
101 font-size: 50rpx; 107 font-size: 50rpx;
102 font-weight: 700; 108 font-weight: 700;
103 } 109 }
104 } 110 }
105 - .page-footer{ 111 +
  112 + .page-footer {
106 position: fixed; 113 position: fixed;
107 left: 0; 114 left: 0;
108 bottom: 0; 115 bottom: 0;
109 width: 100%; 116 width: 100%;
110 - 117 +
111 background-color: #FFFFFF; 118 background-color: #FFFFFF;
112 padding: 20rpx 20rpx; 119 padding: 20rpx 20rpx;
113 padding-bottom: constant(safe-area-inset-bottom); 120 padding-bottom: constant(safe-area-inset-bottom);
114 padding-bottom: env(safe-area-inset-bottom); 121 padding-bottom: env(safe-area-inset-bottom);
115 z-index: 999; 122 z-index: 999;
116 -  
117 - } 123 +
  124 + }
118 </style> 125 </style>
119 \ No newline at end of file 126 \ No newline at end of file
lvdao-miniapp/pagesA/rentPay/rentPay.scss
  View file @2210df3
@@ -96,10 +96,9 @@ @@ -96,10 +96,9 @@
96 bottom: 0; 96 bottom: 0;
97 width: 100%; 97 width: 100%;
98 background-color: #FFFFFF; 98 background-color: #FFFFFF;
99 - padding: 10rpx 20rpx;  
100 - padding-bottom: constant(safe-area-inset-bottom);  
101 - padding-bottom: env(safe-area-inset-bottom); 99 + padding: 30rpx;
102 z-index: 999; 100 z-index: 999;
  101 + box-sizing: border-box;
103 .footer-buy{ 102 .footer-buy{
104 display: flex; 103 display: flex;
105 align-items: center; 104 align-items: center;
@@ -112,14 +111,7 @@ @@ -112,14 +111,7 @@
112 min-width: 20%; 111 min-width: 20%;
113 height: 70rpx; 112 height: 70rpx;
114 } 113 }
115 - .buttons{  
116 - font-size: 30rpx;  
117 114
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 { 115 .u-size-default.data-v-3bf2dba7 {
124 font-size: 30rpx; 116 font-size: 30rpx;
125 height: 100% !important; 117 height: 100% !important;
lvdao-miniapp/pagesA/rentPay/rentPay.vue
  View file @2210df3
@@ -219,10 +219,32 @@ @@ -219,10 +219,32 @@
219 payArr.push(item) 219 payArr.push(item)
220 } 220 }
221 }) 221 })
222 - const msg = JSON.stringify(payArr)  
223 - uni.navigateTo({  
224 - url: `/pagesA/rentPay/goPay?msg=${msg}` 222 +
  223 + let arr = []
  224 + payArr.map(item => {
  225 + let obj = {
  226 + orderId: item.tenementOrder,
  227 + money: item.paymentAmount,
  228 + }
  229 + arr.push(obj)
  230 + })
  231 +
  232 + // return
  233 + this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
  234 + console.log(res.data)
  235 + if (res.data.data) {
  236 + // uni.redirectTo({
  237 + // url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}`
  238 + // })
  239 + }
225 }) 240 })
  241 +
  242 +
  243 +
  244 + // const msg = JSON.stringify(payArr)
  245 + // uni.navigateTo({
  246 + // url: `/pagesA/rentPay/goPay?msg=${msg}`
  247 + // })
226 } 248 }
227 }, 249 },
228 confirm(e) { 250 confirm(e) {
lvdao-miniapp/pagesA/weball/web.vue 0 → 100644
  View file @2210df3
  1 +<template>
  2 + <view>
  3 + <web-view :src="url"></web-view>
  4 + </view>
  5 +</template>
  6 +
  7 +<script>
  8 + export default {
  9 + data() {
  10 + return {
  11 + url:''
  12 + }
  13 + },
  14 + onLoad(e) {
  15 + if(e.url) {
  16 + this.url = e.url
  17 + }
  18 + },
  19 + methods: {
  20 +
  21 + }
  22 + }
  23 +</script>
  24 +
  25 +<style>
  26 +
  27 +</style>
lvdao-miniapp/static/icon/icon1.png
View file @2210df3

637 Bytes | W: | H:

632 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon11.png
View file @2210df3

1.11 KB | W: | H:

881 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon12.png
View file @2210df3

1.37 KB | W: | H:

1.08 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon13.png
View file @2210df3

1.32 KB | W: | H:

1.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon14.png
View file @2210df3

1.2 KB | W: | H:

1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon15.png
View file @2210df3

1.11 KB | W: | H:

955 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon16.png
View file @2210df3

4.14 KB | W: | H:

2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon2.png
View file @2210df3

457 Bytes | W: | H:

446 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon4.png
View file @2210df3

471 Bytes | W: | H:

467 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon6.png
View file @2210df3

497 Bytes | W: | H:

492 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/static/icon/icon7.png
View file @2210df3

1.3 KB | W: | H:

563 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
lvdao-miniapp/utils/request.js
  View file @2210df3
@@ -21,16 +21,16 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -21,16 +21,16 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23
24 - bases = 'http://128.10.249.8:9003'+ url; 24 + // bases = 'http://128.10.249.8:9003'+ url;
25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26
27 - // bases = c1 + 'cdwlMall/meserver/admin-server' + url; 27 + bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28
29 }else if(baseUrl == 3){ 29 }else if(baseUrl == 3){
30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 // bases = 'http://128.10.249.22:9003:9007' + url; 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33 - // bases = 'http://128.10.249.23:9007' + url; 33 + // bases = 'http://128.10.249.8:9007' + url;
34 bases = c1 + 'cdwlMall/meserver/api' + url; 34 bases = c1 + 'cdwlMall/meserver/api' + url;
35 35
36 }else{ 36 }else{
@@ -39,7 +39,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -39,7 +39,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42 - // bases = 'http://128.10.249.23:9004' + url; 42 + // bases = 'http://128.10.249.8:9004' + url;
43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44 bases = c1 + 'cdwlMall/business-server' + url; 44 bases = c1 + 'cdwlMall/business-server' + url;
45 45
lvdao-miniapp/utils/tool.js 0 → 100644
  View file @2210df3
  1 +export function toMiniPay(payId, backPath) {
  2 + return new Promise((resolve, reject) =>{
  3 + console.error(payId, backPath)
  4 + uni.navigateToMiniProgram({
  5 + appId: "wxf0f8b911ac324457", //支付小程序的
  6 + path:`pages/common/travelMini?payId=${payId}`, // 打开支付小程序的指定页面
  7 + extraData: {}, //需要传递给目标小程序的数据
  8 + envVersion: "trial", //打开的对应小程序环境:开发 develop、体验 tria1、生产 release
  9 + success: function() {
  10 + resolve(); //成功回调
  11 + },
  12 + fail: function(res) {
  13 + console.log(res);
  14 + if (backPath) {
  15 + uni.reLaunch({
  16 + ur1: `${backPath}?paystate=CANCEL PAY`
  17 + });
  18 + } else {
  19 + console.log("取消支付就停留在当前页");
  20 + }
  21 + reject("跳转失败");
  22 + }
  23 + })
  24 + })
  25 +}
0 \ No newline at end of file 26 \ No newline at end of file