'1'

杨鑫
1 parent cfcb44ef
Showing 11 changed files with 70 additions and 20 deletions
admin-web-master/src/components/chakan/ggsh.vue
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
admin-web-master/src/views/customer/rsaManagement/genjin.vue
admin-web-master/src/views/customer/rsaManagement/index.vue
admin-web-master/src/views/customer/rsaManagement/tanpan.vue
admin-web-master/src/views/detect/examine/index.vue
ceres-uniapp-master/config/api.js
lvdao-miniapp/pages.json
lvdao-miniapp/pages/workbench/workbench.vue
lvdao-miniapp/pagesA/rentPay/goPay.vue
lvdao-miniapp/pagesA/rentPay/webView.vue
@@ -111,12 +111,12 @@
                 </el-row>
                 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
                   <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
+                    <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
                   </div>
                 </el-form-item>
                 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
                   <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
+                    <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
                   </div>
                 </el-form-item>
               </el-form>
@@ -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]
       })
@@ -159,7 +159,7 @@
           <el-col :span="12">
             <el-form-item>
               <div style="margin-top: 20px">
-                <el-button @click="changeauditStatus()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+                <el-button @click="changeauditStatus" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
                 <el-button @click="addcl = false" class="buttonHover"
                   style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
               </div>
@@ -247,7 +247,6 @@
                 message: tit + '成功',
                 type: 'success'
               })
-              this.removeonaction('1')
               this.addcl = false
               this.getAll()
             } else {
@@ -41,11 +41,13 @@
                 slot="dateCell"
                 slot-scope="{date, data}">
                 {{data.day.split("-").slice(2).join("-")}}
+                <div style="overflow: auto;height:55px;">
               <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
                 <div style="font-size:12px;margin-top:10px;" >
                       {{item.followUpTime == data.day?item.contentFeedback:''}}
                 </div>
                 </div>
+                       </div>
               </template>
          </el-calendar>
         </div>
@@ -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(){
@@ -536,7 +536,11 @@
             required: true,
             message: '请输入手机号',
             trigger: 'blur'
-          }, ],
+          },{
+            pattern: /^[0-9]+$/,
+            message: '手机号只能包含数字',
+            trigger: 'blur' ,
+            }],
           idCardValidStart: [{
             required: true,
             message: '请选择身份证有效时间',
@@ -41,11 +41,13 @@
                 slot="dateCell"
                 slot-scope="{date, data}">
                 {{data.day.split("-").slice(2).join("-")}}
-              <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
-                <div style="font-size:12px;margin-top:10px;" >
-                      {{item.negotiationTime == data.day?item.negotiationResult:''}}
-                </div>
-                </div>
+              <div style="overflow: auto;height:55px;">
+                <div style="width:100%,height:100%" v-for="(item,index) in tableData" @click="genjinMsg(item)">
+                  <div style="font-size:12px;margin-top:10px;width:48%" >
+                        {{item.negotiationTime == data.day?item.negotiationResult:''}}
+                  </div>
+                  </div>
+              </div>
               </template>
          </el-calendar>
         </div>
@@ -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;}
 </style>
@@ -35,10 +35,10 @@
           <div style="display: flex;font-size: 14px">
             <div style="margin-right: 25px;cursor: pointer;" @click="chenge('1')" :class="ontype=='1'?'chengeXia':''">商铺
             </div>
-          <!--  <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
+           <div style="margin-right: 25px;cursor: pointer;" @click="chenge('2')" :class="ontype=='2'?'chengeXia':''">
               广告位</div>
             <div style="margin-right: 25px;cursor: pointer;" @click="chenge('3')" :class="ontype=='3'?'chengeXia':''">场地
-            </div> -->
+            </div>
           </div>
         </div>
         <!-- 表格 -->
@@ -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}`
@@ -452,6 +452,13 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"navigationBarTitleText": "支付"
 			}
+		},
+		{
+			"path": "rentPay/webView",
+			"style": {
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTitleText": "跳转"
+			}
 		}
 		]	
 	}],
@@ -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'
@@ -41,7 +41,9 @@
 			},
 				methods: {
 					submit(){
-						
+						uni.navigateTo({
+							url: '/pagesA/rentPay/webView'
+						})
 					}
 				}
 }				
+<template>
+	  <view>
+		  <web-view src="https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F"></web-view>
+	  </view>
+</template>
+
+<script>
+	export default {
+	  props: {
+	    // 定义接收的 prop，类型为 String
+	    url: {
+	      type: String,
+	      required: true
+	    }
+	  },
+	  computed: {
+	    // 使用计算属性确保 url 被正确绑定到 web-view 的 src 属性
+	    webUrl() {
+	      return this.url;
+	    }
+	  },
+	  mounted() {
+	    // 可选：在组件挂载后进行一些验证或处理
+	    console.log('加载的网址:', this.webUrl);
+	  }
+	}
+</script>
+
+<style>
+</style>
 \ No newline at end of file