webapp / GreenwayWeb

Commit b0a71bf116274ac3999c2a09af925fb20feaa894

Authored by wesley88
2 parents 84290017 49206db5

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 8 changed files with 57 additions and 10 deletions
admin-web-master/src/components/add/addmap.vue
  View file @b0a71bf
... ... @@ -214,7 +214,7 @@
214 214 onlineType: '' ,// 线上类型
215 215 belongingGreenwaySection: '', // 所属绿道段
216 216 belongingParkTrail: '', // 所属公园/步道
217   - // carouselId:'',//选择租赁广告位置
  217 + carouselId:'',//选择租赁广告位置
218 218 },
219 219 rules: {
220 220 advertisingType: [{
... ... @@ -332,7 +332,32 @@
332 332 if (this.formInline.mapPunctuation) {
333 333 this.lat = Number(this.formInline.mapPunctuation.split(',')[0])
334 334 this.lng = Number(this.formInline.mapPunctuation.split(',')[1])
  335 +
335 336 }
  337 + if(this.info.affiliation){
  338 + console.log('this.info.affiliation',this.info.affiliation)
  339 + console.log('this.info.carouselId',this.info.carouselId)
  340 + let arList = []
  341 + let res= await bannerGet({pageNumber: 1,pageSize: 20})
  342 + arList = res.data.content
  343 + if(this.info.affiliation == '在线商城'){
  344 + this.tableData = arList.filter(item => item.type === 1);
  345 + this.$forceUpdate()
  346 + }else{
  347 + this.tableData = arList.filter(item => item.type === 2);
  348 + this.$forceUpdate()
  349 + }
  350 + console.log('111111111111111111',this.tableData)
  351 + this.tableData.map((item,index)=>{
  352 + if(item.id == this.info.carouselId){
  353 + this.handleSelectChange(index)
  354 + this.formInline.carouselId = this.info.carouselId
  355 + this.$forceUpdate()
  356 + }
  357 + })
  358 +
  359 + console.log('222222222222222',this.tableData)
  360 + }
336 361 this.ontype = this.formInline.advertisingType
337 362 if (this.ontype == '线上广告位') {
338 363 this.typelist = [{
... ... @@ -372,6 +397,7 @@
372 397 }
373 398 },
374 399 async affiliationChange(value){
  400 + this.formInline.carouselId = ''
375 401 let arList = []
376 402 let res= await bannerGet({pageNumber: 1,pageSize: 20})
377 403 arList = res.data.content
... ... @@ -380,6 +406,7 @@
380 406 this.$forceUpdate()
381 407 }else{
382 408 this.tableData = arList.filter(item => item.type === 2);
  409 + this.$forceUpdate()
383 410 }
384 411  
385 412 },
... ...
admin-web-master/src/utils/request.js
  View file @b0a71bf
... ... @@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24 24  
25   - // baseURL = 'http://192.168.8.103:9003';
  25 + // baseURL = 'http://128.10.249.43:9003';
26 26  
27 27  
28 28 } else {
... ...
admin-web-master/src/views/detect/analyse.vue
  View file @b0a71bf
... ... @@ -12,7 +12,7 @@
12 12 range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
13 13 style="width: 300px;margin-right: 10px;" prefix-icon="none">
14 14 </el-date-picker>
15   - <el-select v-model="msgList.belongingGreenwaySection" placeholder="请选择"
  15 + <el-select v-model="msgList.belongingGreenwaySection" placeholder="请选择所属绿道段"
16 16 style="width: 168px;margin-right: 10px;">
17 17 <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
18 18 :key="index"></el-option>
... ...
lvdao-miniapp/pages/details/details.vue
  View file @b0a71bf
... ... @@ -20,8 +20,8 @@
20 20 </view>
21 21 <!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
22 22 <view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
23   - <view class="info-price" v-if="tableData.actualUsableArea"><span>{{moban[0].rentalPrice*tableData.actualUsableArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
24   - <view class="info-price" v-else-if="moban[0].rentalPrice"><span>{{moban[0].rentalPrice*tableData.actualArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
  23 + <view class="info-price" v-if="tableData.actualUsableArea"><span>{{math(moban[0].rentalPrice*tableData.actualUsableArea) || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
  24 + <view class="info-price" v-else-if="moban[0].rentalPrice"><span>{{math(moban[0].rentalPrice*tableData.actualArea) || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
25 25 <view class="info-price" v-else>自营</view>
26 26 </view>
27 27 <view class="" v-if="moban.length !=0" @click="moreZu">
... ... @@ -199,7 +199,7 @@
199 199 <view class="position-info" @click.stop="gomapApp(latitude,longitude)">
200 200 <u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
201 201 height="20rpx"></u-image>
202   - <view @click.stop="gomapApp(latitude,longitude)">
  202 + <view>
203 203 <text v-if="tableData.shopName">{{tableData.detailedLocation}}</text>
204 204 <u-parse :html="tableData.description" v-else></u-parse>
205 205 </view>
... ... @@ -351,6 +351,9 @@
351 351  
352 352 },
353 353 methods: {
  354 + math(val){
  355 + return val.toFixed(4);
  356 + },
354 357 openimg1(urls,index) {
355 358 let list = urls.map(item=>{
356 359 return this.imgUrl + item
... ...
lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue
  View file @b0a71bf
... ... @@ -127,7 +127,7 @@
127 127 </u-radio-group>
128 128 </view>
129 129 <view style="display: flex;justify-content: space-between;margin-top: 10px;">
130   - <u-button type="" style="width: 45%;" @click="submit">取消</u-button>
  130 + <u-button type="" style="width: 45%;" @click="close">取消</u-button>
131 131 <u-button type="success" style="width: 45%;" @click="submit">提交</u-button>
132 132 </view>
133 133 </view>
... ... @@ -233,6 +233,10 @@
233 233 url: `/pagesA/PunchInAct/PunchInSetting?ids=${this.tableData.id}`
234 234 })
235 235 },
  236 + close(){
  237 + this.addjiangliShow = false
  238 +
  239 + },
236 240 submit() {
237 241 if (!this.form.userName) {
238 242 uni.showToast({
... ... @@ -301,6 +305,16 @@
301 305 return `${year}-${month}-${day}`;
302 306 },
303 307 addjiangli(){
  308 +
  309 + this.form = {
  310 + activityId: '',
  311 + userId: '',
  312 + createTime: '',
  313 + createUser: '',
  314 + userName: '',
  315 + userPhone: '',
  316 + canyutiem:''
  317 + }
304 318 this.addjiangliShow = true
305 319 },
306 320 dakaSet(){
... ...
lvdao-miniapp/pagesA/moreZu/moreZu.vue
  View file @b0a71bf
... ... @@ -4,7 +4,7 @@
4 4 <view class="zuTitle">{{item.policyName}}</view>
5 5 <view class="">
6 6 <view v-if="item.rentalPrice" style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;">
7   - {{item.rentalPrice*moprice}}元/{{item.leaseTerm}}
  7 + {{math(item.rentalPrice*moprice)}}元/{{item.leaseTerm}}
8 8 </view>
9 9 <view style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;" v-else>自营</view>
10 10 <view class="youTitle">
... ... @@ -67,6 +67,9 @@
67 67  
68 68 },
69 69 methods: {
  70 + math(val){
  71 + return val.toFixed(4);
  72 + },
70 73 getAll(){
71 74 this.$http.sendRequest('/cereResourceStrategy/queryByResources', 'POST', this.paesize,1).then(res => {
72 75 this.moban = res.data.data
... ...
merchant-web-master/src/App.vue
  View file @b0a71bf
... ... @@ -321,7 +321,7 @@ export default {
321 321 border-bottom: 1px solid #EFEFEF;
322 322 }
323 323  
324   - .el-dialog__title {
  324 + .el-dialog__title {
325 325 font-size: 14px;
326 326 color: #000000e6;
327 327 }
... ...
merchant-web-master/src/utils/request.js
  View file @b0a71bf
... ... @@ -21,7 +21,7 @@ let PREFIX;
21 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22 22 // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server';
23 23 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
24   - PREFIX = 'http://128.10.249.9:9004';
  24 + PREFIX = 'http://128.10.249.43:9004';
25 25 }else{
26 26 // PREFIX = '/merchant-business';
27 27 // PREFIX = 'http://8.130.38.56:9004';
... ...