webapp / GreenwayWeb

Commit 440bccdab80d7b8e390c60546763c2d26d0bdf75

Authored by wesley88
1 parent f4459224

1

Inline Side-by-side
Showing 27 changed files with 166 additions and 77 deletions
admin-web-master/src/components/add/addcd.vue
  View file @440bccd
... ... @@ -83,8 +83,8 @@
83 83 <upimg filePath="cd" inputtype="displayImage" :value="ruleForm.displayImage"
84 84 @changimg="e=>changimg(e,'displayImage')"></upimg>
85 85 </el-form-item>
86   - <el-form-item label="其他视频" prop="otherImageVideos">
87   - <upfile filePath="cd" inputtype="otherImageVideos" :value="ruleForm.otherImageVideos" @changimg="e=>changimg(e,'otherImageVideos')"></upfile>
  86 + <el-form-item label="其他视频" prop="otherMedia">
  87 + <upfile filePath="cd" inputtype="otherMedia" :value="ruleForm.otherMedia" @changimg="e=>changimg(e,'otherMedia')"></upfile>
88 88 </el-form-item>
89 89 <el-row :gutter="20">
90 90 <el-col :span="12">
... ...
admin-web-master/src/components/chakan/fa.vue
  View file @440bccd
... ... @@ -54,11 +54,11 @@
54 54 {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
55 55 </template>
56 56 </el-table-column>
57   - <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
  57 + <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
58 58 <template slot-scope="scope">
59 59 {{scope.row.shopinfo.payDay || '-'}}
60 60 </template>
61   - </el-table-column>
  61 + </el-table-column> -->
62 62 <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
63 63 <template slot-scope="scope">
64 64 {{scope.row.info.publishStatus=='0'?'空置中':scope.row.info.publishStatus=='1'?'待审核':scope.row.info.publishStatus=='2'?'已发布':scope.row.info.publishStatus=='3'?'不通过':'-'}}
... ...
admin-web-master/src/components/chakan/oneht.vue
  View file @440bccd
... ... @@ -68,7 +68,7 @@
68 68 </el-row>
69 69 <el-row :gutter="20">
70 70 <el-col :span="9">
71   - <el-form-item label="付款日" prop="paymentDay">
  71 + <el-form-item label="首次付款日" prop="paymentDay">
72 72 <div class="duiqi">{{newinfo.paymentDay}}</div>
73 73 </el-form-item>
74 74 </el-col>
... ...
admin-web-master/src/components/newmap/index.vue
  View file @440bccd
... ... @@ -3,7 +3,7 @@
3 3 <div id="mapContainer" class="map"></div>
4 4 <div class="search-box">
5 5 <input v-model="searchQuery" placeholder="输入地址进行搜索" />
6   - <button @click="searchLocation">搜索</button>
  6 + <button type="button" @click="searchLocation">搜索</button>
7 7 </div>
8 8 <div v-if="searchResults.length > 0" class="search-results">
9 9 <ul>
... ...
admin-web-master/src/components/newmap/indexall.vue
  View file @440bccd
... ... @@ -3,7 +3,7 @@
3 3 <div id="container"></div>
4 4 <div class="search-box">
5 5 <input v-model="searchQuery" placeholder="输入地址进行搜索" />
6   - <button @click="searchLocation">搜索</button>
  6 + <button type="button" @click="searchLocation">搜索</button>
7 7 </div>
8 8 <!-- <div id="toolControl">
9 9 <div
... ...
admin-web-master/src/components/resourceCommodity/index.vue
  View file @440bccd
... ... @@ -168,7 +168,7 @@
168 168 </el-table-column>
169 169 <el-table-column label="付款周期" prop="leaseTerm">
170 170 </el-table-column>
171   - <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column>
  171 + <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip></el-table-column> -->
172 172 <!-- <el-table-column label="是否出租" prop="isRental" min-width="100">
173 173 <template slot-scope="scope">
174 174 {{scope.row.isRental == '0'?'否':'是'}}
... ...
admin-web-master/src/utils/request.js
  View file @440bccd
... ... @@ -17,8 +17,8 @@ let baseURL = &#39;&#39;
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19 19 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20   - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
21   - baseURL = 'http://128.10.249.21:9003';
  20 + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  21 + // baseURL = 'http://128.10.249.21:9003';
22 22  
23 23 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
24 24 // baseURL = 'http://192.168.2.225:9003';
... ...
admin-web-master/src/views/business/businessList/busCha.vue
  View file @440bccd
... ... @@ -363,9 +363,9 @@
363 363 <el-table-column label="租金/周期" min-width="150" >
364 364  
365 365 </el-table-column>
366   - <el-table-column label="付款日" min-width="150" >
  366 + <!-- <el-table-column label="付款日" min-width="150" >
367 367  
368   - </el-table-column>
  368 + </el-table-column> -->
369 369 <el-table-column label="缴费时间" min-width="150">
370 370 <template slot-scope="scope">
371 371  
... ...
admin-web-master/src/views/detect copy/admap.vue
  View file @440bccd
... ... @@ -1574,7 +1574,7 @@
1574 1574 </el-form-item>
1575 1575 </el-col>
1576 1576 </el-row>
1577   - <el-row :gutter="20">
  1577 + <!-- <el-row :gutter="20">
1578 1578 <el-col :span="8">
1579 1579 <el-form-item label="付款日" prop="shopName">
1580 1580 <div class="duiqi">{{editbgid.shopName}}</div>
... ... @@ -1583,7 +1583,7 @@
1583 1583 </el-col>
1584 1584  
1585 1585  
1586   - </el-row>
  1586 + </el-row> -->
1587 1587 <el-row :gutter="20">
1588 1588 <el-col :span="24">
1589 1589 <el-form-item label="优惠政策" prop="floorSpace">
... ...
admin-web-master/src/views/detect copy/information copy.vue
  View file @440bccd
... ... @@ -598,7 +598,7 @@
598 598 </el-form-item>
599 599 </el-col>
600 600 </el-row>
601   - <el-row :gutter="20">
  601 + <!-- <el-row :gutter="20">
602 602 <el-col :span="8">
603 603 <el-form-item label="付款日" prop="shopName">
604 604 <div class="duiqi">{{editbgid.shopName}}</div>
... ... @@ -607,7 +607,7 @@
607 607 </el-col>
608 608  
609 609  
610   - </el-row>
  610 + </el-row> -->
611 611 <el-row :gutter="20">
612 612 <el-col :span="24">
613 613 <el-form-item label="优惠政策" prop="floorSpace">
... ...
admin-web-master/src/views/detect copy/map.vue
  View file @440bccd
... ... @@ -646,7 +646,7 @@
646 646 </el-form-item>
647 647 </el-col>
648 648 </el-row>
649   - <el-row :gutter="20">
  649 + <!-- <el-row :gutter="20">
650 650 <el-col :span="8">
651 651 <el-form-item label="付款日" prop="shopName">
652 652 <div class="duiqi">{{editbgid.shopName}}</div>
... ... @@ -655,7 +655,7 @@
655 655 </el-col>
656 656  
657 657  
658   - </el-row>
  658 + </el-row> -->
659 659 <el-row :gutter="20">
660 660 <el-col :span="24">
661 661 <el-form-item label="优惠政策" prop="floorSpace">
... ...
admin-web-master/src/views/detect/admap copy.vue
  View file @440bccd
... ... @@ -1574,7 +1574,7 @@
1574 1574 </el-form-item>
1575 1575 </el-col>
1576 1576 </el-row>
1577   - <el-row :gutter="20">
  1577 + <!-- <el-row :gutter="20">
1578 1578 <el-col :span="8">
1579 1579 <el-form-item label="付款日" prop="shopName">
1580 1580 <div class="duiqi">{{editbgid.shopName}}</div>
... ... @@ -1583,7 +1583,7 @@
1583 1583 </el-col>
1584 1584  
1585 1585  
1586   - </el-row>
  1586 + </el-row> -->
1587 1587 <el-row :gutter="20">
1588 1588 <el-col :span="24">
1589 1589 <el-form-item label="优惠政策" prop="floorSpace">
... ...
admin-web-master/src/views/detect/map.vue
  View file @440bccd
... ... @@ -646,7 +646,7 @@
646 646 </el-form-item>
647 647 </el-col>
648 648 </el-row>
649   - <el-row :gutter="20">
  649 + <!-- <el-row :gutter="20">
650 650 <el-col :span="8">
651 651 <el-form-item label="付款日" prop="shopName">
652 652 <div class="duiqi">{{editbgid.shopName}}</div>
... ... @@ -655,7 +655,7 @@
655 655 </el-col>
656 656  
657 657  
658   - </el-row>
  658 + </el-row> -->
659 659 <el-row :gutter="20">
660 660 <el-col :span="24">
661 661 <el-form-item label="优惠政策" prop="floorSpace">
... ...
admin-web-master/src/views/shopRental/renewalMan/busCha.vue
  View file @440bccd
... ... @@ -364,9 +364,9 @@
364 364 <el-table-column label="租金/周期" min-width="150" >
365 365  
366 366 </el-table-column>
367   - <el-table-column label="付款日" min-width="150" >
  367 + <!-- <el-table-column label="付款日" min-width="150" >
368 368  
369   - </el-table-column>
  369 + </el-table-column> -->
370 370 <el-table-column label="缴费时间" min-width="150">
371 371 <template slot-scope="scope">
372 372  
... ...
admin-web-master/src/views/shopRental/rentTermination/busCha.vue
  View file @440bccd
... ... @@ -364,9 +364,9 @@
364 364 <el-table-column label="租金/周期" min-width="150" >
365 365  
366 366 </el-table-column>
367   - <el-table-column label="付款日" min-width="150" >
  367 + <!-- <el-table-column label="付款日" min-width="150" >
368 368  
369   - </el-table-column>
  369 + </el-table-column> -->
370 370 <el-table-column label="缴费时间" min-width="150">
371 371 <template slot-scope="scope">
372 372  
... ...
admin-web-master/src/views/shopRental/rentalMan/busCha.vue
  View file @440bccd
... ... @@ -364,9 +364,9 @@
364 364 <el-table-column label="租金/周期" min-width="150" >
365 365  
366 366 </el-table-column>
367   - <el-table-column label="付款日" min-width="150" >
  367 + <!-- <el-table-column label="付款日" min-width="150" >
368 368  
369   - </el-table-column>
  369 + </el-table-column> -->
370 370 <el-table-column label="缴费时间" min-width="150">
371 371 <template slot-scope="scope">
372 372  
... ...
admin-web-master/src/views/shopRental/warning/busCha.vue
  View file @440bccd
... ... @@ -364,9 +364,9 @@
364 364 <el-table-column label="租金/周期" min-width="150" >
365 365  
366 366 </el-table-column>
367   - <el-table-column label="付款日" min-width="150" >
  367 + <!-- <el-table-column label="付款日" min-width="150" >
368 368  
369   - </el-table-column>
  369 + </el-table-column> -->
370 370 <el-table-column label="缴费时间" min-width="150">
371 371 <template slot-scope="scope">
372 372  
... ...
lvdao-miniapp/main.js
  View file @440bccd
... ... @@ -8,11 +8,13 @@ import uView from &quot;uview-ui&quot;;
8 8 import DialogBox from './components/DialogBox/DialogBox';
9 9 // let hostall = window.location.href;
10 10 // let c1 = hostall.split('cdwlMall')[0];
11   -let c1 = 'https://jy.scjysm.asia:18086/'
  11 +// let c1 = 'https://jy.scjysm.asia:18086/'
  12 +let c1 = 'https://zhgw-uat.028wlkj.com/'
12 13 Vue.config.productionTip = false
13 14 Vue.prototype.$http = http
14 15 Vue.prototype.$imgUrl = (url) => {
15   - return (c1 + "cdwlMall/questionnaire/file/static" + url);
  16 + // return (c1 + "cdwlMall/questionnaire/file/static" + url);
  17 + return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
16 18 }
17 19 Vue.prototype.$img = c1+ 'cdwlMall'
18 20 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
... ...
lvdao-miniapp/pages/advertisement/advertisement.vue
  View file @440bccd
... ... @@ -32,7 +32,7 @@
32 32 <view class="goods-list">
33 33 <view class="list" v-for="(item,index) in tableData" :key="index" @click="toDetail(item)">
34 34 <view class="thumb">
35   - <u-image width="20vw" height="20vw" border-radius="20" :src="imgurl + item.locationDiagram"></u-image>
  35 + <u-image width="20vw" height="20vw" border-radius="20" :src="item.locationDiagram.length>0?imgurl +item.locationDiagram.split(',')[0]:'' "></u-image>
36 36 <!-- <image :src="item.locationDiagram" mode="widthFix"></image> -->
37 37 </view>
38 38 <view class="item">
... ...
lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
  View file @440bccd
... ... @@ -12,7 +12,7 @@
12 12  
13 13 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
14 14 <view class="add-list">
15   - <u-form-item label="*投放时段" prop="scheduleTime" borderBottom>
  15 + <u-form-item :required="true" label="投放时段" prop="scheduleTime" borderBottom>
16 16 <u-input v-model="model1.scheduleTime" type="select" placeholder="请选择上面时间" ></u-input>
17 17 <!-- <u-input v-model="model1.scheduleTime" type="select" @click="TimeStratshow = true"
18 18 placeholder="请选择" /> -->
... ... @@ -21,15 +21,15 @@
21 21 </u-form-item>
22 22 </view>
23 23 <view class="add-list">
24   - <u-form-item label="*跳转类型" prop="advertisementContent" borderBottom>
  24 + <u-form-item :required="true" label="跳转类型" prop="advertisementContent" borderBottom>
25 25 <u-input v-model="model1.advertisementContent"></u-input>
26 26 </u-form-item>
27   - <u-form-item label="*链接" prop="redirectUrl" borderBottom>
  27 + <u-form-item :required="true" label="链接" prop="redirectUrl" borderBottom>
28 28 <u-input v-model="model1.redirectUrl"></u-input>
29 29 </u-form-item>
30 30 </view>
31 31 <view class="add-list">
32   - <u-form-item label="*封面图片" prop="coverImage" borderBottom labelPosition="top">
  32 + <u-form-item :required="true" label="封面图片" prop="coverImage" borderBottom labelPosition="top">
33 33 <u-upload :action="$upload" :auto-upload="false" ref="coverImage" :max-count="1"
34 34 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'coverImage')"></u-upload>
35 35 </u-form-item>
... ... @@ -38,7 +38,7 @@
38 38 </u-form-item> -->
39 39 </view>
40 40 <view class="add-list">
41   - <u-form-item label="*广告标题" prop="adTitle" borderBottom labelPosition="top">
  41 + <u-form-item :required="true" label="广告标题" prop="adTitle" borderBottom labelPosition="top">
