Commit 3f950a0f99637456f8324a206ba5eb6ffbfc711d

Authored by wesley88
1 parent c3662f99

1

admin-web-master/src/components/chakan/cd.vue
... ... @@ -20,7 +20,7 @@
20 20 </el-col>
21 21 <el-col :span="8">
22 22 <el-form-item label="实际使用面积" prop="actualArea">
23   - <div class="duiqi">{{editbgid.actualArea || '无'}}</div>
  23 + <div class="duiqi">{{editbgid.actualArea?editbgid.actualArea+' ㎡': '无'}}</div>
24 24 </el-form-item>
25 25 </el-col>
26 26 </el-row>
... ...
admin-web-master/src/layout/index.vue
... ... @@ -197,17 +197,17 @@
197 197 }
198 198 }
199 199 return {
200   - msg: [],
201   - list: [],
  200 + // msg: [],
  201 + // list: [],
202 202 // msg: ['招商服务系统'],
203   - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
204   - // list: [
205   - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
206   - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
207   - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
208   - // ['联机交易', '对账处理', '日志管理', '商户服务'],
209   - // ['渠道售票统计分析', '销售额统计分析'],
210   - // ],
  203 + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  204 + list: [
  205 + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
  206 + ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
  207 + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
  208 + ['联机交易', '对账处理', '日志管理', '商户服务'],
  209 + ['渠道售票统计分析', '销售额统计分析'],
  210 + ],
211 211 listMune: [],
212 212 mumeList: [],
213 213 mumeChildren1: [],
... ... @@ -296,10 +296,10 @@
296 296 this.userAvatar = getUserAvatar()
297 297 },
298 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 305 methods: {
... ... @@ -512,11 +512,11 @@
512 512 getMemu() {
513 513 // console.log(userData, 'userData')
514 514  
515   - let userData = JSON.parse(localStorage.getItem('user'));
516   - if (!userData) {
517   - window.location.href = 'https://admin-uat.028wlkj.com:1020/login'
518   - // window.location.href = 'http://128.10.9.151:5173/home'
519   - }
  515 + // let userData = JSON.parse(localStorage.getItem('user'));
  516 + // if (!userData) {
  517 + // window.location.href = 'https://admin-uat.028wlkj.com:1020/login'
  518 + // // window.location.href = 'http://128.10.9.151:5173/home'
  519 + // }
520 520 const protocol = window.location.protocol; // 获取协议,如 'https:'
521 521 const host = window.location.host; // 获取域名和端口,如 'zhgw.028wlkj.com:20443'
522 522 let baseUrl = protocol + '//' + host;
... ... @@ -774,18 +774,21 @@
774 774 clk(index) {
775 775 this.index = index
776 776 this.listMune = []
777   - this.list = [
778   - ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
779   - ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
780   - ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
781   - ['联机交易', '对账处理', '日志管理', '商户服务'],
782   - ['渠道售票统计分析', '销售额统计分析'],
783   - ]
784   - // this.getMemu()
785   - // this.waibu()
  777 + // this.list = [
  778 + // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
  779 + // ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
  780 + // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
  781 + // ['联机交易', '对账处理', '日志管理', '商户服务'],
  782 + // ['渠道售票统计分析', '销售额统计分析'],
  783 + // ]
  784 + // this.neibu()
  785 +
  786 +
  787 + this.getMemu()
  788 + this.waibu()
  789 + this.list = this.mumeList
  790 +
786 791  
787   - this.neibu()
788   - // this.list = this.mumeList
789 792 },
790 793 handleClickOutside() {
791 794 this.$store.dispatch('app/closeSideBar', {
... ...
admin-web-master/src/utils/request.js
... ... @@ -16,8 +16,8 @@ let hostall = window.location.href;
16 16 let baseURL = ''
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19   - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20   - baseURL = 'http://128.10.249.34:9003';
  19 + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + // baseURL = 'http://128.10.249.34:9003';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23 // baseURL = 'http://192.168.2.225:9003';
... ...
lvdao-miniapp/manifest.json
1 1 {
2 2 "name" : "绿道",
3   - "appid" : "__UNI__F034047",
  3 + "appid" : "__UNI__189D96A",
4 4 "description" : "",
5 5 "versionName" : "1.0.2",
6 6 "versionCode" : "100",
... ...
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.scss
... ... @@ -41,7 +41,7 @@
41 41 .info-title {
42 42 font-weight: bold;
43 43 font-size: 32rpx;
44   - margin-bottom: 24rpx;
  44 + // margin-bottom: 24rpx;
45 45 span {
46 46 display: inline-block;
47 47 padding: 0 8rpx;
... ...
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
... ... @@ -5,8 +5,8 @@
5 5 <view class="info-title">
6 6 {{tableData.advertisingName}}
7 7 </view>
8   - <view class="info-text">{{tableData.shopDescription}}</view>
9   - <view class="info-racord" v-if="moban.length !=0">
  8 + <!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
  9 + <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
10 10 <view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}
11 11 </view>
12 12 <!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
... ... @@ -26,18 +26,80 @@
26 26 <text>{{tableData.advertisingType}}</text>
27 27 </view>
28 28 </u-col>
29   - <u-col span="5">
30   - <view class="form-item">
31   - <view class="label">所属端:</view>
32   - <text>{{tableData.affiliation || '--'}}</text>
33   - </view>
34   - </u-col>
35   - <u-col span="7">
36   - <view class="form-item">
37   - <view class="label">轮播顺序:</view>
38   - <text>{{tableData.rotationOrder || '--'}}</text>
39   - </view>
40   - </u-col>
  29 + <view v-if="tableData.advertisingType == '线上广告位'">
  30 + <u-col span="5" >
  31 + <view class="form-item">
  32 + <view class="label">所属端:</view>
  33 + <text>{{tableData.affiliation || '--'}}</text>
  34 + </view>
  35 + </u-col>
  36 + <u-col span="5" >
  37 + <view class="form-item">
  38 + <view class="label">广告位数量:</view>
  39 + <text>{{tableData.advertisingNumber || '--'}}</text>
  40 + </view>
  41 + </u-col>
  42 + <!-- <u-col span="5" >
  43 + <view class="form-item">
  44 + <view class="label">广告尺寸:</view>
  45 + <text>{{tableData.dimensions || '--'}}</text>
  46 + </view>
  47 + </u-col> -->
  48 + <u-col span="5" >
  49 + <view class="form-item">
  50 + <view class="label">可上传大小:</view>
  51 + <text>{{tableData.size || '--'}}</text>
  52 + </view>
  53 + </u-col>
  54 + <u-col span="5" >
  55 + <view class="form-item">
  56 + <view class="label">播放时长:</view>
  57 + <text>{{tableData.playDuration || '--'}}</text>
  58 + </view>
  59 + </u-col>
  60 + <u-col span="5" >
  61 + <view class="form-item">
  62 + <view class="label">推送地址:</view>
  63 + <text>{{tableData.pushAddress || '--'}}</text>
  64 + </view>
  65 + </u-col>
  66 + <u-col span="12">
  67 + <view class="form-item">
  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>
  73 + </view>
  74 + </u-col>
  75 + </view>
  76 + <view v-if="tableData.advertisingType == '实体广告位'">
  77 + <u-col span="5" >
  78 + <view class="form-item">
  79 + <view class="label">设备类型:</view>
  80 + <text>{{tableData.deviceType || '--'}}</text>
  81 + </view>
  82 + </u-col>
  83 + <u-col span="5" >
  84 + <view class="form-item">
  85 + <view class="label">设备大小:</view>
  86 + <text>{{tableData.equipmentSize || '--'}}</text>
  87 + </view>
  88 + </u-col>
  89 + <!-- <u-col span="5" >
  90 + <view class="form-item">
  91 + <view class="label">广告尺寸:</view>
  92 + <text>{{tableData.dimensions || '--'}}</text>
  93 + </view>
  94 + </u-col> -->
  95 + <u-col span="5" >
  96 + <view class="form-item">
  97 + <view class="label">广告材质:</view>
  98 + <text>{{tableData.advertisingMaterial || '--'}}</text>
  99 + </view>
  100 + </u-col>
  101 +
  102 + </view>
41 103 </u-row>
42 104 </view>
43 105 </view>
... ... @@ -51,12 +113,12 @@
51 113 <text>{{tableData.dimensions || '--'}}</text>
52 114 </view>
53 115 </u-col>
54   - <u-col span="5">
  116 + <!-- <u-col span="5">
55 117 <view class="form-item">
56 118 <view class="label">可上传大小:</view>
57 119 <text>{{tableData.size || '--'}}</text>
58 120 </view>
59   - </u-col>
  121 + </u-col> -->
60 122 <u-col span="7">
61 123 <view class="form-item">
62 124 <view class="label">位置示意图:</view>
... ... @@ -74,7 +136,24 @@
74 136 </u-row>
75 137 </view>
76 138 </view>
  139 + <view class="banner-item position" v-if="tableData.advertisingType == '实体广告位'">
  140 + <view class="banner-item-title">位置信息</view>
  141 + <view style="margin-top: 16rpx;">
  142 + <map style="width: 100%; height: 200rpx;">
  143 + <view class="position-info" @click="gomapApp(latitude,longitude)">
  144 + <u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
  145 + height="20rpx"></u-image>
  146 + <view>
  147 + <text >{{tableData.detailedLocation}}</text>
  148 + </view>
  149 +
  150 +
  151 + </view>
  152 + </map>
  153 + </view>
  154 + </view>
77 155 </view>
  156 +
78 157 <view style="height: 100rpx;"></view>
79 158 <!-- 底部 -->
80 159 <view class="page-footer">
... ... @@ -133,8 +212,22 @@
133 212 console.log(err)
134 213 //请求失败
135 214 })
  215 + if (data.mapPunctuation) {
  216 + this.latitude = parseFloat(data.mapPunctuation.split(',')[0])
  217 + this.longitude = parseFloat(data.mapPunctuation.split(',')[1])
  218 + }
136 219 },
137 220 methods: {
  221 + gomapApp(latitude, longitude, ) {
  222 + let url = "";
  223 + uni.openLocation({
  224 + latitude: latitude,
  225 + longitude: longitude,
  226 + success: function() {
  227 + console.log('success');
  228 + }
  229 + });
  230 + },
138 231 openimg(urls,index) {
139 232 urls =urls.split(',')
140 233 let list = urls.map(item=>{
... ...
lvdao-miniapp/pages/details/details.scss
... ... @@ -49,7 +49,7 @@
49 49 .info-title {
50 50 font-weight: bold;
51 51 font-size: 32rpx;
52   - margin-bottom: 24rpx;
  52 + // margin-bottom: 24rpx;
53 53 span {
54 54 display: inline-block;
55 55 padding: 0 8rpx;
... ...
lvdao-miniapp/pages/details/details.vue
1 1 <template>
2 2 <view>
3 3 <view class="banner-img">
4   - <!-- <u-image :showLoading="true"
5   - :src="$img + "
6   - width="100%" height="100%"></u-image> -->
7 4 <swiper :indicator-dots="true" :autoplay="false" :interval="3000" :duration="500" style="height: 30vh;" indicator-active-color="#fff">
8 5 <swiper-item v-for="(imageUrl, index) in lunbo" :key="index">
9 6 <view style="width: 100%;height: 100%;" v-if="imageUrl.type == 'img'" @click="openimg2(index)">
... ... @@ -14,7 +11,6 @@
14 11 </view>
15 12 </swiper-item>
16 13 </swiper>
17   - <!-- <u-swiper :list="lunbo" keyName="url" :autoplay="false" :indicator="false"></u-swiper> -->
18 14 </view>
19 15 <view class="banner">
20 16 <view class="banner-item info">
... ... @@ -22,62 +18,174 @@
22 18 {{tableData.shopName || tableData.venueName}}
23 19  
24 20 </view>
25   - <view class="info-text">{{tableData.shopDescription}}</view>
26   - <view class="info-racord" v-if="moban.length !=0">
27   - <view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}
28   - </view>
29   - <!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
  21 + <!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
  22 + <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
  23 + <view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
30 24 </view>
31 25 <view class="" v-if="moban.length !=0" @click="moreZu">
32 26 查看更多租金优惠
33 27 <u-icon name="arrow-right"></u-icon>
34 28 </view>
35 29 </view>
36   - <view class="banner-item field">
  30 + <view class="banner-item field" v-if="tableData.shopName">
  31 + <view class="banner-item-title">商铺信息</view>
  32 + <view class="banner-item-form">
  33 + <u-row gutter="10">
  34 + <u-col span="6">
  35 + <view class="form-item">
  36 + <view class="label">商铺类型:</view>
  37 + <text>{{tableData.shopType=='1'?'移动铺位':tableData.shopType=='2'?'固定铺位':'无'}}</text>
  38 + </view>
  39 + </u-col>
  40 + <u-col span="6">
  41 + <view class="form-item">
  42 + <view class="label">测绘面积:</view>
  43 + <text>{{tableData.surveyingArea?tableData.surveyingArea+' ㎡': '无'}}</text>
  44 + </view>
  45 + </u-col>
  46 + <u-col span="6">
  47 + <view class="form-item">
  48 + <view class="label">产权面积:</view>
  49 + <text>{{tableData.propertyArea?tableData.propertyArea+' ㎡': '无'}}</text>
  50 + </view>
  51 + </u-col>
  52 + <u-col span="6">
  53 + <view class="form-item">
  54 + <view class="label">实际使用面积:</view>
  55 + <text>{{tableData.actualUsableArea?tableData.actualUsableArea+' ㎡': '无'}}</text>
  56 + </view>
  57 + </u-col>
  58 + <u-col span="6">
  59 + <view class="form-item">
  60 + <view class="label">所属区域:</view>
  61 + <text>{{tableData.belongingRegion || '无'}}</text>
  62 + </view>
  63 + </u-col>
  64 + <u-col span="6">
  65 + <view class="form-item">
  66 + <view class="label">所属绿道段:</view>
  67 + <text>{{tableData.belongingGreenwaySection || '无'}}</text>
  68 + </view>
  69 + </u-col>
  70 + <u-col span="6">
  71 + <view class="form-item">
  72 + <view class="label">门牌号:</view>
  73 + <text>{{tableData.houseNumber || '无'}}</text>
  74 + </view>
  75 + </u-col>
  76 + <u-col span="6">
  77 + <view class="form-item">
  78 + <view class="label">归属部门:</view>
  79 + <text>{{tableData.belongingDepartment || '无'}}</text>
  80 + </view>
  81 + </u-col>
  82 + <u-col span="6">
  83 + <view class="form-item">
  84 + <view class="label">负责人:</view>
  85 + <text>{{tableData.head || '无'}}</text>
  86 + </view>
  87 + </u-col>
  88 + <u-col span="6">
  89 + <view class="form-item">
  90 + <view class="label">联系人:</view>
  91 + <text>{{tableData.contacts || '无'}}</text>
  92 + </view>
  93 + </u-col>
  94 + <u-col span="6">
  95 + <view class="form-item">
  96 + <view class="label">联系方式:</view>
  97 + <text>{{tableData.telephone || '无'}}</text>
  98 + </view>
  99 + </u-col>
  100 + <u-col span="12">
  101 + <view class="form-item">
  102 + <view class="label" style="width: 142rpx;">商铺描述:</view>
  103 + <view style='flex: 1;'>
  104 + <text>{{tableData.shopDescription || '无'}}</text>
  105 + </view>
  106 + </view>
  107 + </u-col>
  108 + <u-col span="12">
  109 + <view class="form-item">
  110 + <view class="label">建筑图纸:</view>
  111 + <view style='flex: 1;' v-if="!tableData.architecturalDrawings.length>0">
  112 + <text>暂无</text>
  113 + </view>
  114 + </view>
  115 + <view style="display: flex;flex-wrap: wrap;" v-if="tableData.architecturalDrawings.length>0">
  116 + <u-image @click="openimg1(tableData.architecturalDrawings,index)" :showLoading="true" v-for="(item,index) in tableData.architecturalDrawings" :src="imgUrl+item" width="100px" height="100px" border-radius="20" style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
  117 + </view>
  118 +
  119 + </u-col>
  120 + </u-row>
  121 + </view>
  122 + </view>
  123 + <view class="banner-item field" v-else>
37 124 <view class="banner-item-title">场地信息</view>
38 125 <view class="banner-item-form">
39 126 <u-row gutter="10">
40 127 <u-col span="6">
41 128 <view class="form-item">
42 129 <view class="label">场地类型:</view>
43   - <text>{{tableData.shopName?'商铺':'场地'}}</text>
  130 + <text>{{tableData.venueType || '无'}}</text>
44 131 </view>
45 132 </u-col>
46 133 <u-col span="6">
47 134 <view class="form-item">
48 135 <view class="label">实际使用面积:</view>
49   - <text v-if="tableData.actualUsableArea">{{tableData.actualUsableArea}}m²</text>
50   - <text v-else-if="tableData.actualArea">{{tableData.actualArea}}m²</text>
51   - <text v-else="tableData.actualUsableArea">暂无</text>
  136 + <text>{{tableData.actualArea?tableData.actualArea+' ㎡': '无'}}</text>
52 137 </view>
53 138 </u-col>
54 139 <u-col span="6">
55 140 <view class="form-item">
56 141 <view class="label">所属区域:</view>
57   - <text>{{tableData.belongingRegion || tableData.district}}</text>
  142 + <text>{{tableData.district || '无'}}</text>
58 143 </view>
59 144 </u-col>
60   - <u-col span="12">
  145 + <u-col span="6">
61 146 <view class="form-item">
62   - <view class="label">规划图纸:</view>
  147 + <view class="label">归属部门:</view>
  148 + <text>{{tableData.department || '无'}}</text>
63 149 </view>
64   - <view style="display: flex;flex-wrap: wrap;">
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"
68   - style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
69   - <text v-else>暂无</text>
  150 + </u-col>
  151 + <u-col span="6">
  152 + <view class="form-item">
  153 + <view class="label">负责人:</view>
  154 + <text>{{tableData.belongingParkTrail || '无'}}</text>
  155 + </view>
  156 + </u-col>
  157 + <u-col span="6">
  158 + <view class="form-item">
  159 + <view class="label">联系人:</view>
  160 + <text>{{tableData.contact || '无'}}</text>
  161 + </view>
  162 + </u-col>
  163 + <u-col span="6">
  164 + <view class="form-item">
  165 + <view class="label">联系方式:</view>
  166 + <text>{{tableData.belongingParkTrail || '无'}}</text>
70 167 </view>
71 168 </u-col>
72 169 <u-col span="12">
73 170 <view class="form-item">
74   - <view class="label" style="width: 142rpx;">{{tableData.shopName?'位置描述:':'场地描述:'}}</view>
75   -
  171 + <view class="label" style="width: 142rpx;">场地描述:</view>
76 172 <view style='flex: 1;'>
77   - <text v-if="tableData.shopName">{{tableData.detailedLocation}}</text>
78   - <u-parse :html="tableData.description" v-else></u-parse>
  173 + <rich-text v-if="tableData.description" :nodes="tableData.description"></rich-text>
  174 + <text v-else>无</text>
  175 + </view>
  176 + </view>
  177 + </u-col>
  178 + <u-col span="12">
  179 + <view class="form-item">
  180 + <view class="label">规划图纸:</view>
  181 + <view style='flex: 1;' v-if="!tableData.planningDrawing.length>0">
  182 + <text>暂无</text>
79 183 </view>
80 184 </view>
  185 + <view style="display: flex;flex-wrap: wrap;" v-if="tableData.planningDrawing.length>0">
  186 + <u-image @click="openimg1(tableData.planningDrawing,index)" :showLoading="true" v-for="(item,index) in tableData.architecturalDrawings" :src="imgUrl+item" width="100px" height="100px" border-radius="20" style="margin-bottom:25rpx;margin-left: 25rpx;"></u-image>
  187 + </view>
  188 +
81 189 </u-col>
82 190 </u-row>
83 191 </view>
... ...
lvdao-miniapp/utils/request.js
1 1  
2 2 // let hostall = window.location.href;
3 3 // let c1 = hostall.split('cdwlMall')[0];
4   -// let c1 = 'https://jy.scjysm.asia:18086/'
5   -let c1 = 'https://zhgw-uat.028wlkj.com/'
  4 +let c1 = 'https://jy.scjysm.asia:18086/'
  5 +// let c1 = 'https://zhgw-uat.028wlkj.com/'
6 6 //封装request请求
7 7 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
8 8 //判断header提交数据类型
... ...