From 6eebfba21c11a83617866f371e9b373dffb10fdc Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Wed, 5 Mar 2025 15:34:21 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/components/add/addss.vue         |  16 ++++++++--------
 admin-web-master/src/components/change/zy.vue         |  14 +++++++++++---
 admin-web-master/src/components/newmap/index.vue      |   2 +-
 admin-web-master/src/components/newmap/indexall.vue   |   2 +-
 admin-web-master/src/utils/request.js                 |   4 ++--
 admin-web-master/src/views/customer/yixiang/index.vue |   4 ++--
 admin-web-master/src/views/serve/Merchant/index.vue   | 993 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pages/my/my.vue                         |   4 ++--
 8 files changed, 408 insertions(+), 631 deletions(-)

diff --git a/admin-web-master/src/components/add/addss.vue b/admin-web-master/src/components/add/addss.vue
index 9aad1d6..9bcba89 100644
--- a/admin-web-master/src/components/add/addss.vue
+++ b/admin-web-master/src/components/add/addss.vue
@@ -27,12 +27,12 @@
         <el-input v-model="formInline.email" placeholder="请输入"></el-input>
       </el-form-item>
 
-      <el-form-item label="身份证类型" prop="idCardType">
+      <!-- <el-form-item label="身份证类型" prop="idCardType">
         <el-select v-model="formInline.idCardType" placeholder="请选择" style="width: 100%;">
           <el-option label="身份证" value="身份证"></el-option>
           <el-option label="护照" value="护照"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
 
       <el-form-item label="身份证号码" prop="idCardNumber">
@@ -116,7 +116,7 @@
           sex: '',
           email: '',
           token: '',
-          idCardType: '',
+          idCardType: '身份证',
           idCardNumber: '',
           idCardFrontImage: '',
           idCardBackImage: '',
@@ -148,11 +148,11 @@
             message: '请选择性别',
             trigger: 'change'
           }],