42 42 <u-input v-model="model1.adTitle" />
43 43 </u-form-item>
44 44 </view>
... ... @@ -51,50 +51,50 @@
51 51  
52 52 <view class="add-list" v-show='active == 1'>
53 53 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
54   - <u-form-item label="*主体名称" prop="subjectName" borderBottom>
  54 + <u-form-item :required="true" label="主体名称" prop="subjectName" borderBottom>
55 55 <u-input v-model="model1.subjectName"></u-input>
56 56 </u-form-item>
57   - <u-form-item label="*统一社会信用代码" prop="unifiedSocialCreditCode" borderBottom>
  57 + <u-form-item :required="true" label="统一社会信用代码" prop="unifiedSocialCreditCode" borderBottom>
58 58 <u-input v-model="model1.unifiedSocialCreditCode"></u-input>
59 59 </u-form-item>
60   - <u-form-item label="*类型" prop="type" borderBottom>
  60 + <u-form-item :required="true" label="类型" prop="type" borderBottom>
61 61 <u-input v-model="model1.type" type="select" @click="typeShow = true" placeholder='请选择类型' />
62 62 </u-form-item>
63   - <u-form-item label="*法定代表人" prop="legalRepresentative" borderBottom>
  63 + <u-form-item :required="true" label="法定代表人" prop="legalRepresentative" borderBottom>
