From ab1ffdd3cd0836a96091dd7d48b62f9068977f9a Mon Sep 17 00:00:00 2001
From: 2509699674 <2509699647@qq.com>
Date: Wed, 22 Jan 2025 17:41:52 +0800
Subject: [PATCH] '更新'

---
 admin-web-master/src/App.vue                                |  2 +-
 admin-web-master/src/utils/request.js                       |  4 ++--
 admin-web-master/src/views/customer/icManagement/index.vue  |  2 +-
 admin-web-master/src/views/customer/rsaManagement/index.vue |  4 ++--
 admin-web-master/src/views/serve/MarkActivity/index.vue     | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
 admin-web-master/src/views/serve/Merchant/index.vue         | 42 ++++++++++++++++++++++++------------------
 lvdao-miniapp/manifest.json                                 |  2 +-
 7 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/admin-web-master/src/App.vue b/admin-web-master/src/App.vue
index 367cbc8..c531627 100644
--- a/admin-web-master/src/App.vue
+++ b/admin-web-master/src/App.vue
@@ -583,7 +583,7 @@ export default {
       }
     }
     .el-table__body tr.current-row>td.el-table__cell, .el-table__body tr.selection-row>td.el-table__cell{
-      background-color: #DEEBE2 !important;
+      background-color: transparent;
     }
     .el-checkbox__input.is-checked+.el-checkbox__label{
       color:#3F9B6A;
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index d208909..c4ca789 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,10 +17,10 @@ let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'https://jy.scjysm.asia:18086/meserver/admin-server';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
   // baseURL = 'http://10.0.0.51:9003';
-  baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
+  // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
 
 } else {
diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue
index 9e241bf..17e94e4 100644
--- a/admin-web-master/src/views/customer/icManagement/index.vue
+++ b/admin-web-master/src/views/customer/icManagement/index.vue
@@ -2,7 +2,7 @@
   <div style="background-color:#f7f7f7;padding:10px 10px;">
     <div class="zhuti" v-if="ggXin==false && detbox==false">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>商户寻租管理</span> <span style="padding:0 5px;">></span> <span
+        <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">意向客户管理</span></div>
       </div>
       <div>
diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue
index b64eede..8ccbfd5 100644
--- a/admin-web-master/src/views/customer/rsaManagement/index.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/index.vue
@@ -2,8 +2,8 @@
   <div style="background-color:#f7f7f7;padding:10px 10px;">
     <div class="zhuti" v-if="ggXin == false && detbox==false && genjinShow==false && tanpanShow ==false">
       <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>商户寻租管理</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">寻租申请管理</span></div>
+        <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">意向申请管理</span></div>
       </div>
       <div>
         <!-- 搜索 -->
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue
index 37830b2..a1dc432 100644
--- a/admin-web-master/src/views/serve/MarkActivity/index.vue
+++ b/admin-web-master/src/views/serve/MarkActivity/index.vue
@@ -313,9 +313,21 @@
             </div>
             <div style="padding: 15px;">
               <div style="padding: 0px 20px 0px 0px">
-                <el-table :data="ziyuanData" highlight-current-row @current-change="handleSelectionChange"
-                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
 
+                <el-table
+                :data="ziyuanData"
+                 highlight-current-row
+                 ref="multipleTable"
+                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                  @row-click="handleRowClick"
+                  >
+     <el-table-column
+          label="选择"
+          width="55">
+          <template slot-scope="scope">
+            <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio>
+          </template>
+        </el-table-column>
                   <el-table-column label="序号" min-width="8%">
                     <template slot-scope="scope">
                       {{scope.$index + 1}}
@@ -497,7 +509,8 @@
           }],
         },
         mingtotal:0,
-        mingPage:1
+        mingPage:1,
+        selectedRow:null
       }
     },
     created() {
@@ -565,7 +578,7 @@
                   this.getAll()
                 })
               }