-          idCardType: [{
-            required: true,
-            message: '请输入身份证类型',
-            trigger: 'blur'
-          }],
+          // idCardType: [{
+          //   required: true,
+          //   message: '请输入身份证类型',
+          //   trigger: 'blur'
+          // }],
           idCardNumber: [{
             required: true,
             message: '请输入身份证号码',
diff --git a/admin-web-master/src/components/change/zy.vue b/admin-web-master/src/components/change/zy.vue
index 14b06ab..05871b3 100644
--- a/admin-web-master/src/components/change/zy.vue
+++ b/admin-web-master/src/components/change/zy.vue
@@ -4,9 +4,9 @@
       <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
         <div
           style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
-          <div style="line-height:200%">选择策略</div>
+          <div style="line-height:200%">选择资源</div>
           <div style="display: flex">
-            <el-select v-model="zytype" placeholder="请选择" style="width: 40%;margin-right: 15px" @change="changzytype">
+            <el-select v-if="!istype" v-model="zytype" placeholder="请选择" style="width: 40%;margin-right: 15px" @change="changzytype">
                 <el-option label="商铺" :value="'1'"></el-option>
                 <el-option label="广告" :value="'2'"></el-option>
                 <el-option label="场地" :value="'3'"></el-option>
@@ -94,10 +94,18 @@
       };
     },
     async created() {
-
+      if(this.istype) {
+        this.zytype =  this.istype
+      }
       await this.getAll()
     },
     props: {
+      istype: {
+        type: String,
+        default: function () {
+          return null
+        }
+      },
       publishStatus: {
         type: String,
         default: function () {
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index 1a94dbb..13e719a 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -195,7 +195,7 @@
     position: absolute;
     top: 10px;
     left: 10px;
-    z-index: 999;
+    z-index: 99;
     background: #fff;
     padding: 10px;
     border-radius: 5px;
diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue
index 4831513..d5d3539 100644
--- a/admin-web-master/src/components/newmap/indexall.vue
+++ b/admin-web-master/src/components/newmap/indexall.vue
@@ -309,7 +309,7 @@ body {
     position: absolute;
     top: 10px;
     left: 10px;
-    z-index: 999999;
+    z-index: 99;
     background: #fff;
     padding: 10px;
     border-radius: 5px;
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 7d429a9..8d2127b 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,8 +16,8 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
-  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'http://128.10.250.208:9003';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'http://128.10.250.208:9003';
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index 5db57b7..97bd66f 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -86,7 +86,7 @@
 							<el-select v-model="pipeiSel.resources.cereRentalPolicies.applicableResources"
 								placeholder="请选择" style="width: 100%;">
 								<el-option label="商铺" value="商铺" />
-								<el-option label="广告位" value="广告位" />
+								<el-option label="实体广告位" value="广告位" />
 								<el-option label="场地" value="场地" />
 							</el-select>
 						</el-form-item>
@@ -180,7 +180,7 @@
 					
 				</el-table>
 
-				<div class="fenye">
+				<div class="fenye" style="padding-bottom: 30px;">
 					<el-pagination class="pagination" background :current-page="pipcurrentPage"
 						layout="prev, pager, next,total" :total="pipData.length" @size-change="pipSizeChange"
 						@current-change="pipCurrentChange" />
diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue
index fb6f4e9..3b0b86d 100644
--- a/admin-web-master/src/views/serve/Merchant/index.vue
+++ b/admin-web-master/src/views/serve/Merchant/index.vue
@@ -38,26 +38,24 @@
         </div>
         <div style="margin-bottom: 20px;">
           <div>
-            <el-button
-            style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
-              @click="addOpen">新增</el-button>
+            <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+              icon="el-icon-circle-plus-outline" @click="addOpen">新增</el-button>
           </div>
         </div>
         <!-- 表格 -->
 
         <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-         >
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="序号" min-width="150">
-              <template slot-scope="scope">
-                {{scope.$index +1 }}
-                 </template>
+            <template slot-scope="scope">
+              {{scope.$index +1 }}
+            </template>
           </el-table-column>
           <el-table-column label="商务合作标题" min-width="150" prop="title">
           </el-table-column>
           <el-table-column label="场地名称" min-width="150">
             <template slot-scope="scope">
-             {{scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:'无'}}
+              {{scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:'无'}}
             </template>
           </el-table-column>
           <el-table-column label="合作类型" prop="cooperationType" min-width="250">
@@ -73,9 +71,9 @@
 
 
           <el-table-column prop="status" label="发布状态" min-width="150">
-             <template slot-scope="scope">
-               {{scope.row.status=='2'?'未发布':'已发布'}}
-                </template>
+            <template slot-scope="scope">
+              {{scope.row.status=='2'?'未发布':'已发布'}}
+            </template>
           </el-table-column>
           <el-table-column label="操作" min-width="300" fixed="right">
             <template slot-scope="scope">
@@ -97,121 +95,113 @@
     </div>
     <!-- 详情框 -->
     <div class="zhuti" v-if='detbox'>
-          <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>
-              <div style="margin-top: 30px;" class="editcss">
-                <div style="padding: 20px;">
-                  <el-form :model="xiangData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="商务合作标题" prop="title">
-                          <div  class="duiqi">{{xiangData.title}}</div>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="合作类型">
-                            <div  class="duiqi">{{xiangData.cooperationType}}</div>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="联系人">
-                            <div  class="duiqi">{{xiangData.contactPerson}}</div>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                           <el-form-item label="联系电话">
-                               <div  class="duiqi">{{xiangData.contactPhone}}</div>
-                           </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="邮箱">
-                            <div  class="duiqi">{{xiangData.email}}</div>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                      <el-col :span="24">
-                        <el-form-item label="内容" prop="content" tyle="width: 100%;">
-                          <div v-html="xiangData.content" style="line-height:40px" ></div>
-                        </el-form-item>
-                      </el-col>
-
-                    </el-row>
-
-              <el-row :gutter="20">
-                <el-col :span="24">
-                  <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
-                    <div
-                      style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
-                      <div>场地选择</div>
-                    </div>
-                    <div style="padding:20px;">
-                      <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-                        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                        <el-table-column label="序号" width="80">
-                          <template slot-scope="scope">
-                            {{scope.$index + 1}}
-                          </template>
-                        </el-table-column>
-
-                        </el-table-column>
-                        <el-table-column label="场地名称" prop="venueName">
-
-                        </el-table-column>
-                        <el-table-column label="所属区域" prop="district" >
-                        </el-table-column>
-                        <el-table-column label="场地类型" prop="venueType" >
+      <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>
+      <div class="editcss">
+        <div style="padding: 20px 20px 20px 0;">
+          <el-form :model="xiangData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="商务合作标题" prop="title">
+                  <div class="duiqi">{{xiangData.title}}</div>
+                </el-form-item>
+              </el-col>
 
-                        </el-table-column>
-                        <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip>
-                        </el-table-column> -->
+              <el-col :span="12">
+                <el-form-item label="合作类型">
+                  <div class="duiqi">{{xiangData.cooperationType}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="联系人">
+                  <div class="duiqi">{{xiangData.contactPerson}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="联系电话">
+                  <div class="duiqi">{{xiangData.contactPhone}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="邮箱">
+                  <div class="duiqi">{{xiangData.email}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="内容" prop="content" tyle="width: 100%;">
+                  <div v-html="xiangData.content" style="line-height:40px"></div>
+                </el-form-item>
+              </el-col>
 
-                      </el-table>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="场地选择" prop="resourceManagement">
+                  <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+                    <div style="padding: 15px;">
+                      <div style="padding: 0px 20px 0px 0px">
+                        <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                          <el-table-column label="序号" width="50">
+                            <template slot-scope="scope">
+                              {{scope.$index + 1}}
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="场地名称" prop="venueName">
+                          </el-table-column>
+                          <el-table-column label="所属区域" prop="district">
+                          </el-table-column>
+                          <el-table-column label="场地类型" prop="venueType">
+                          </el-table-column>
+                        </el-table>
+                      </div>
                     </div>
                   </div>
-                </el-col>
-
-              </el-row>
-              <el-row :gutter="20">
-                <el-col :span="24">
-                  <el-form-item label="往期活动展示" prop="previousEvents">
-                     <!-- <div style="display: flex;justify-content: space-between;" >
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="往期活动展示" prop="previousEvents">
+                  <!-- <div style="display: flex;justify-content: space-between;" >
                        <el-image style="width:48%" fit="fill" :src="$baseURL+item" v-for="(item,index) in xiangData.previousEvents"></el-image>
                      </div> -->
-                     <div style="display: flex;">
-                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in xiangData.previousEvents" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
-                      </div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="20">
-                <el-col :span="24">
-                  <el-form-item label="封面图片" prop="coverImage">
-                    <!-- <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image> -->
-                    <div style="display: flex;">
-                      <allimg v-if="item" :src="item" fit="contain"  v-for="item in xiangData.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
-                    </div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain" v-for="item in xiangData.previousEvents"
+                      style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="封面图片" prop="coverImage">
+                  <!-- <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain" v-for="item in xiangData.coverImage.split(',')"
+                      style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
-                  </el-form>
-                </div>
-              </div>
-    <el-row :gutter="20">
-                        <el-col :span="12">
-                            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                              @click="detbox=false">取消</el-button>
-                        </el-col>
-                      </el-row>
+          </el-form>
         </div>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="detbox=false">取消</el-button>
+        </el-col>
+      </el-row>
+    </div>
 
     <!-- 新增 -->
     <div class="zhuti" v-if="ggXin">
@@ -219,13 +209,13 @@
         <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">{{edit?'新增':'编辑'}}</span></div>
       </div>
-      <div style="margin-top: 30px;">
+      <div style="">
         <div style="padding: 20px 20px 20px 0;">
           <el-form ref="AddFromOne" :model="formInline" :rules="rulesOne" label-width="150px">
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="商务合作标题" prop="title">
-                  <el-input placeholder="请输入"  v-model="formInline.title" ></el-input>
+                  <el-input placeholder="请输入" v-model="formInline.title"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -254,7 +244,7 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="邮箱" prop="email">
-                  <el-input placeholder="请输入"  v-model="formInline.email" ></el-input>
+                  <el-input placeholder="请输入" v-model="formInline.email"></el-input>
                 </el-form-item>
               </el-col>
 
@@ -268,48 +258,49 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="24">
-                <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
-                  <div
-                    style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
-                    <div>场地选择</div>
-                    <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true">
-                      添加
+                <el-form-item label="场地选择" prop="resourceManagement">
+                  <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+                    <div
+                      style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
+                      <div></div>
+                      <div style="color: #3F9B6A;padding:10px;" @click="addziyuan = true">
+                        添加
+                      </div>
+                    </div>
+                    <div style="padding: 15px;">
+                      <div style="padding: 0px 20px 0px 0px">
+                        <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                          <el-table-column label="序号" width="50">
+                            <template slot-scope="scope">
+                              {{scope.$index + 1}}
+                            </template>
+                          </el-table-column>
+                          <el-table-column label="场地名称" prop="venueName">
+                          </el-table-column>
+                          <el-table-column label="所属区域" prop="district">
+                          </el-table-column>
+                          <el-table-column label="场地类型" prop="venueType">
+                          </el-table-column>
+                          <el-table-column label="操作" >
+                            <template slot-scope="scope">
+                              <div class="tableBtn greens" @click="handleDelete(scope.$index)">删除</div>
+                            </template>
+                          </el-table-column>
+                        </el-table>
+                      </div>
                     </div>
                   </div>
-                  <div style="padding:20px;">
-                    <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-                      :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                      <el-table-column label="序号" width="80">
-                        <template slot-scope="scope">
-                          {{scope.$index + 1}}
-                        </template>
-                      </el-table-column>
-                      <el-table-column label="场地名称" prop="venueName">
-                      </el-table-column>
-                      <el-table-column label="所属区域" prop="district" >
-                      </el-table-column>
-                      <el-table-column label="场地类型" prop="venueType" >
-                      </el-table-column>
-                      <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip>
-                      </el-table-column> -->
-                      <el-table-column label="操作" min-width="150">
-                        <template slot-scope="scope">
-                          <div class="tableBtn greens" @click="handleDelete(scope.$index)" >删除</div>
-                        </template>
-                      </el-table-column>
-                    </el-table>
-                  </div>
-                </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-form-item label="往期活动展示" prop="previousEvents">
+                  <upimg filePath="serve" :value="formInline.previousEvents" inputtype="previousEvents" :limit="5"
+                    @changimg="e=>changimg(e,'previousEvents')"></upimg>
+                </el-form-item>
               </el-col>
             </el-row>
-    <el-row :gutter="20">
-      <el-col :span="24">
-        <el-form-item label="往期活动展示" prop="previousEvents">
-          <upimg filePath="serve" :value="formInline.previousEvents" inputtype="previousEvents" :limit="5"
-            @changimg="e=>changimg(e,'previousEvents')"></upimg>
-        </el-form-item>
-      </el-col>
-    </el-row>
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="封面图片" prop="coverImage">
@@ -324,7 +315,8 @@
                 <el-form-item>
                   <div style="margin-top: 20px">
                     <el-button class="buttonHover"
-                      style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeFn">取消</el-button>
+                      style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                      @click="closeFn">取消</el-button>
                     <el-button style="background-color: #3F9B6A;color: #fff" @click="addCheck">确 定</el-button>
                   </div>
 
@@ -335,84 +327,82 @@
           </el-form>
         </div>
       </div>
-      <el-dialog :visible.sync="addziyuan" title="添加" width="70%"
-        append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+      <!-- <el-dialog :visible.sync="addziyuan" title="添加" width="70%" append-to-body center :close-on-click-modal="false"
+        :close-on-press-escape="false" :show-close="false">
         <div style="padding: 15px;width:100%">
           <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
-            <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+            <div
+              style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
               <div>选择场地</div>
             </div>
             <div style="padding: 15px;">
               <div style="padding: 0px 20px 0px 0px">
-                <el-table :data="ziyuanData"
-                highlight-current-row
-                      @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="序号"  width="80">
+                <el-table :data="ziyuanData" highlight-current-row @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="序号" width="80">
                     <template slot-scope="scope">
                       {{scope.$index + 1}}
                     </template>
                   </el-table-column>
-                 <el-table-column label="场地名称" prop="venueName" >
+                  <el-table-column label="场地名称" prop="venueName">
 
-                 </el-table-column>
-                 <el-table-column label="场地类型" prop="venueType">
+                  </el-table-column>
+                  <el-table-column label="场地类型" prop="venueType">
+
+                  </el-table-column>
+                  <el-table-column label="所属区域" prop="district">
+                  </el-table-column>
 
-                 </el-table-column>
-                 <el-table-column label="所属区域" prop="district" >
-                 </el-table-column>
-                 <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="20%" show-overflow-tooltip>
-                 </el-table-column> -->
                 </el-table>
               </div>
             </div>
           </div>
         </div>
         <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
-          <el-button  @click="mingClose" class="buttonHover"
-                style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
+          <el-button @click="mingClose" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
           </el-button>
-          <el-button  @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
+          <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
           </el-button>
 
         </div>
-      </el-dialog>
-   </div>
+      </el-dialog> -->
+    </div>
+    <el-dialog :visible.sync="addziyuan" title="选择资源" style="padding: 0;" width="65%" append-to-body center
+      :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+      <zy :istype="'3'" :maxSelection="1" publishStatus="2" v-if="addziyuan" @mingClose="mingClose" @minSev="minSev"></zy>
+        
+    </el-dialog>
   </div>
 
 
 </template>
 
 <script>
-  import {
-    async
-  } from 'q'
-  import axios from 'axios'
+  import zy from "@/components/change/zy"
   import wangEditor from "@/components/editor/index";
   import {
- MerGetAll,
- MerAdd,
- MerEdit,
- MerDel
+    MerGetAll,
+    MerAdd,
+    MerEdit,
+    MerDel
   } from '../../../api/Merchant.js'
   import upimg from "@/components/ImageUpload/index"
   import {
-   changAlls
+    changAlls
   } from '../../../api/information.js'
   import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       upimg,
       wangEditor,
-      allimg
+      allimg,
+      zy
     },
     data() {
       return {
@@ -425,38 +415,38 @@
         pageSize: 10,
         ggXin: false,
         formInline: {
-          title:'',
-          venue:'',
-          contactPerson:'',
-          contactPhone:'',
-          cooperationType:'',
-          email:'',
-          coverImage:'',
-          previousEvents:'',
-          status:'2'
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          cooperationType: '',
+          email: '',
+          coverImage: '',
+          previousEvents: '',
+          status: '2'
         },
-        plan_Time:[],
-        followUpTime:[],
+        plan_Time: [],
+        followUpTime: [],
         tableData: [],
         secondData: {},
         pageindex: {
-           title:'',
-           venue:'',
-           contactPerson:'',
-           contactPhone:'',
-           cooperationType:'',
-      pageNumber: 0,
-      pageSize: 10,
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          cooperationType: '',
+          pageNumber: 0,
+          pageSize: 10,
         },
         bianjiBox: 1,
 
         edit: true, //编辑切换
-        addkehu:false,
-        addziyuan:false,
-        ziyuanData:[],//资源
-        addziyuanData:[],
-        multipleSelection:[],
-        xiangData:{},//详情
+        addkehu: false,
+        addziyuan: false,
+        ziyuanData: [], //资源
+        addziyuanData: [],
+        multipleSelection: [],
+        xiangData: {}, //详情
         rulesOne: {
           title: [{
             required: true,
@@ -499,7 +489,7 @@
             trigger: 'change'
           }, ],
         },
-        selectedRow:null
+        selectedRow: null
       }
     },
     created() {
@@ -510,20 +500,20 @@
     },
     methods: {
       changimg(e, type) {
- this.formInline[type] = e
+        this.formInline[type] = e
 
       },
-  addOpen(){
+      addOpen() {
         this.formInline = {
-          title:'',
-          venue:'',
-          contactPerson:'',
-          contactPhone:'',
-          cooperationType:'',
-          email:'',
-          coverImage:'',
-          previousEvents:'',
-          status:'2'
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          cooperationType: '',
+          email: '',
+          coverImage: '',
+          previousEvents: '',
+          status: '2'
         }
         this.addziyuanData = []
         this.ggXin = true
@@ -532,18 +522,18 @@
         const res = await MerGetAll(this.pageindex)
         this.tableData = res.data.content
         this.total = res.data.content.length
-        const ziyuan =  await changAlls(this.pageindex)
+        const ziyuan = await changAlls(this.pageindex)
         this.ziyuanData = [...ziyuan.data.content]
       },
 
       // 新增确定按钮
-       addCheck(val) {
-        if(this.addziyuanData.length !=0){
-          this.formInline.venue  = this.addziyuanData.map(item => item.id).join(',');
-        }else{
-          this.formInline.venue =''
+      addCheck(val) {
+        if (this.addziyuanData.length != 0) {
+          this.formInline.venue = this.addziyuanData.map(item => item.id).join(',');
+        } else {
+          this.formInline.venue = ''
         }
-        if(this.formInline.content  == '<p> </p>' || this.formInline.content  == '<p><br></p>'){
+        if (this.formInline.content == '<p> </p>' || this.formInline.content == '<p><br></p>') {
           this.$message({
             message: '请填写完整信息',
             type: 'error'
@@ -551,27 +541,27 @@
           return
         }
         this.$refs.AddFromOne.validate((valid) => {
-           if (valid) {
-             this.formInline.createTime = this.currentTime()
-              if(this.edit){
-                 MerAdd(this.formInline).then(res=>{
-                   this.ggXin = false
-                   this.addziyuanData = []
-                   this.getAll()
-                 })
-              }else{
-
-                if(this.formInline.previousEvents !=''&& typeof this.formInline.previousEvents != 'string'){
-                  this.formInline.previousEvents = this.formInline.previousEvents.join(',')
-                }
-               MerEdit(this.formInline).then(res=>{
-                  this.ggXin = false
-                  this.addziyuanData = []
-                  this.getAll()
-                })
+          if (valid) {
+            this.formInline.createTime = this.currentTime()
+            if (this.edit) {
+              MerAdd(this.formInline).then(res => {
+                this.ggXin = false
+                this.addziyuanData = []
+                this.getAll()
+              })
+            } else {
+
+              if (this.formInline.previousEvents != '' && typeof this.formInline.previousEvents != 'string') {
+                this.formInline.previousEvents = this.formInline.previousEvents.join(',')
               }
-              this.selectedRow = null
-           }else {
+              MerEdit(this.formInline).then(res => {
+                this.ggXin = false
+                this.addziyuanData = []
+                this.getAll()
+              })
+            }
+            this.selectedRow = null
+          } else {
             this.$message({
               message: '请填写完整信息',
               type: 'error'
@@ -602,38 +592,38 @@
       },
 
       //详情
-       details(item) {
-         this.addziyuanData = []
+      details(item) {
+        this.addziyuanData = []
         this.edit = true
         this.xiangData = item
 
         if (typeof item.previousEvents === 'string') {
           this.xiangData.previousEvents = item.previousEvents.split(',');
-}
+        }
 
-     if(item.venue!=''){
-       let ids = []
-       ids = item.venue.split(',')
-       ids.map(res => {
-         changAlls({
-           id: res,
-           pageNumber: 0,
-           pageSize: 10,
-         }).then(item => {
+        if (item.venue != '') {
+          let ids = []
+          ids = item.venue.split(',')
+          ids.map(res => {
+            changAlls({
+              id: res,
+              pageNumber: 0,
+              pageSize: 10,
+            }).then(item => {
 
-           item.data.content.map(ids => {
-             this.addziyuanData.push(ids)
-           })
+              item.data.content.map(ids => {
+                this.addziyuanData.push(ids)
+              })
 
-         })
-       })
+            })
+          })
 
-     }
+        }
 
         this.detbox = true
       },
-     async addbuss() {
-       await MerEdit(this.xiangData)
+      async addbuss() {
+        await MerEdit(this.xiangData)
         this.detbox = false
         this.getAll()
         // this.ggXin = true
@@ -647,10 +637,10 @@
       },
 
       closeFn(val) {
-        this.addziyuanData =[]
+        this.addziyuanData = []
         this.getAll()
-   this.ggXin = false
-   this.selectedRow = null
+        this.ggXin = false
+        this.selectedRow = null
 
       },
       //查看合同
@@ -658,119 +648,125 @@
         this.hetongBox = true
       },
       // 查询按钮
-       onSubmit() {
-     this.getAll()
+      onSubmit() {
+        this.getAll()
       },
       //重置按钮
       resetting() {
-    this.pageindex={
-         title:'',
-         venue:'',
-         contactPerson:'',
-         contactPhone:'',
-         cooperationType:'',
-    pageNumber: 0,
-    pageSize: 10,
-      }
-         this.getAll()
+        this.pageindex = {
+          title: '',
+          venue: '',
+          contactPerson: '',
+          contactPhone: '',
+          cooperationType: '',
+          pageNumber: 0,
+          pageSize: 10,
+        }
+        this.getAll()
       },
-      zhongzhi(item){
-     this.edit = false
-     this.formInline = item
-     this.addziyuanData =[]
-     if(item.venue!=''){
-       let ids = []
-       ids = item.venue.split(',')
-       ids.map(res => {
-         changAlls({
-           id: res,
-           pageNumber: 0,
-           pageSize: 10,
-         }).then(item => {
-
-           item.data.content.map(ids => {
-             this.addziyuanData.push(ids)
-             this.selectedRow = ids
-           })
+      zhongzhi(item) {
+        this.edit = false
+        this.formInline = item
+        this.addziyuanData = []
+        if (item.venue != '') {
+          let ids = []
+          ids = item.venue.split(',')
+          ids.map(res => {
+            changAlls({
+              id: res,
+              pageNumber: 0,
+              pageSize: 10,
+            }).then(item => {
+
+              item.data.content.map(ids => {
+                this.addziyuanData.push(ids)
+                this.selectedRow = ids
+              })
 
-         })
-       })
+            })
+          })
 
-     }
-     this.ggXin = true
+        }
+        this.ggXin = true
 
       },
-  minSev() {
-this.addziyuanData = []
-this.addziyuanData.push(this.selectedRow)
-      this.addziyuan = false
-      this.multipleSelection = []
-      this.selectedRow = null
+      minSev(e) {
+        console.log(e)
+        this.addziyuanData = []
+        this.addziyuanData = e
+        this.addziyuan = false
+        this.multipleSelection = []
+        this.selectedRow = null
       },
-      mingClose(){
-        this.multipleSelection =[]
+      mingClose() {
+        this.multipleSelection = []
         this.addziyuan = false
         this.selectedRow = null
       },
       handleRowClick(row) {
-            this.selectedRow = row; // 点击行时选中对应的单选框
-          },
-      deltab(item){
-            const h = this.$createElement;
-                    this.$msgbox({
-                      title: '消息',
-                      message: h('p', null, [
-                        h('span', null, '是否删除 '),
-                      ]),
-                      showCancelButton: true,
-                      showClose:false,
-                      confirmButtonText: '确定',
-                      cancelButtonText: '取消',
-                      customClass:'oe-dialog-btn',
-                      beforeClose: (action, instance, done) => {
-                        if (action === 'confirm') {
-                          MerDel({id:item.id}).then(res=>{
-                            this.$message({
-                              message: '删除成功',
-                              type: 'success'
-                            })
-                             this.getAll()
-                            done();
-                          })
-                        } else {
-                          done();
-                        }
+        this.selectedRow = row; // 点击行时选中对应的单选框
+      },
+      deltab(item) {
+        const h = this.$createElement;
+        this.$msgbox({
+          title: '消息',
+          message: h('p', null, [
+            h('span', null, '是否删除 '),
+          ]),
+          showCancelButton: true,
+          showClose: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'oe-dialog-btn',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              MerDel({
+                id: item.id
+              }).then(res => {
+                this.$message({
+                  message: '删除成功',
+                  type: 'success'
+                })
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
           }
-          })
+        })
       },
-      fabu(item,val){
+      fabu(item, val) {
         const h = this.$createElement;
-                  this.$msgbox({
-                    title: '消息',
-                    message: h('p', null, [
-                      h('span', null, '是否处理'),
-                    ]),
-                    showCancelButton: true,
-                    showClose:false,
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    customClass:'oe-dialog-btn',
-                    beforeClose: (action, instance, done) => {
-                      if (action === 'confirm') {
-                        MerEdit({id:item.id,status:val}).then(res=>{
-                           this.getAll()
-                          done();
-                        })
-                      } else {
-                        done();
-                      }
-        }
+        this.$msgbox({
+          title: '消息',
+          message: h('p', null, [
+            h('span', null, '是否处理'),
+          ]),
+          showCancelButton: true,
+          showClose: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          customClass: 'oe-dialog-btn',
+          beforeClose: (action, instance, done) => {
+            if (action === 'confirm') {
+              MerEdit({
+                id: item.id,
+                status: val
+              }).then(res => {
+                this.getAll()
+                done();
+              })
+            } else {
+              done();
+            }
+          }
         })
 
       },
-      handleDelete(index){
-          this.addziyuanData.splice(index, 1)
-          this.selectedRow = null
+      handleDelete(index) {
+        this.addziyuanData.splice(index, 1)
+        this.selectedRow = null
       }
     }
   }
@@ -783,7 +779,6 @@ this.addziyuanData.push(this.selectedRow)
     background-color: #Fff;
 
   }
-
   .chengeXia {
     border-bottom: 6px solid #3F9B6A;
     padding-bottom: 4px;
@@ -791,52 +786,15 @@ this.addziyuanData.push(this.selectedRow)
   }
 
 
-
-  .tableBtn {
-    display: inline-block;
-    margin-right: 10px;
-    color: #ACACAC;
-  }
-
   .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
   }
-
   .greens {
     color: #3F9B6A;
   }
-
-  /deep/ .el-table__row {
-    font-size: 14px;
-    color: #000000e6;
-    height: 42px;
-  }
-
-  .fenye {
-    margin-top: 20px;
-    display: flex;
-    justify-content: flex-end;
-  }
-
-  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color: #3F9B6A;
-  }
-
-  .el-row {
-    margin-bottom: 20px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .el-col {
-    border-radius: 4px;
-  }
-
   .bg-purple-dark {
     background: #99a9bf;
   }
@@ -848,207 +806,18 @@ this.addziyuanData.push(this.selectedRow)
   .bg-purple-light {
     background: #e5e9f2;
   }
-
   .grid-content {
     border-radius: 4px;
     min-height: 36px;
   }
 
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  }
-
-  /deep/ .bg-purple[data-v-0e3fe4ec] {
-    background: #fff;
-    height: 50px;
-  }
-
-  /deep/ .bg-purple[data-v-3bebae82] {
-    background: #fff;
-    height: 50px;
-  }
-
-  ::v-deep .bg-purple {
-    background: #fff;
-    height: 50px;
-  }
-
-
-
-  ::v-deep .el-form-item {
-    margin-bottom: 16px;
-  }
-
-  .device-form .el-form-item__label::after {
-    content: "*";
-    color: #1A1A1A;
-    margin-left: 5px;
-    font-size: 16px;
-  }
-
-
-  ::v-deep .el-dialog__wrapper {
-    .el-dialog__header {
-      background-color: #FAFAFA;
-    }
-  }
-
-  ::v-deep .el-input__inner:focus {
-    border: #3F9B6A 1px solid;
-  }
-
-  .dialog-footer {
-    display: flex;
-    justify-content: flex-end;
-    border-top: solid rgba(209, 209, 209, 0.2) 2px;
-    padding-top: 20px;
-  }
-
-  ::v-deep .el-input__inner:focus {
-    border: #3F9B6A 1px solid;
-  }
-
-  ::v-deep .el-input__inner:hover {
-    border: #3F9B6A 1px solid;
-  }
-
-  ::v-deep .el-select .el-input.is-focus .el-input__inner {
-    border-color: #3F9B6A
-  }
-
-  .el-select-dropdown__item.selected {
-    color: #3F9B6A;
-  }
-
-  .el-pagination__sizes .el-input .el-input__inner:hover {
-    border-color: #3F9B6A;
-  }
-
-  ::v-deep .el-dialog__wrapper {
-
-    .dialog_css {
-      margin-right: 12px;
-      margin-top: 61px !important;
-
-      .el-dialog__title {
-        font-size: 16px !important;
-        font-weight: 600;
-        color: #000;
-      }
-    }
-
-    .diaslog_zhong {
-      margin-left: 25%;
-      margin-top: 61px !important;
-    }
-
-  }
-
-  ::v-deep .diaslog_zhong {
-    margin-left: 20%;
-    margin-top: 61px !important;
-
-    .el-dialog__header {
-      background-color: #fff;
-      border-bottom: 1px solid #EFEFEF;
-
-      .el-dialog__title {
-        font-size: 14px;
-        color: #000000e6;
-      }
-    }
-
-    .el-dialog__body {
-      padding: 10px 30px 30px 20px
-    }
-  }
-
-  /deep/ .el-table_1_column_8 .hetong {
-    color: #7DBB9A;
-    text-decoration: underline;
-  }
-
-  /deep/ .first-column-bg {
-    background-color: #FAFAFA !important;
-  }
-
-  ::v-deep .textarea {
-    width: 85%;
-
-    .el-textarea__inner {
-      width: 100%;
-    }
-  }
-
-  ::v-deep .pass_input {
-    width: 100%;
-
-    .el-input__inner {
-      border: none;
-      padding: 0;
-    }
-  }
-
-  ::v-deep .pass_select {
-    width: 100%;
-
-    .el-input__inner {
-      border: none;
-      padding: 0;
-    }
-
-    .el-icon-arrow-up:before {
-      content: ''
-    }
-
-  }
-
-  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-    background-color: #fff;
-  }
 </style>
 <style lang="scss" scoped>
-  ::v-deep .bian_css {
-    .el-dialog__header {
-      padding: 0px;
-    }
-
-    .el-input__inner {
-      height: 18px;
-      border: 0px;
-      margin-top: 0px;
-    }
-
-    .el-input__inner:hover {
-      border: 0px;
-    }
-
-    .el-input__inner:focus {
-      border: 0px;
-    }
-  }
-
-  ::v-deep .buttonHover:hover {
-    color: #3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
-  }
-
-  ::v-deep .el-pagination__total {
-    position: absolute;
-    left: 33px;
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
   }
-
-  ::v-deep .diaslog_zhong {
-    .el-dialog__body {
-      padding: 10px 20px 20px 20px;
-    }
-
-    .el-upload--picture-card {
-      width: 130px;
-      height: 130px;
-    }
+  .el-dialog__header{
+    padding: 0;
+    display: none;
   }
 </style>
diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue
index ff460b0..12e5fc7 100644
--- a/lvdao-miniapp/pages/my/my.vue
+++ b/lvdao-miniapp/pages/my/my.vue
@@ -23,8 +23,8 @@
 					<image :src="user.avatar?user.avatar:$imgUrl('/img/head.jpg')" v-else></image>
 				</view>
 				<view class="info">
-					<view class="nickname">
-						<text style="width: 100%;" v-if="!user.name" @click="gopath('/pages/login/login')">请登录</text>
+					<view class="nickname" @click="!user.name?gopath('/pages/login/login'):''">
+						<text style="width: 100%;" v-if="!user.name" >请登录</text>
 						<text v-else>{{user.name}}</text>
 					</view>
 				</view>
--
libgit2 0.21.4