64 64 <u-input v-model="model1.legalRepresentative"></u-input>
65 65 </u-form-item>
66   - <u-form-item label="*经营范围" prop="businessScope" borderBottom>
  66 + <u-form-item :required="true" label="经营范围" prop="businessScope" borderBottom>
67 67 <u-input v-model="model1.businessScope"></u-input>
68 68 </u-form-item>
69   - <u-form-item label="*注册资本" prop="registeredCapital" borderBottom>
  69 + <u-form-item :required="true" label="注册资本" prop="registeredCapital" borderBottom>
70 70 <u-input v-model="model1.registeredCapital"></u-input>
71 71 </u-form-item>
72   - <u-form-item label="*成立日期" prop="establishmentDate" borderBottom>
  72 + <u-form-item :required="true" label="成立日期" prop="establishmentDate" borderBottom>
73 73 <!-- <u-input v-model="model1.establishmentDate"></u-input> -->
74 74 <u-input v-model="model1.establishmentDate" type="select" @click="establishow = true"
75 75 placeholder="请选择" />
76 76 <u-picker mode="time" v-model="establishow" :params="params"
77 77 @confirm="establiChange"></u-picker>
78 78 </u-form-item>
79   - <u-form-item label="*住所" prop="address" borderBottom>
  79 + <u-form-item :required="true" label="住所" prop="address" borderBottom>