-
+              this.selectedRow = null
            }else {
             this.$message({
               message: '请填写完整信息',
@@ -608,7 +621,7 @@
           ids.map(res => {
             changAlls({
               id: res,
-              pageNumber: 1,
+              pageNumber: 0,
               pageSize: 10,
             }).then(item => {
 
@@ -636,12 +649,13 @@
          ids.map(res => {
            changAlls({
              id: res,
-             pageNumber: 1,
+             pageNumber: 0,
              pageSize: 10,
            }).then(item => {
 
              item.data.content.map(ids => {
                this.addziyuanData.push(ids)
+               this.selectedRow = ids
              })
 
            })
@@ -663,7 +677,11 @@
         this.mingPage = val
       },
       closeFn(val) {
+        this.getAll()
   this.ggXin = false
+  this.addziyuanData =[]
+  this.selectedRow = null
+
       },
 
       // 查询按钮
@@ -684,25 +702,24 @@
       },
 
       minSev() {
-        if(this.addziyuanData.length == 1){
-          this.$message({
-            message: '场地只能添加一个',
-          })
-        }else{
-          this.addziyuanData = this.multipleSelection
-        }
+         this.addziyuanData = []
+         this.addziyuanData.push(this.selectedRow)
         this.addziyuan = false
         this.multipleSelection = []
 
+this.selectedRow = null
       },
       mingClose() {
+
         this.multipleSelection = []
         this.addziyuan = false
-      },
-      handleSelectionChange(val) {
+         this.selectedRow = null
+
 
-        this.multipleSelection.push(val)
       },
+      handleRowClick(row) {
+            this.selectedRow = row; // 点击行时选中对应的单选框
+          },
       deltab(item) {
         const h = this.$createElement;
         this.$msgbox({
@@ -784,7 +801,10 @@
       },
 
       addziDel(index){
-              this.addziyuanData.splice(index, 1);
+
+              this.addziyuanData.splice(index, 1)
+              this.selectedRow = null
+
       }
 
     }
@@ -792,6 +812,9 @@
 </script>
 
 <style scoped>
+/deep/ .el-table__body tr.current-row {
+  background-color: transparent !important;
+}
   .zhuti {
     padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue
index 2ba245f..f2c16e2 100644
--- a/admin-web-master/src/views/serve/Merchant/index.vue
+++ b/admin-web-master/src/views/serve/Merchant/index.vue
@@ -342,10 +342,16 @@
               <div style="padding: 0px 20px 0px 0px">
                 <el-table :data="ziyuanData"
                 highlight-current-row
-                    @current-change="handleSelectionChange"
+                      @row-click="handleRowClick"
                   :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
                   >
-
+<el-table-column
+          label="选择"
+          width="55">
+          <template slot-scope="scope">
+            <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio>
+          </template>
+        </el-table-column>
                   <el-table-column label="序号"  min-width="8%" >
                     <template slot-scope="scope">
                       {{scope.$index + 1}}
@@ -483,6 +489,7 @@
             trigger: 'change'
           }, ],
         },
+        selectedRow:null
       }
     },
     created() {
@@ -553,6 +560,7 @@
                   this.getAll()
                 })
               }
+              this.selectedRow = null
            }else {
             this.$message({
               message: '请填写完整信息',
@@ -599,7 +607,7 @@
        ids.map(res => {
          changAlls({
            id: res,
-           pageNumber: 1,
+           pageNumber: 0,
            pageSize: 10,
          }).then(item => {
 
@@ -630,7 +638,10 @@
 
       closeFn(val) {
         this.addziyuanData =[]
+        this.getAll()
    this.ggXin = false
+   this.selectedRow = null
+
       },
       //查看合同
       lookHetong(val) {
@@ -663,12 +674,13 @@
        ids.map(res => {
          changAlls({
            id: res,
-           pageNumber: 1,
+           pageNumber: 0,
            pageSize: 10,
          }).then(item => {
 
            item.data.content.map(ids => {
              this.addziyuanData.push(ids)
+             this.selectedRow = ids
            })
 
          })
@@ -679,27 +691,20 @@
 
       },
   minSev() {
-
-      if(this.addziyuanData.length == 1){
-        this.$message({
-          message: '场地只能添加一个',
-        })
-      }else{
-        this.addziyuanData = this.multipleSelection
-      }
+this.addziyuanData = []
+this.addziyuanData.push(this.selectedRow)
       this.addziyuan = false
       this.multipleSelection = []
+      this.selectedRow = null
       },
       mingClose(){
         this.multipleSelection =[]
         this.addziyuan = false
+        this.selectedRow = null
       },
-      handleSelectionChange(val) {
-
-        this.multipleSelection.push(val)
-      },
-
-
+      handleRowClick(row) {
+            this.selectedRow = row; // 点击行时选中对应的单选框
+          },
       deltab(item){
             const h = this.$createElement;
                     this.$msgbox({
@@ -751,6 +756,7 @@
       },
       handleDelete(index){
           this.addziyuanData.splice(index, 1)
+          this.selectedRow = null
       }
     }
   }
diff --git a/lvdao-miniapp/manifest.json b/lvdao-miniapp/manifest.json
index c759f17..ac3b56a 100644
--- a/lvdao-miniapp/manifest.json
+++ b/lvdao-miniapp/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "绿道",
-    "appid" : "__UNI__189D96A",
+    "appid" : "__UNI__F034047",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",
--
libgit2 0.21.4