webapp / GreenwayWeb

Commit 4e95552938a31f02e0fc9e4ab156b9731b80e958

Authored by 杨鑫
1 parent cfcb44ef

'1'

Inline Side-by-side
Showing 11 changed files with 70 additions and 20 deletions
admin-web-master/src/components/chakan/ggsh.vue
  View file @4e95552
... ... @@ -111,12 +111,12 @@
111 111 </el-row>
112 112 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
113 113 <div style="margin-top: 10px;">
114   - <el-image style="width: 200px;" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
  114 + <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
115 115 </div>
116 116 </el-form-item>
117 117 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
118 118 <div style="margin-top: 10px;">
119   - <el-image style="width: 200px;" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
  119 + <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
120 120 </div>
121 121 </el-form-item>
122 122 </el-form>
... ... @@ -308,13 +308,14 @@
308 308 pageNumber: 0,
309 309 pageSize: 10,
310 310 checkState:'2',
311   - name: '',
  311 + phone: '',
312 312 },
313 313 shopMsg:{}
314 314 }
315 315 },
316 316 created() {
317 317 console.log(this.info)
  318 + this.pagequery.phone = this.info.applicant
318 319 cerePlatformMerchant(this.pagequery).then(res=>{
319 320 this.shopMsg = res.data.content[0]
320 321 })
... ...
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @4e95552
... ... @@ -159,7 +159,7 @@
159 159 <el-col :span="12">
160 160 <el-form-item>
161 161 <div style="margin-top: 20px">
162   - <el-button @click="changeauditStatus()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  162 + <el-button @click="changeauditStatus" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
163 163 <el-button @click="addcl = false" class="buttonHover"
164 164 style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
165 165 </div>
... ... @@ -247,7 +247,6 @@
247 247 message: tit + '成功',
248 248 type: 'success'
249 249 })
250   - this.removeonaction('1')
251 250 this.addcl = false
252 251 this.getAll()
253 252 } else {
... ...
admin-web-master/src/views/customer/rsaManagement/genjin.vue
  View file @4e95552
... ... @@ -41,11 +41,13 @@
41 41 slot="dateCell"
42 42 slot-scope="{date, data}">
43 43 {{data.day.split("-").slice(2).join("-")}}
  44 + <div style="overflow: auto;height:55px;">
44 45 <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
45 46 <div style="font-size:12px;margin-top:10px;" >
46 47 {{item.followUpTime == data.day?item.contentFeedback:''}}
47 48 </div>
48 49 </div>
  50 + </div>
49 51 </template>
50 52 </el-calendar>
51 53 </div>
... ... @@ -367,16 +369,17 @@
367 369 },
368 370 genjinMsg(item){
369 371 this.msgEit = true
  372 + this.formInline = {}
370 373 this.formInline = item
371 374 this.formInline.plan_Time = [item.nextFollowUpStartTime,item.nextFollowUpEndTime]
372 375  
373   - if(typeof item.intendedResource == 'string'){
  376 + if(typeof item.intendedResource == 'string' && item.intendedResource!=''){
374 377 this.addziyuanData = JSON.parse(item.intendedResource)
375 378 }
376 379 if(typeof item.onSitePhotos == 'string'){
377 380 this.imgList = item.onSitePhotos.split(',') ||[]
378 381 }
379   - console.log( this.formInline)
  382 +
380 383 this.ggXin = true
381 384 },
382 385 onSubmit(){
... ...
admin-web-master/src/views/customer/rsaManagement/index.vue
  View file @4e95552
... ... @@ -536,7 +536,11 @@
536 536 required: true,
537 537 message: '请输入手机号',
538 538 trigger: 'blur'
539   - }, ],
  539 + },{
  540 + pattern: /^[0-9]+$/,
  541 + message: '手机号只能包含数字',
  542 + trigger: 'blur' ,
  543 + }],