80 80 <u-input v-model="model1.address"></u-input>
81 81 </u-form-item>
82   - <u-form-item label="*邮箱地址" prop="emailAddress" borderBottom>
  82 + <u-form-item :required="true" label="邮箱地址" prop="emailAddress" borderBottom>
83 83 <u-input v-model="model1.emailAddress"></u-input>
84 84 </u-form-item>
85   - <u-form-item label="*经营开始时间" prop="businessStartDate" borderBottom>
  85 + <u-form-item :required="true" label="经营开始时间" prop="businessStartDate" borderBottom>
86 86 <u-input v-model="model1.businessStartDate" type="select" @click="busStartshow = true"
87 87 placeholder="请选择" />
88 88 <u-picker mode="time" v-model="busStartshow" :params="params"
89 89 @confirm="busStTimeChange"></u-picker>
90 90 </u-form-item>
91   - <u-form-item label="*经营结束时间" prop="businessEndDate" borderBottom>
  91 + <u-form-item :required="true" label="经营结束时间" prop="businessEndDate" borderBottom>
92 92 <u-input v-model="model1.businessEndDate" type="select" @click="busEndtshow = true"
93 93 placeholder="请选择" />
94 94 <u-picker mode="time" v-model="busEndtshow" :params="params"
95 95 @confirm="busEndTimeChange"></u-picker>
96 96 </u-form-item>
97   - <u-form-item label="*营业执照" prop="businessLicense" borderBottom labelPosition="top">
  97 + <u-form-item :required="true" label="营业执照" prop="businessLicense" borderBottom labelPosition="top">
