diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue index 24a17d7..17df164 100644 --- a/admin-web-master/src/components/chakan/ggsh.vue +++ b/admin-web-master/src/components/chakan/ggsh.vue @@ -111,12 +111,12 @@ - + - + @@ -308,13 +308,14 @@ pageNumber: 0, pageSize: 10, checkState:'2', - name: '', + phone: '', }, shopMsg:{} } }, created() { console.log(this.info) + this.pagequery.phone = this.info.applicant cerePlatformMerchant(this.pagequery).then(res=>{ this.shopMsg = res.data.content[0] }) diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue index 615d5ed..ec4904b 100644 --- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -159,7 +159,7 @@ - 确定 + 确定 取消 @@ -247,7 +247,6 @@ message: tit + '成功', type: 'success' }) - this.removeonaction('1') this.addcl = false this.getAll() } else { diff --git a/admin-web-master/src/views/customer/rsaManagement/genjin.vue b/admin-web-master/src/views/customer/rsaManagement/genjin.vue index eb15f15..8f0cb9d 100644 --- a/admin-web-master/src/views/customer/rsaManagement/genjin.vue +++ b/admin-web-master/src/views/customer/rsaManagement/genjin.vue @@ -41,11 +41,13 @@ slot="dateCell" slot-scope="{date, data}"> {{data.day.split("-").slice(2).join("-")}} + {{item.followUpTime == data.day?item.contentFeedback:''}} + @@ -367,16 +369,17 @@ }, genjinMsg(item){ this.msgEit = true + this.formInline = {} this.formInline = item this.formInline.plan_Time = [item.nextFollowUpStartTime,item.nextFollowUpEndTime] - if(typeof item.intendedResource == 'string'){ + if(typeof item.intendedResource == 'string' && item.intendedResource!=''){ this.addziyuanData = JSON.parse(item.intendedResource) } if(typeof item.onSitePhotos == 'string'){ this.imgList = item.onSitePhotos.split(',') ||[] } - console.log( this.formInline) + this.ggXin = true }, onSubmit(){ diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue index 5954861..e3e2eac 100644 --- a/admin-web-master/src/views/customer/rsaManagement/index.vue +++ b/admin-web-master/src/views/customer/rsaManagement/index.vue @@ -536,7 +536,11 @@ required: true, message: '请输入手机号', trigger: 'blur' - }, ], + },{ + pattern: /^[0-9]+$/, + message: '手机号只能包含数字', + trigger: 'blur' , + }], idCardValidStart: [{ required: true, message: '请选择身份证有效时间', diff --git a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue index edd97c6..6f0f5d1 100644 --- a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue +++ b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue @@ -41,11 +41,13 @@ slot="dateCell" slot-scope="{date, data}"> {{data.day.split("-").slice(2).join("-")}} - - - {{item.negotiationTime == data.day?item.negotiationResult:''}} - - + + + + {{item.negotiationTime == data.day?item.negotiationResult:''}} + + + @@ -263,10 +265,11 @@ }, genjinMsg(item){ this.msgEit = true + this.formInline ={} this.formInline = item this.formInline.plan_Time = [item.nextNegotiationStartTime,item.nextNegotiationEndTime] - if(typeof item.intendedResource == 'string'){ + if(typeof item.intendedResource == 'string' && item.intendedResource != ''){ this.addziyuanData = JSON.parse(item.intendedResource) } if(typeof item.onSitePhotos == 'string'){ @@ -377,4 +380,5 @@ ::v-deep .el-calendar-table:not(.is-range)td.prev{visibility:hidden;} ::v-deep .el-calendar__button-group {display: none;} ::v-deep .el-backtop, .el-calendar-table td.is-today{color: #3F9B6A;} +::v-deep .el-calendar-table .el-calendar-day {min-height:85px;} diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue index 2bb473c..035e53b 100644 --- a/admin-web-master/src/views/detect/examine/index.vue +++ b/admin-web-master/src/views/detect/examine/index.vue @@ -35,10 +35,10 @@ 商铺 - + diff --git a/ceres-uniapp-master/config/api.js b/ceres-uniapp-master/config/api.js index d09b4b0..e85d54b 100644 --- a/ceres-uniapp-master/config/api.js +++ b/ceres-uniapp-master/config/api.js @@ -6,8 +6,8 @@ -const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' -const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' +const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' +const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' // const DOMAIN_PREFIXPING = 'http://192.168.2.225:9003' // const DOMAIN_PREFIX = 'http://192.168.2.225:9007' // const host = `${window.location.protocol}//${window.location.host}` diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json index f3104dc..e54bec4 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -452,6 +452,13 @@ "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTitleText": "支付" } + }, + { + "path": "rentPay/webView", + "style": { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "跳转" + } } ] }], diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index f95a655..21ce9c6 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -178,7 +178,7 @@ }) } else { - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => { + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},2).then(res => { if(res.data.code == '20004' || res.data.code == '20003'){ uni.navigateTo({ url: '/pages/login/login' diff --git a/lvdao-miniapp/pagesA/rentPay/goPay.vue b/lvdao-miniapp/pagesA/rentPay/goPay.vue index 6a74158..6eb7e85 100644 --- a/lvdao-miniapp/pagesA/rentPay/goPay.vue +++ b/lvdao-miniapp/pagesA/rentPay/goPay.vue @@ -41,7 +41,9 @@ }, methods: { submit(){ - + uni.navigateTo({ + url: '/pagesA/rentPay/webView' + }) } } } diff --git a/lvdao-miniapp/pagesA/rentPay/webView.vue b/lvdao-miniapp/pagesA/rentPay/webView.vue new file mode 100644 index 0000000..6c04275 --- /dev/null +++ b/lvdao-miniapp/pagesA/rentPay/webView.vue @@ -0,0 +1,30 @@ + + + + + + + + + \ No newline at end of file