540 544 idCardValidStart: [{
541 545 required: true,
542 546 message: '请选择身份证有效时间',
... ...
admin-web-master/src/views/customer/rsaManagement/tanpan.vue
  View file @4e95552
... ... @@ -41,11 +41,13 @@
41 41 slot="dateCell"
42 42 slot-scope="{date, data}">
43 43 {{data.day.split("-").slice(2).join("-")}}
44   - <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
45   - <div style="font-size:12px;margin-top:10px;" >
46   - {{item.negotiationTime == data.day?item.negotiationResult:''}}
47   - </div>
48   - </div>
  44 + <div style="overflow: auto;height:55px;">
  45 + <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
  46 + <div style="font-size:12px;margin-top:10px;width:48%" >
  47 + {{item.negotiationTime == data.day?item.negotiationResult:''}}
  48 + </div>
  49 + </div>
  50 + </div>
49 51 </template>
50 52 </el-calendar>
51 53 </div>
... ... @@ -263,10 +265,11 @@
263 265 },
264 266 genjinMsg(item){
265 267 this.msgEit = true
  268 + this.formInline ={}
266 269 this.formInline = item
267 270 this.formInline.plan_Time = [item.nextNegotiationStartTime,item.nextNegotiationEndTime]
268 271  
269   - if(typeof item.intendedResource == 'string'){
  272 + if(typeof item.intendedResource == 'string' && item.intendedResource != ''){
270 273 this.addziyuanData = JSON.parse(item.intendedResource)
271 274 }
272 275 if(typeof item.onSitePhotos == 'string'){
... ... @@ -377,4 +380,5 @@
377 380 ::v-deep .el-calendar-table:not(.is-range)td.prev{visibility:hidden;}
378 381 ::v-deep .el-calendar__button-group {display: none;}
379 382 ::v-deep .el-backtop, .el-calendar-table td.is-today{color: #3F9B6A;}
  383 +::v-deep .el-calendar-table .el-calendar-day {min-height:85px;}
380 384 </style>
... ...
admin-web-master/src/views/detect/examine/index.vue
  View file @4e95552
... ... @@ -35,10 +35,10 @@
35 35 <div style="display: flex;font-size: 14px">
36 36 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
37 37 </div>
38   - <!-- <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
  38 + <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
39 39 广告位</div>
40 40 <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
41   - </div> -->
  41 + </div>
42 42 </div>
43 43 </div>
44 44 <!-- 表格 -->
... ...
ceres-uniapp-master/config/api.js
  View file @4e95552
... ... @@ -6,8 +6,8 @@
6 6  
7 7  
8 8  
9   -const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
10   -const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api'
  9 +const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
  10 +const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
11 11 // const DOMAIN_PREFIXPING = 'http://192.168.2.225:9003'
12 12 // const DOMAIN_PREFIX = 'http://192.168.2.225:9007'
13 13 // const host = `${window.location.protocol}//${window.location.host}`
... ...
lvdao-miniapp/pages.json
  View file @4e95552
... ... @@ -452,6 +452,13 @@
452 452 "navigationBarBackgroundColor": "#FFFFFF",
453 453 "navigationBarTitleText": "支付"
454 454 }
  455 + },
  456 + {
  457 + "path": "rentPay/webView",
  458 + "style": {
  459 + "navigationBarBackgroundColor": "#FFFFFF",
  460 + "navigationBarTitleText": "跳转"
  461 + }
455 462 }
456 463 ]
457 464 }],
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @4e95552
... ... @@ -178,7 +178,7 @@
178 178 })
179 179 } else {
180 180  
181   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
  181 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => {
182 182 if(res.data.code == '20004' || res.data.code == '20003'){
183 183 uni.navigateTo({
184 184 url: '/pages/login/login'
... ...
lvdao-miniapp/pagesA/rentPay/goPay.vue
  View file @4e95552
... ... @@ -41,7 +41,9 @@
41 41 },
42 42 methods: {
43 43 submit(){
44   -
  44 + uni.navigateTo({
  45 + url: '/pagesA/rentPay/webView'
  46 + })
45 47 }
46 48 }
47 49 }
... ...
lvdao-miniapp/pagesA/rentPay/webView.vue 0 → 100644
  View file @4e95552
  1 +<template>
  2 + <view>
  3 + <web-view src="https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F"></web-view>
  4 + </view>
  5 +</template>
  6 +
  7 +<script>
  8 + export default {
  9 + props: {
  10 + // 定义接收的 prop，类型为 String
  11 + url: {
  12 + type: String,
  13 + required: true
  14 + }
  15 + },
  16 + computed: {
  17 + // 使用计算属性确保 url 被正确绑定到 web-view 的 src 属性
  18 + webUrl() {
  19 + return this.url;
  20 + }
  21 + },
  22 + mounted() {
  23 + // 可选：在组件挂载后进行一些验证或处理
  24 + console.log('加载的网址:', this.webUrl);
  25 + }
  26 + }
  27 +</script>
  28 +
  29 +<style>
  30 +</style>
0 31 \ No newline at end of file
... ...