98 98 <u-upload :action="$upload" :auto-upload="false" ref="businessLicense" :max-count="1"
99 99 @on-choose-complete="(response, file, fileList) => onsuccess1(response, file, fileList, 'businessLicense')"></u-upload>
100 100 <!-- <u-upload :action="$upload" :auto-upload="true" ref="businessLicense" :max-count="1"></u-upload> -->
... ... @@ -106,23 +106,23 @@
106 106 <view v-show="active == 2">
107 107 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
108 108 <view class="add-list">
109   - <u-form-item label="*经营者姓名" prop="lesseeName" borderBottom>
  109 + <u-form-item :required="true" label="经营者姓名" prop="lesseeName" borderBottom>
110 110 <u-input v-model="model1.lesseeName"></u-input>
111 111 </u-form-item>
112   - <u-form-item label="*证件类型" prop="idCardType" borderBottom>
  112 + <u-form-item :required="true" label="证件类型" prop="idCardType" borderBottom>
113 113 <u-input v-model="model1.idCardType" type="select" @click="IdtypeShow = true"
114 114 placeholder='请选择类型' />
115 115 </u-form-item>
116   - <u-form-item label="*身份证号码" prop="idCardNumber" borderBottom>
  116 + <u-form-item :required="true" label="身份证号码" prop="idCardNumber" borderBottom>
117 117 <u-input v-model="model1.idCardNumber"></u-input>
118 118 </u-form-item>
119   - <u-form-item label="*身份证有效开始时间" prop="idCardValidStart" borderBottom>
  119 + <u-form-item :required="true" label="身份证有效开始时间" prop="idCardValidStart" borderBottom>
120 120 <u-input v-model="model1.idCardValidStart" type="select" @click="idCardStartshow = true"
121 121 placeholder="请选择" />
122 122 <u-picker mode="time" v-model="idCardStartshow" :params="params1"
123 123 @confirm="idCardStTimeChange"></u-picker>
124 124 </u-form-item>
125   - <u-form-item label="*身份证有效结束时间" prop="idCardValidEnd" borderBottom>
  125 + <u-form-item :required="true" label="身份证有效结束时间" prop="idCardValidEnd" borderBottom>
126 126 <u-input v-model="model1.idCardValidEnd" type="select" @click="idCardEndtshow = true"
127 127 placeholder="请选择" />
128 128 <u-picker mode="time" v-model="idCardEndtshow" :params="params1"
... ... @@ -176,13 +176,13 @@
176 176 style="display: inline-block; font-size: 24rpx; line-height: 30px; margin: 24rpx 30rpx 0;">请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。</text>
177 177 <view class="add-list" labelPosition="left" :model="model1" :rules="rules" ref="uForm"
178 178 :labelWidth="250">
179   - <u-form-item label="*是否为法人" prop="isLegalPerson" borderBottom>
  179 + <u-form-item :required="true" label="是否为法人" prop="isLegalPerson" borderBottom>
180 180 <u-radio-group v-model="model1.isLegalPerson">
181 181 <u-radio name="1" value="1">是</u-radio>
182 182 <u-radio name="0" value="0">否</u-radio>
183 183 </u-radio-group>
184 184 </u-form-item>
185   - <u-form-item label="*企业授权书" prop="enterpriseAuthorization" borderBottom labelPosition="top">
  185 + <u-form-item :required="true" label="企业授权书" prop="enterpriseAuthorization" borderBottom labelPosition="top">
186 186  
187 187 <u-upload :action="$upload" :auto-upload="true" ref="enter" :max-count="1"></u-upload>
188 188 </u-form-item>
... ...
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
  View file @440bccd
... ... @@ -64,8 +64,8 @@
64 64 </u-col>
65 65 <u-col span="12">
66 66 <view style="display: flex;flex-wrap: wrap;">
67   - <u-image :showLoading="true" v-for="(item,index) in list(tableData.locationDiagram)"
68   - v-if="tableData.locationDiagram" :src="imgUrl+item" width="140px" height="140px"
  67 + <u-image @click="openimg(tableData.locationDiagram,index)" :showLoading="true" v-for="(item,index) in list(tableData.locationDiagram)"
  68 + v-if="tableData.locationDiagram" :src="imgUrl+item" width="90px" height="90px"
69 69 border-radius="20" style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
70 70 <text v-else>暂无</text>
71 71 </view>
... ... @@ -135,6 +135,25 @@
135 135 })
136 136 },
137 137 methods: {
  138 + openimg(urls,index) {
  139 + urls =urls.split(',')
  140 + let list = urls.map(item=>{
  141 + return this.imgUrl + item
  142 + })
  143 + uni.previewImage({
  144 + current:index,
  145 + urls: list,
  146 + longPressActions: {
  147 + itemList: ['发送给朋友', '保存图片', '收藏'],
  148 + success: function(data) {
  149 + console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
  150 + },
  151 + fail: function(err) {
  152 + console.log(err.errMsg);
  153 + }
  154 + }
  155 + });
  156 + },
138 157 list(list) {
139 158 const imgs = list.split(',')
140 159 return imgs
... ...
lvdao-miniapp/pages/details/details.scss
  View file @440bccd
... ... @@ -5,10 +5,12 @@
5 5 overflow-x: hidden;
6 6 // overflow-y: auto;
7 7 }
  8 +
8 9 // 图片
9 10 .banner-img {
10 11 width: 100%;
11 12 height: 30vh;
  13 + line-height: 80rpx;
12 14 }
13 15 // 商铺信息
14 16 .banner {
... ...
lvdao-miniapp/pages/details/details.vue
  View file @440bccd
... ... @@ -4,9 +4,14 @@
4 4 <!-- <u-image :showLoading="true"
5 5 :src="$img + "
6 6 width="100%" height="100%"></u-image> -->
7   - <swiper :indicator-dots="false" :autoplay="true" :interval="3000" :duration="500" style="height: 30vh;">
  7 + <swiper :indicator-dots="true" :autoplay="false" :interval="3000" :duration="500" style="height: 30vh;" indicator-active-color="#fff">
8 8 <swiper-item v-for="(imageUrl, index) in lunbo" :key="index">
9   - <u-image :showLoading="true" :src="imageUrl.url" width="100%" height="100%"></u-image>
  9 + <view style="width: 100%;height: 100%;" v-if="imageUrl.type == 'img'" @click="openimg2(index)">
  10 + <u-image :showLoading="true" :src="imageUrl.url" width="100%" height="100%"></u-image>
  11 + </view>
  12 + <view style="width: 100%;height: 100%;" v-else>
  13 + <video style="width: 100%;height: 100%;" id="myVideo" :src="imageUrl.url"></video>
  14 + </view>
10 15 </swiper-item>
11 16 </swiper>
12 17 <!-- <u-swiper :list="lunbo" keyName="url" :autoplay="false" :indicator="false"></u-swiper> -->
... ... @@ -57,9 +62,9 @@
57 62 <view class="label">规划图纸：</view>
58 63 </view>
59 64 <view style="display: flex;flex-wrap: wrap;">
60   - <u-image :showLoading="true" v-for="(item,index) in tableData.architecturalDrawings"
61   - v-if="tableData.architecturalDrawings" :src="imgUrl+item" width="140px"
62   - height="140px" border-radius="20"
  65 + <u-image @click="openimg1(tableData.architecturalDrawings,index)" :showLoading="true" v-for="(item,index) in tableData.architecturalDrawings"
  66 + v-if="tableData.architecturalDrawings" :src="imgUrl+item" width="100px"
  67 + height="100px" border-radius="20"
63 68 style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
64 69 <text v-else>暂无</text>
65 70 </view>
... ... @@ -203,6 +208,20 @@
203 208 console.log(this.latitude, this.longitude)
204 209 this.lunbo = []
205 210 let list1 = []
  211 + if(data.otherImageVideos) {
  212 + let c1 = {
  213 + type:'video',
  214 + url:this.imgUrl+data.otherImageVideos
  215 + }
  216 + this.lunbo.push(c1)
  217 + }
  218 + if(data.otherMedia) {
  219 + let c1 = {
  220 + type:'video',
  221 + url:this.imgUrl+data.otherMedia
  222 + }
  223 + this.lunbo.push(c1)
  224 + }
206 225 if (data.displayMainImage) {
207 226 list1 = data.displayMainImage.split(',')
208 227 } else if (data.locationDiagram) {
... ... @@ -212,16 +231,58 @@
212 231 }
213 232 for (let i = 0; i < list1.length; i++) {
214 233 let c1 = {
  234 + type:'img',
215 235 url:this.imgUrl+list1[i]
216 236 }
217 237 this.lunbo.push(c1)
218 238 }
  239 +
219 240 console.error(this.lunbo)
220 241 // this.latitude = location.latitude;
221 242 // this.longitude = location.longitude;
222 243  
223 244 },
224 245 methods: {
  246 + openimg1(urls,index) {
  247 + let list = urls.map(item=>{
  248 + return this.imgUrl + item
  249 + })
  250 + uni.previewImage({
  251 + current:index,
  252 + urls: list,
  253 + longPressActions: {
  254 + itemList: ['发送给朋友', '保存图片', '收藏'],
  255 + success: function(data) {
  256 + console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
  257 + },
  258 + fail: function(err) {
  259 + console.log(err.errMsg);
  260 + }
  261 + }
  262 + });
  263 + },
  264 + openimg2(index) {
  265 + let list =[]
  266 + for (let i = 0; i < this.lunbo.length; i++) {
  267 + if(this.lunbo[i].type == 'img') {
  268 + list.push(this.lunbo[i].url)
  269 + }
  270 + }
  271 + console.error(list)
  272 + uni.previewImage({
  273 + current:this.lunbo[0].type=='img'?index:index-1,
  274 + urls: list,
  275 + longPressActions: {
  276 + itemList: ['发送给朋友', '保存图片', '收藏'],
  277 + success: function(data) {
  278 + console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
  279 + },
  280 + fail: function(err) {
  281 + console.log(err.errMsg);
  282 + }
  283 + }
  284 + });
  285 + },
225 286 // 打开的点击事件，传经纬度和地点名
226 287 gomapApp(latitude, longitude, ) {
227 288 let url = "";
... ...
lvdao-miniapp/pages/field/field.vue
  View file @440bccd
... ... @@ -70,20 +70,23 @@
70 70 <view class="goods-list">
71 71 <view class="list" v-for="(item,index) in tableData" :key="index" @click="reconciliationdetail(item)">
72 72 <view class="thumb">
73   - <u-image width="25vw" height="25vw" border-radius="20" :src="$img + item.displayImage"></u-image>
  73 + <u-image width="25vw" height="25vw" border-radius="20" :src="item.displayImage.length>0?imgurl +item.displayImage.split(',')[0]:'' " ></u-image>
74 74 <!-- <image :src="item.displayMainImage" mode=""></image> -->
75 75 </view>
76 76 <view class="item">
77 77 <view class="title">
78 78 <text class="one-omit">{{item.venueName}}</text>
79 79 </view>
80   - <view class="tag">
81   - <!-- <text>标签标签</text>
82   - <text>标签标签</text> -->
  80 + <!-- <view class="tag">
  81 + <text>标签标签</text>
  82 + <text>标签标签</text>
83 83 </view>
84 84 <view class="introduce">
85 85 <image :src="$imgUrl('/kefu.png')"></image>
86 86 <text class="one-omit">{{item.detailedLocation}}</text>
  87 + </view> -->
  88 + <view class="tag">
  89 + <text>{{item.venueType}}</text>
87 90 </view>
88 91 <view class="like-goods">
89 92 <view class="retail-price">
... ... @@ -131,10 +134,12 @@
131 134 {value: '温江区', label: '温江区'},
132 135 ], // 区域列表
133 136 tableData: [],
134   - show :false
  137 + show :false,
  138 + imgurl:''
135 139 };
136 140 },
137 141 mounted() {
  142 + this.imgurl = this.$img
138 143 this.getAll()
139 144 },
140 145  
... ...
lvdao-miniapp/pages/record/record.vue
  View file @440bccd
... ... @@ -57,11 +57,11 @@
57 57 this.pageindex.applicant =uni.getStorageSync('user').phone
58 58 this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
59 59 //成功回调
60   - this.recordList = res.data.data.content
  60 + this.recordList = res.data.data.records
61 61 this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
62 62  
63   - if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
64   - item.data.data.content.map(val=>{
  63 + if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
  64 + item.data.data.records.map(val=>{
65 65 this.recordList.push(val)
66 66 })
67 67 }
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
  View file @440bccd
... ... @@ -59,11 +59,11 @@
59 59 this.pageindex.applicant =uni.getStorageSync('user').phone
60 60 this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
61 61 //成功回调
62   - this.recordList = res.data.data.content
  62 + this.recordList = res.data.data.records
63 63 this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
64 64  
65   - if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
66   - item.data.data.content.map(val=>{
  65 + if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
  66 + item.data.data.records.map(val=>{
67 67 this.recordList.push(val)
68 68 })
69 69 }
... ...
lvdao-miniapp/utils/request.js
  View file @440bccd
... ... @@ -20,10 +20,10 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
20 20 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
21 21 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
22 22  
23   - bases = 'http://128.10.249.21:9003'+ url;
  23 + // bases = 'http://128.10.249.21:9003'+ url;
24 24 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
25 25  
26   - // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
  26 + bases = c1 + 'cdwlMall/meserver/admin-server' + url;
27 27  
28 28 }else if(baseUrl == 3){
29 29 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
... ...