webapp / GreenwayWeb

Commit bf5b6312ae8e53a780d29aec95e08884e379e76e

Authored by 杨鑫
2 parents 2d521f7d e122edcf

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 7 changed files with 406 additions and 629 deletions
admin-web-master/src/components/add/addss.vue
  View file @bf5b631
@@ -27,12 +27,12 @@ @@ -27,12 +27,12 @@
27 <el-input v-model="formInline.email" placeholder="请输入"></el-input> 27 <el-input v-model="formInline.email" placeholder="请输入"></el-input>
28 </el-form-item> 28 </el-form-item>
29 29
30 - <el-form-item label="身份证类型" prop="idCardType"> 30 + <!-- <el-form-item label="身份证类型" prop="idCardType">
31 <el-select v-model="formInline.idCardType" placeholder="请选择" style="width: 100%;"> 31 <el-select v-model="formInline.idCardType" placeholder="请选择" style="width: 100%;">
32 <el-option label="身份证" value="身份证"></el-option> 32 <el-option label="身份证" value="身份证"></el-option>
33 <el-option label="护照" value="护照"></el-option> 33 <el-option label="护照" value="护照"></el-option>
34 </el-select> 34 </el-select>
35 - </el-form-item> 35 + </el-form-item> -->
36 36
37 37
38 <el-form-item label="身份证号码" prop="idCardNumber"> 38 <el-form-item label="身份证号码" prop="idCardNumber">
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 sex: '', 116 sex: '',
117 email: '', 117 email: '',
118 token: '', 118 token: '',
119 - idCardType: '', 119 + idCardType: '身份证',
120 idCardNumber: '', 120 idCardNumber: '',
121 idCardFrontImage: '', 121 idCardFrontImage: '',
122 idCardBackImage: '', 122 idCardBackImage: '',
@@ -148,11 +148,11 @@ @@ -148,11 +148,11 @@
148 message: '请选择性别', 148 message: '请选择性别',
149 trigger: 'change' 149 trigger: 'change'
150 }], 150 }],
151 - idCardType: [{  
152 - required: true,  
153 - message: '请输入身份证类型',  
154 - trigger: 'blur'  
155 - }], 151 + // idCardType: [{
  152 + // required: true,
  153 + // message: '请输入身份证类型',
  154 + // trigger: 'blur'
  155 + // }],
156 idCardNumber: [{ 156 idCardNumber: [{
157 required: true, 157 required: true,
158 message: '请输入身份证号码', 158 message: '请输入身份证号码',
admin-web-master/src/components/change/zy.vue
  View file @bf5b631
@@ -4,9 +4,9 @@ @@ -4,9 +4,9 @@
4 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong"> 4 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
5 <div 5 <div
6 style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;"> 6 style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
7 - <div style="line-height:200%">选择策略</div> 7 + <div style="line-height:200%">选择资源</div>
8 <div style="display: flex"> 8 <div style="display: flex">
9 - <el-select v-model="zytype" placeholder="请选择" style="width: 40%;margin-right: 15px" @change="changzytype"> 9 + <el-select v-if="!istype" v-model="zytype" placeholder="请选择" style="width: 40%;margin-right: 15px" @change="changzytype">
10 <el-option label="商铺" :value="'1'"></el-option> 10 <el-option label="商铺" :value="'1'"></el-option>
11 <el-option label="广告" :value="'2'"></el-option> 11 <el-option label="广告" :value="'2'"></el-option>
12 <el-option label="场地" :value="'3'"></el-option> 12 <el-option label="场地" :value="'3'"></el-option>
@@ -94,10 +94,18 @@ @@ -94,10 +94,18 @@
94 }; 94 };
95 }, 95 },
96 async created() { 96 async created() {
97 - 97 + if(this.istype) {
  98 + this.zytype = this.istype
  99 + }
98 await this.getAll() 100 await this.getAll()
99 }, 101 },
100 props: { 102 props: {
  103 + istype: {
  104 + type: String,
  105 + default: function () {
  106 + return null
  107 + }
  108 + },
101 publishStatus: { 109 publishStatus: {
102 type: String, 110 type: String,
103 default: function () { 111 default: function () {
admin-web-master/src/components/newmap/index.vue
  View file @bf5b631
@@ -195,7 +195,7 @@ @@ -195,7 +195,7 @@
195 position: absolute; 195 position: absolute;
196 top: 10px; 196 top: 10px;
197 left: 10px; 197 left: 10px;
198 - z-index: 999; 198 + z-index: 99;
199 background: #fff; 199 background: #fff;
200 padding: 10px; 200 padding: 10px;
201 border-radius: 5px; 201 border-radius: 5px;
admin-web-master/src/components/newmap/indexall.vue
  View file @bf5b631
@@ -309,7 +309,7 @@ body { @@ -309,7 +309,7 @@ body {
309 position: absolute; 309 position: absolute;
310 top: 10px; 310 top: 10px;
311 left: 10px; 311 left: 10px;
312 - z-index: 999999; 312 + z-index: 99;
313 background: #fff; 313 background: #fff;
314 padding: 10px; 314 padding: 10px;
315 border-radius: 5px; 315 border-radius: 5px;
admin-web-master/src/views/customer/yixiang/index.vue
  View file @bf5b631
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 <el-select v-model="pipeiSel.resources.cereRentalPolicies.applicableResources" 86 <el-select v-model="pipeiSel.resources.cereRentalPolicies.applicableResources"
87 placeholder="请选择" style="width: 100%;"> 87 placeholder="请选择" style="width: 100%;">
88 <el-option label="商铺" value="商铺" /> 88 <el-option label="商铺" value="商铺" />
89 - <el-option label="广告位" value="广告位" /> 89 + <el-option label="实体广告位" value="广告位" />
90 <el-option label="场地" value="场地" /> 90 <el-option label="场地" value="场地" />
91 </el-select> 91 </el-select>
92 </el-form-item> 92 </el-form-item>
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
180 180
181 </el-table> 181 </el-table>
182 182
183 - <div class="fenye"> 183 + <div class="fenye" style="padding-bottom: 30px;">
184 <el-pagination class="pagination" background :current-page="pipcurrentPage" 184 <el-pagination class="pagination" background :current-page="pipcurrentPage"
185 layout="prev, pager, next,total" :total="pipData.length" @size-change="pipSizeChange" 185 layout="prev, pager, next,total" :total="pipData.length" @size-change="pipSizeChange"
186 @current-change="pipCurrentChange" /> 186 @current-change="pipCurrentChange" />
admin-web-master/src/views/serve/Merchant/index.vue
  View file @bf5b631
@@ -38,26 +38,24 @@ @@ -38,26 +38,24 @@
38 </div> 38 </div>
39 <div style="margin-bottom: 20px;"> 39 <div style="margin-bottom: 20px;">
40 <div> 40 <div>
41 - <el-button  
42 - style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"  
43 - @click="addOpen">新增</el-button> 41 + <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
  42 + icon="el-icon-circle-plus-outline" @click="addOpen">新增</el-button>
44 </div> 43 </div>
45 </div> 44 </div>
46 <!-- 表格 --> 45 <!-- 表格 -->
47 46
48 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)" 47 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
49 - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"  
50 - > 48 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
51 <el-table-column label="序号" min-width="150"> 49 <el-table-column label="序号" min-width="150">
52 - <template slot-scope="scope">  
53 - {{scope.$index +1 }}  
54 - </template> 50 + <template slot-scope="scope">
  51 + {{scope.$index +1 }}
  52 + </template>
55 </el-table-column> 53 </el-table-column>
56 <el-table-column label="商务合作标题" min-width="150" prop="title"> 54 <el-table-column label="商务合作标题" min-width="150" prop="title">
57 </el-table-column> 55 </el-table-column>
58 <el-table-column label="场地名称" min-width="150"> 56 <el-table-column label="场地名称" min-width="150">
59 <template slot-scope="scope"> 57 <template slot-scope="scope">
60 - {{scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:'无'}} 58 + {{scope.row.cereBasicInformationVenue.venueName?scope.row.cereBasicInformationVenue.venueName:'无'}}
61 </template> 59 </template>
62 </el-table-column> 60 </el-table-column>
63 <el-table-column label="合作类型" prop="cooperationType" min-width="250"> 61 <el-table-column label="合作类型" prop="cooperationType" min-width="250">
@@ -73,9 +71,9 @@ @@ -73,9 +71,9 @@
73 71
74 72
75 <el-table-column prop="status" label="发布状态" min-width="150"> 73 <el-table-column prop="status" label="发布状态" min-width="150">
76 - <template slot-scope="scope">  
77 - {{scope.row.status=='2'?'未发布':'已发布'}}  
78 - </template> 74 + <template slot-scope="scope">
  75 + {{scope.row.status=='2'?'未发布':'已发布'}}
  76 + </template>
79 </el-table-column> 77 </el-table-column>
80 <el-table-column label="操作" min-width="300" fixed="right"> 78 <el-table-column label="操作" min-width="300" fixed="right">
81 <template slot-scope="scope"> 79 <template slot-scope="scope">
@@ -97,121 +95,113 @@ @@ -97,121 +95,113 @@
97 </div> 95 </div>
98 <!-- 详情框 --> 96 <!-- 详情框 -->
99 <div class="zhuti" v-if='detbox'> 97 <div class="zhuti" v-if='detbox'>
100 - <div style="height:58px;line-height:58px;">  
101 - <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span  
102 - style="color:#000000e6">查看</span></div>  
103 - </div>  
104 - <div style="margin-top: 30px;" class="editcss">  
105 - <div style="padding: 20px;">  
106 - <el-form :model="xiangData" ref="ruleForm" label-width="150px" class="demo-ruleForm">  
107 - <el-row :gutter="20">  
108 - <el-col :span="12">  
109 - <el-form-item label="商务合作标题" prop="title">  
110 - <div class="duiqi">{{xiangData.title}}</div>  
111 - </el-form-item>  
112 - </el-col>  
113 -  
114 - <el-col :span="12">  
115 - <el-form-item label="合作类型">  
116 - <div class="duiqi">{{xiangData.cooperationType}}</div>  
117 - </el-form-item>  
118 - </el-col>  
119 - </el-row>  
120 - <el-row :gutter="20">  
121 - <el-col :span="12">  
122 - <el-form-item label="联系人">  
123 - <div class="duiqi">{{xiangData.contactPerson}}</div>  
124 - </el-form-item>  
125 - </el-col>  
126 - <el-col :span="12">  
127 - <el-form-item label="联系电话">  
128 - <div class="duiqi">{{xiangData.contactPhone}}</div>  
129 - </el-form-item>  
130 - </el-col>  
131 - </el-row>  
132 - <el-row :gutter="20">  
133 - <el-col :span="12">  
134 - <el-form-item label="邮箱">  
135 - <div class="duiqi">{{xiangData.email}}</div>  
136 - </el-form-item>  
137 - </el-col>  
138 - </el-row>  
139 - <el-row :gutter="20">  
140 - <el-col :span="24">  
141 - <el-form-item label="内容" prop="content" tyle="width: 100%;">  
142 - <div v-html="xiangData.content" style="line-height:40px" ></div>  
143 - </el-form-item>  
144 - </el-col>  
145 -  
146 - </el-row>  
147 -  
148 - <el-row :gutter="20">  
149 - <el-col :span="24">  
150 - <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">  
151 - <div  
152 - style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">  
153 - <div>场地选择</div>  
154 - </div>  
155 - <div style="padding:20px;">  
156 - <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"  
157 - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">  
158 - <el-table-column label="序号" width="80">  
159 - <template slot-scope="scope">  
160 - {{scope.$index + 1}}  
161 - </template>  
162 - </el-table-column>  
163 -  
164 - </el-table-column>  
165 - <el-table-column label="场地名称" prop="venueName">  
166 -  
167 - </el-table-column>  
168 - <el-table-column label="所属区域" prop="district" >  
169 - </el-table-column>  
170 - <el-table-column label="场地类型" prop="venueType" > 98 + <div style="height:58px;line-height:58px;">
  99 + <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
  100 + style="color:#000000e6">查看</span></div>
  101 + </div>
  102 + <div class="editcss">
  103 + <div style="padding: 20px 20px 20px 0;">
  104 + <el-form :model="xiangData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
  105 + <el-row :gutter="20">
  106 + <el-col :span="12">
  107 + <el-form-item label="商务合作标题" prop="title">
  108 + <div class="duiqi">{{xiangData.title}}</div>
  109 + </el-form-item>
  110 + </el-col>
171 111
172 - </el-table-column>  
173 - <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip>  
174 - </el-table-column> --> 112 + <el-col :span="12">
  113 + <el-form-item label="合作类型">
  114 + <div class="duiqi">{{xiangData.cooperationType}}</div>
  115 + </el-form-item>
  116 + </el-col>
  117 + </el-row>
  118 + <el-row :gutter="20">
  119 + <el-col :span="12">
  120 + <el-form-item label="联系人">
  121 + <div class="duiqi">{{xiangData.contactPerson}}</div>
  122 + </el-form-item>
  123 + </el-col>
  124 + <el-col :span="12">
  125 + <el-form-item label="联系电话">
  126 + <div class="duiqi">{{xiangData.contactPhone}}</div>
  127 + </el-form-item>
  128 + </el-col>
  129 + </el-row>
  130 + <el-row :gutter="20">
  131 + <el-col :span="12">
  132 + <el-form-item label="邮箱">
  133 + <div class="duiqi">{{xiangData.email}}</div>
  134 + </el-form-item>
  135 + </el-col>
  136 + </el-row>
  137 + <el-row :gutter="20">
  138 + <el-col :span="24">
  139 + <el-form-item label="内容" prop="content" tyle="width: 100%;">
  140 + <div v-html="xiangData.content" style="line-height:40px"></div>
  141 + </el-form-item>
  142 + </el-col>
175 143
176 - </el-table> 144 + </el-row>
  145 + <el-row :gutter="20">
  146 + <el-col :span="24">
  147 + <el-form-item label="场地选择" prop="resourceManagement">
  148 + <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
  149 + <div style="padding: 15px;">
  150 + <div style="padding: 0px 20px 0px 0px">
  151 + <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  152 + <el-table-column label="序号" width="50">
  153 + <template slot-scope="scope">
  154 + {{scope.$index + 1}}
  155 + </template>
  156 + </el-table-column>
  157 + <el-table-column label="场地名称" prop="venueName">
  158 + </el-table-column>
  159 + <el-table-column label="所属区域" prop="district">
  160 + </el-table-column>
  161 + <el-table-column label="场地类型" prop="venueType">
  162 + </el-table-column>
  163 + </el-table>
  164 + </div>
177 </div> 165 </div>
178 </div> 166 </div>
179 - </el-col>  
180 -  
181 - </el-row>  
182 - <el-row :gutter="20">  
183 - <el-col :span="24">  
184 - <el-form-item label="往期活动展示" prop="previousEvents">  
185 - <!-- <div style="display: flex;justify-content: space-between;" > 167 + </el-form-item>
  168 + </el-col>
  169 + </el-row>
  170 + <el-row :gutter="20">
  171 + <el-col :span="24">
  172 + <el-form-item label="往期活动展示" prop="previousEvents">
  173 + <!-- <div style="display: flex;justify-content: space-between;" >
186 <el-image style="width:48%" fit="fill" :src="$baseURL+item" v-for="(item,index) in xiangData.previousEvents"></el-image> 174 <el-image style="width:48%" fit="fill" :src="$baseURL+item" v-for="(item,index) in xiangData.previousEvents"></el-image>
187 </div> --> 175 </div> -->
188 - <div style="display: flex;">  
189 - <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;"/>  
190 - </div>  
191 - </el-form-item>  
192 - </el-col>  
193 - </el-row>  
194 - <el-row :gutter="20">  
195 - <el-col :span="24">  
196 - <el-form-item label="封面图片" prop="coverImage">  
197 - <!-- <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image> -->  
198 - <div style="display: flex;">  
199 - <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;"/>  
200 - </div>  
201 - </el-form-item>  
202 - </el-col>  
203 - </el-row> 176 + <div style="display: flex;">
  177 + <allimg v-if="item" :src="item" fit="contain" v-for="item in xiangData.previousEvents"
  178 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
  179 + </div>
  180 + </el-form-item>
  181 + </el-col>
  182 + </el-row>
  183 + <el-row :gutter="20">
  184 + <el-col :span="24">
  185 + <el-form-item label="封面图片" prop="coverImage">
  186 + <!-- <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image> -->
  187 + <div style="display: flex;">
  188 + <allimg v-if="item" :src="item" fit="contain" v-for="item in xiangData.coverImage.split(',')"
  189 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
  190 + </div>
  191 + </el-form-item>
  192 + </el-col>
  193 + </el-row>
204 194
205 - </el-form>  
206 - </div>  
207 - </div>  
208 - <el-row :gutter="20">  
209 - <el-col :span="12">  
210 - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"  
211 - @click="detbox=false">取消</el-button>  
212 - </el-col>  
213 - </el-row> 195 + </el-form>
214 </div> 196 </div>
  197 + </div>
  198 + <el-row :gutter="20">
  199 + <el-col :span="12">
  200 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  201 + @click="detbox=false">取消</el-button>
  202 + </el-col>
  203 + </el-row>
  204 + </div>
215 205
216 <!-- 新增 --> 206 <!-- 新增 -->
217 <div class="zhuti" v-if="ggXin"> 207 <div class="zhuti" v-if="ggXin">
@@ -219,13 +209,13 @@ @@ -219,13 +209,13 @@
219 <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span 209 <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
220 style="color:#000000e6">{{edit?'新增':'编辑'}}</span></div> 210 style="color:#000000e6">{{edit?'新增':'编辑'}}</span></div>
221 </div> 211 </div>
222 - <div style="margin-top: 30px;"> 212 + <div style="">
223 <div style="padding: 20px 20px 20px 0;"> 213 <div style="padding: 20px 20px 20px 0;">
224 <el-form ref="AddFromOne" :model="formInline" :rules="rulesOne" label-width="150px"> 214 <el-form ref="AddFromOne" :model="formInline" :rules="rulesOne" label-width="150px">
225 <el-row :gutter="20"> 215 <el-row :gutter="20">
226 <el-col :span="12"> 216 <el-col :span="12">
227 <el-form-item label="商务合作标题" prop="title"> 217 <el-form-item label="商务合作标题" prop="title">
228 - <el-input placeholder="请输入" v-model="formInline.title" ></el-input> 218 + <el-input placeholder="请输入" v-model="formInline.title"></el-input>
229 </el-form-item> 219 </el-form-item>
230 </el-col> 220 </el-col>
231 <el-col :span="12"> 221 <el-col :span="12">
@@ -254,7 +244,7 @@ @@ -254,7 +244,7 @@
254 <el-row :gutter="20"> 244 <el-row :gutter="20">
255 <el-col :span="12"> 245 <el-col :span="12">
256 <el-form-item label="邮箱" prop="email"> 246 <el-form-item label="邮箱" prop="email">
257 - <el-input placeholder="请输入" v-model="formInline.email" ></el-input> 247 + <el-input placeholder="请输入" v-model="formInline.email"></el-input>
258 </el-form-item> 248 </el-form-item>
259 </el-col> 249 </el-col>
260 250
@@ -268,48 +258,49 @@ @@ -268,48 +258,49 @@
268 </el-row> 258 </el-row>
269 <el-row :gutter="20"> 259 <el-row :gutter="20">
270 <el-col :span="24"> 260 <el-col :span="24">
271 - <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">  
272 - <div  
273 - style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">  
274 - <div>场地选择</div>  
275 - <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true">  
276 - 添加 261 + <el-form-item label="场地选择" prop="resourceManagement">
  262 + <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
  263 + <div
  264 + style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
  265 + <div></div>
  266 + <div style="color: #3F9B6A;padding:10px;" @click="addziyuan = true">
  267 + 添加
  268 + </div>
  269 + </div>
  270 + <div style="padding: 15px;">
  271 + <div style="padding: 0px 20px 0px 0px">
  272 + <el-table :data="addziyuanData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  273 + <el-table-column label="序号" width="50">
  274 + <template slot-scope="scope">
  275 + {{scope.$index + 1}}
  276 + </template>
  277 + </el-table-column>
  278 + <el-table-column label="场地名称" prop="venueName">
  279 + </el-table-column>
  280 + <el-table-column label="所属区域" prop="district">
  281 + </el-table-column>
  282 + <el-table-column label="场地类型" prop="venueType">
  283 + </el-table-column>
  284 + <el-table-column label="操作" >
  285 + <template slot-scope="scope">
  286 + <div class="tableBtn greens" @click="handleDelete(scope.$index)">删除</div>
  287 + </template>
  288 + </el-table-column>
  289 + </el-table>
  290 + </div>
277 </div> 291 </div>
278 </div> 292 </div>
279 - <div style="padding:20px;">  
280 - <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"  
281 - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">  
282 - <el-table-column label="序号" width="80">  
283 - <template slot-scope="scope">  
284 - {{scope.$index + 1}}  
285 - </template>  
286 - </el-table-column>  
287 - <el-table-column label="场地名称" prop="venueName">  
288 - </el-table-column>  
289 - <el-table-column label="所属区域" prop="district" >  
290 - </el-table-column>  
291 - <el-table-column label="场地类型" prop="venueType" >  
292 - </el-table-column>  
293 - <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="150" show-overflow-tooltip>  
294 - </el-table-column> -->  
295 - <el-table-column label="操作" min-width="150">  
296 - <template slot-scope="scope">  
297 - <div class="tableBtn greens" @click="handleDelete(scope.$index)" >删除</div>  
298 - </template>  
299 - </el-table-column>  
300 - </el-table>  
301 - </div>  
302 - </div> 293 + </el-form-item>
  294 + </el-col>
  295 + </el-row>
  296 + <el-row :gutter="20">
  297 + <el-col :span="24">
  298 + <el-form-item label="往期活动展示" prop="previousEvents">
  299 + <upimg filePath="serve" :value="formInline.previousEvents" inputtype="previousEvents" :limit="5"
  300 + @changimg="e=>changimg(e,'previousEvents')"></upimg>
  301 + </el-form-item>
303 </el-col> 302 </el-col>
304 </el-row> 303 </el-row>
305 - <el-row :gutter="20">  
306 - <el-col :span="24">  
307 - <el-form-item label="往期活动展示" prop="previousEvents">  
308 - <upimg filePath="serve" :value="formInline.previousEvents" inputtype="previousEvents" :limit="5"  
309 - @changimg="e=>changimg(e,'previousEvents')"></upimg>  
310 - </el-form-item>  
311 - </el-col>  
312 - </el-row>  
313 <el-row :gutter="20"> 304 <el-row :gutter="20">
314 <el-col :span="24"> 305 <el-col :span="24">
315 <el-form-item label="封面图片" prop="coverImage"> 306 <el-form-item label="封面图片" prop="coverImage">
@@ -324,7 +315,8 @@ @@ -324,7 +315,8 @@
324 <el-form-item> 315 <el-form-item>
325 <div style="margin-top: 20px"> 316 <div style="margin-top: 20px">
326 <el-button class="buttonHover" 317 <el-button class="buttonHover"
327 - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="closeFn">取消</el-button> 318 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  319 + @click="closeFn">取消</el-button>
328 <el-button style="background-color: #3F9B6A;color: #fff" @click="addCheck">确 定</el-button> 320 <el-button style="background-color: #3F9B6A;color: #fff" @click="addCheck">确 定</el-button>
329 </div> 321 </div>
330 322
@@ -335,84 +327,82 @@ @@ -335,84 +327,82 @@
335 </el-form> 327 </el-form>
336 </div> 328 </div>
337 </div> 329 </div>
338 - <el-dialog :visible.sync="addziyuan" title="添加" width="70%"  
339 - append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"> 330 + <!-- <el-dialog :visible.sync="addziyuan" title="添加" width="70%" append-to-body center :close-on-click-modal="false"
  331 + :close-on-press-escape="false" :show-close="false">
340 <div style="padding: 15px;width:100%"> 332 <div style="padding: 15px;width:100%">
341 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong"> 333 <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
342 - <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;"> 334 + <div
  335 + style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
343 <div>选择场地</div> 336 <div>选择场地</div>
344 </div> 337 </div>
345 <div style="padding: 15px;"> 338 <div style="padding: 15px;">
346 <div style="padding: 0px 20px 0px 0px"> 339 <div style="padding: 0px 20px 0px 0px">
347 - <el-table :data="ziyuanData"  
348 - highlight-current-row  
349 - @row-click="handleRowClick"  
350 - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"  
351 - >  
352 -<el-table-column  
353 - label="选择"  
354 - width="55">  
355 - <template slot-scope="scope">  
356 - <el-radio v-model="selectedRow" inert :label="scope.row" >&nbsp;</el-radio>  
357 - </template>  
358 - </el-table-column>  
359 - <el-table-column label="序号" width="80"> 340 + <el-table :data="ziyuanData" highlight-current-row @row-click="handleRowClick"
  341 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  342 + <el-table-column label="选择" width="55">
  343 + <template slot-scope="scope">
  344 + <el-radio v-model="selectedRow" inert :label="scope.row">&nbsp;</el-radio>
  345 + </template>
  346 + </el-table-column>
  347 + <el-table-column label="序号" width="80">
360 <template slot-scope="scope"> 348 <template slot-scope="scope">
361 {{scope.$index + 1}} 349 {{scope.$index + 1}}
362 </template> 350 </template>
363 </el-table-column> 351 </el-table-column>
364 - <el-table-column label="场地名称" prop="venueName" > 352 + <el-table-column label="场地名称" prop="venueName">
365 353
366 - </el-table-column>  
367 - <el-table-column label="场地类型" prop="venueType"> 354 + </el-table-column>
  355 + <el-table-column label="场地类型" prop="venueType">
  356 +
  357 + </el-table-column>
  358 + <el-table-column label="所属区域" prop="district">
  359 + </el-table-column>
368 360
369 - </el-table-column>  
370 - <el-table-column label="所属区域" prop="district" >  
371 - </el-table-column>  
372 - <!-- <el-table-column label="详细位置" prop="detailedLocation" min-width="20%" show-overflow-tooltip>  
373 - </el-table-column> -->  
374 </el-table> 361 </el-table>
375 </div> 362 </div>
376 </div> 363 </div>
377 </div> 364 </div>
378 </div> 365 </div>
379 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0"> 366 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
380 - <el-button @click="mingClose" class="buttonHover"  
381 - style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消 367 + <el-button @click="mingClose" class="buttonHover"
  368 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
382 </el-button> 369 </el-button>
383 - <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定 370 + <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
384 </el-button> 371 </el-button>
385 372
386 </div> 373 </div>
387 - </el-dialog>  
388 - </div> 374 + </el-dialog> -->
  375 + </div>
  376 + <el-dialog :visible.sync="addziyuan" title="选择资源" style="padding: 0;" width="65%" append-to-body center
  377 + :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
  378 + <zy :istype="'3'" :maxSelection="1" publishStatus="2" v-if="addziyuan" @mingClose="mingClose" @minSev="minSev"></zy>
  379 +
  380 + </el-dialog>
389 </div> 381 </div>
390 382
391 383
392 </template> 384 </template>
393 385
394 <script> 386 <script>
395 - import {  
396 - async  
397 - } from 'q'  
398 - import axios from 'axios' 387 + import zy from "@/components/change/zy"
399 import wangEditor from "@/components/editor/index"; 388 import wangEditor from "@/components/editor/index";
400 import { 389 import {
401 - MerGetAll,  
402 - MerAdd,  
403 - MerEdit,  
404 - MerDel 390 + MerGetAll,
  391 + MerAdd,
  392 + MerEdit,
  393 + MerDel
405 } from '../../../api/Merchant.js' 394 } from '../../../api/Merchant.js'
406 import upimg from "@/components/ImageUpload/index" 395 import upimg from "@/components/ImageUpload/index"
407 import { 396 import {
408 - changAlls 397 + changAlls
409 } from '../../../api/information.js' 398 } from '../../../api/information.js'
410 import allimg from '@/components/chakan/allimg.vue'; 399 import allimg from '@/components/chakan/allimg.vue';
411 export default { 400 export default {
412 components: { 401 components: {
413 upimg, 402 upimg,
414 wangEditor, 403 wangEditor,
415 - allimg 404 + allimg,
  405 + zy
416 }, 406 },
417 data() { 407 data() {
418 return { 408 return {
@@ -425,38 +415,38 @@ @@ -425,38 +415,38 @@
425 pageSize: 10, 415 pageSize: 10,
426 ggXin: false, 416 ggXin: false,
427 formInline: { 417 formInline: {
428 - title:'',  
429 - venue:'',  
430 - contactPerson:'',  
431 - contactPhone:'',  
432 - cooperationType:'',  
433 - email:'',  
434 - coverImage:'',  
435 - previousEvents:'',  
436 - status:'2' 418 + title: '',
  419 + venue: '',
  420 + contactPerson: '',
  421 + contactPhone: '',
  422 + cooperationType: '',
  423 + email: '',
  424 + coverImage: '',
  425 + previousEvents: '',
  426 + status: '2'
437 }, 427 },
438 - plan_Time:[],  
439 - followUpTime:[], 428 + plan_Time: [],
  429 + followUpTime: [],
440 tableData: [], 430 tableData: [],
441 secondData: {}, 431 secondData: {},
442 pageindex: { 432 pageindex: {
443 - title:'',  
444 - venue:'',  
445 - contactPerson:'',  
446 - contactPhone:'',  
447 - cooperationType:'',  
448 - pageNumber: 0,  
449 - pageSize: 10, 433 + title: '',
  434 + venue: '',
  435 + contactPerson: '',
  436 + contactPhone: '',
  437 + cooperationType: '',
  438 + pageNumber: 0,
  439 + pageSize: 10,
450 }, 440 },
451 bianjiBox: 1, 441 bianjiBox: 1,
452 442
453 edit: true, //编辑切换 443 edit: true, //编辑切换
454 - addkehu:false,  
455 - addziyuan:false,  
456 - ziyuanData:[],//资源  
457 - addziyuanData:[],  
458 - multipleSelection:[],  
459 - xiangData:{},//详情 444 + addkehu: false,
  445 + addziyuan: false,
  446 + ziyuanData: [], //资源
  447 + addziyuanData: [],
  448 + multipleSelection: [],
  449 + xiangData: {}, //详情
460 rulesOne: { 450 rulesOne: {
461 title: [{ 451 title: [{
462 required: true, 452 required: true,
@@ -499,7 +489,7 @@ @@ -499,7 +489,7 @@
499 trigger: 'change' 489 trigger: 'change'
500 }, ], 490 }, ],
501 }, 491 },
502 - selectedRow:null 492 + selectedRow: null
503 } 493 }
504 }, 494 },
505 created() { 495 created() {
@@ -510,20 +500,20 @@ @@ -510,20 +500,20 @@
510 }, 500 },
511 methods: { 501 methods: {
512 changimg(e, type) { 502 changimg(e, type) {
513 - this.formInline[type] = e 503 + this.formInline[type] = e
514 504
515 }, 505 },
516 - addOpen(){ 506 + addOpen() {
517 this.formInline = { 507 this.formInline = {
518 - title:'',  
519 - venue:'',  
520 - contactPerson:'',  
521 - contactPhone:'',  
522 - cooperationType:'',  
523 - email:'',  
524 - coverImage:'',  
525 - previousEvents:'',  
526 - status:'2' 508 + title: '',
  509 + venue: '',
  510 + contactPerson: '',
  511 + contactPhone: '',
  512 + cooperationType: '',
  513 + email: '',
  514 + coverImage: '',
  515 + previousEvents: '',
  516 + status: '2'
527 } 517 }
528 this.addziyuanData = [] 518 this.addziyuanData = []
529 this.ggXin = true 519 this.ggXin = true
@@ -532,18 +522,18 @@ @@ -532,18 +522,18 @@
532 const res = await MerGetAll(this.pageindex) 522 const res = await MerGetAll(this.pageindex)
533 this.tableData = res.data.content 523 this.tableData = res.data.content
534 this.total = res.data.content.length 524 this.total = res.data.content.length
535 - const ziyuan = await changAlls(this.pageindex) 525 + const ziyuan = await changAlls(this.pageindex)
536 this.ziyuanData = [...ziyuan.data.content] 526 this.ziyuanData = [...ziyuan.data.content]
537 }, 527 },
538 528
539 // 新增确定按钮 529 // 新增确定按钮
540 - addCheck(val) {  
541 - if(this.addziyuanData.length !=0){  
542 - this.formInline.venue = this.addziyuanData.map(item => item.id).join(',');  
543 - }else{  
544 - this.formInline.venue ='' 530 + addCheck(val) {
  531 + if (this.addziyuanData.length != 0) {
  532 + this.formInline.venue = this.addziyuanData.map(item => item.id).join(',');
  533 + } else {
  534 + this.formInline.venue = ''
545 } 535 }
546 - if(this.formInline.content == '<p> </p>' || this.formInline.content == '<p><br></p>'){ 536 + if (this.formInline.content == '<p> </p>' || this.formInline.content == '<p><br></p>') {
547 this.$message({ 537 this.$message({
548 message: '请填写完整信息', 538 message: '请填写完整信息',
549 type: 'error' 539 type: 'error'
@@ -551,27 +541,27 @@ @@ -551,27 +541,27 @@
551 return 541 return
552 } 542 }
553 this.$refs.AddFromOne.validate((valid) => { 543 this.$refs.AddFromOne.validate((valid) => {
554 - if (valid) {  
555 - this.formInline.createTime = this.currentTime()  
556 - if(this.edit){  
557 - MerAdd(this.formInline).then(res=>{  
558 - this.ggXin = false  
559 - this.addziyuanData = []  
560 - this.getAll()  
561 - })  
562 - }else{  
563 -  
564 - if(this.formInline.previousEvents !=''&& typeof this.formInline.previousEvents != 'string'){  
565 - this.formInline.previousEvents = this.formInline.previousEvents.join(',')  
566 - }  
567 - MerEdit(this.formInline).then(res=>{  
568 - this.ggXin = false  
569 - this.addziyuanData = []  
570 - this.getAll()  
571 - }) 544 + if (valid) {
  545 + this.formInline.createTime = this.currentTime()
  546 + if (this.edit) {
  547 + MerAdd(this.formInline).then(res => {
  548 + this.ggXin = false
  549 + this.addziyuanData = []
  550 + this.getAll()
  551 + })
  552 + } else {
  553 +
  554 + if (this.formInline.previousEvents != '' && typeof this.formInline.previousEvents != 'string') {
  555 + this.formInline.previousEvents = this.formInline.previousEvents.join(',')
572 } 556 }
573 - this.selectedRow = null  
574 - }else { 557 + MerEdit(this.formInline).then(res => {
  558 + this.ggXin = false
  559 + this.addziyuanData = []
  560 + this.getAll()
  561 + })
  562 + }
  563 + this.selectedRow = null
  564 + } else {
575 this.$message({ 565 this.$message({
576 message: '请填写完整信息', 566 message: '请填写完整信息',
577 type: 'error' 567 type: 'error'
@@ -602,38 +592,38 @@ @@ -602,38 +592,38 @@
602 }, 592 },
603 593
604 //详情 594 //详情
605 - details(item) {  
606 - this.addziyuanData = [] 595 + details(item) {
  596 + this.addziyuanData = []
607 this.edit = true 597 this.edit = true
608 this.xiangData = item 598 this.xiangData = item
609 599
610 if (typeof item.previousEvents === 'string') { 600 if (typeof item.previousEvents === 'string') {
611 this.xiangData.previousEvents = item.previousEvents.split(','); 601 this.xiangData.previousEvents = item.previousEvents.split(',');
612 -} 602 + }
613 603
614 - if(item.venue!=''){  
615 - let ids = []  
616 - ids = item.venue.split(',')  
617 - ids.map(res => {  
618 - changAlls({  
619 - id: res,  
620 - pageNumber: 0,  
621 - pageSize: 10,  
622 - }).then(item => { 604 + if (item.venue != '') {
  605 + let ids = []
  606 + ids = item.venue.split(',')
  607 + ids.map(res => {
  608 + changAlls({
  609 + id: res,
  610 + pageNumber: 0,
  611 + pageSize: 10,
  612 + }).then(item => {
623 613
624 - item.data.content.map(ids => {  
625 - this.addziyuanData.push(ids)  
626 - }) 614 + item.data.content.map(ids => {
  615 + this.addziyuanData.push(ids)
  616 + })
627 617
628 - })  
629 - }) 618 + })
  619 + })
630 620
631 - } 621 + }
632 622
633 this.detbox = true 623 this.detbox = true
634 }, 624 },
635 - async addbuss() {  
636 - await MerEdit(this.xiangData) 625 + async addbuss() {
  626 + await MerEdit(this.xiangData)
637 this.detbox = false 627 this.detbox = false
638 this.getAll() 628 this.getAll()
639 // this.ggXin = true 629 // this.ggXin = true
@@ -647,10 +637,10 @@ @@ -647,10 +637,10 @@
647 }, 637 },
648 638
649 closeFn(val) { 639 closeFn(val) {
650 - this.addziyuanData =[] 640 + this.addziyuanData = []
651 this.getAll() 641 this.getAll()
652 - this.ggXin = false  
653 - this.selectedRow = null 642 + this.ggXin = false
  643 + this.selectedRow = null
654 644
655 }, 645 },
656 //查看合同 646 //查看合同
@@ -658,119 +648,125 @@ @@ -658,119 +648,125 @@
658 this.hetongBox = true 648 this.hetongBox = true
659 }, 649 },
660 // 查询按钮 650 // 查询按钮
661 - onSubmit() {  
662 - this.getAll() 651 + onSubmit() {
  652 + this.getAll()
663 }, 653 },
664 //重置按钮 654 //重置按钮
665 resetting() { 655 resetting() {
666 - this.pageindex={  
667 - title:'',  
668 - venue:'',  
669 - contactPerson:'',  
670 - contactPhone:'',  
671 - cooperationType:'',  
672 - pageNumber: 0,  
673 - pageSize: 10,  
674 - }  
675 - this.getAll() 656 + this.pageindex = {
  657 + title: '',
  658 + venue: '',
  659 + contactPerson: '',
  660 + contactPhone: '',
  661 + cooperationType: '',
  662 + pageNumber: 0,
  663 + pageSize: 10,
  664 + }
  665 + this.getAll()
676 }, 666 },
677 - zhongzhi(item){  
678 - this.edit = false  
679 - this.formInline = item  
680 - this.addziyuanData =[]  
681 - if(item.venue!=''){  
682 - let ids = []  
683 - ids = item.venue.split(',')  
684 - ids.map(res => {  
685 - changAlls({  
686 - id: res,  
687 - pageNumber: 0,  
688 - pageSize: 10,  
689 - }).then(item => {  
690 -  
691 - item.data.content.map(ids => {  
692 - this.addziyuanData.push(ids)  
693 - this.selectedRow = ids  
694 - }) 667 + zhongzhi(item) {
  668 + this.edit = false
  669 + this.formInline = item
  670 + this.addziyuanData = []
  671 + if (item.venue != '') {
  672 + let ids = []
  673 + ids = item.venue.split(',')
  674 + ids.map(res => {
  675 + changAlls({
  676 + id: res,
  677 + pageNumber: 0,
  678 + pageSize: 10,
  679 + }).then(item => {
  680 +
  681 + item.data.content.map(ids => {
  682 + this.addziyuanData.push(ids)
  683 + this.selectedRow = ids
  684 + })
695 685
696 - })  
697 - }) 686 + })
  687 + })
698 688
699 - }  
700 - this.ggXin = true 689 + }
  690 + this.ggXin = true
701 691
702 }, 692 },
703 - minSev() {  
704 -this.addziyuanData = []  
705 -this.addziyuanData.push(this.selectedRow)  
706 - this.addziyuan = false  
707 - this.multipleSelection = []  
708 - this.selectedRow = null 693 + minSev(e) {
  694 + console.log(e)
  695 + this.addziyuanData = []
  696 + this.addziyuanData = e
  697 + this.addziyuan = false
  698 + this.multipleSelection = []
  699 + this.selectedRow = null
709 }, 700 },
710 - mingClose(){  
711 - this.multipleSelection =[] 701 + mingClose() {
  702 + this.multipleSelection = []
712 this.addziyuan = false 703 this.addziyuan = false
713 this.selectedRow = null 704 this.selectedRow = null
714 }, 705 },
715 handleRowClick(row) { 706 handleRowClick(row) {
716 - this.selectedRow = row; // 点击行时选中对应的单选框  
717 - },  
718 - deltab(item){  
719 - const h = this.$createElement;  
720 - this.$msgbox({  
721 - title: '消息',  
722 - message: h('p', null, [  
723 - h('span', null, '是否删除 '),  
724 - ]),  
725 - showCancelButton: true,  
726 - showClose:false,  
727 - confirmButtonText: '确定',  
728 - cancelButtonText: '取消',  
729 - customClass:'oe-dialog-btn',  
730 - beforeClose: (action, instance, done) => {  
731 - if (action === 'confirm') {  
732 - MerDel({id:item.id}).then(res=>{  
733 - this.$message({  
734 - message: '删除成功',  
735 - type: 'success'  
736 - })  
737 - this.getAll()  
738 - done();  
739 - })  
740 - } else {  
741 - done();  
742 - } 707 + this.selectedRow = row; // 点击行时选中对应的单选框
  708 + },
  709 + deltab(item) {
  710 + const h = this.$createElement;
  711 + this.$msgbox({
  712 + title: '消息',
  713 + message: h('p', null, [
  714 + h('span', null, '是否删除 '),
  715 + ]),
  716 + showCancelButton: true,
  717 + showClose: false,
  718 + confirmButtonText: '确定',
  719 + cancelButtonText: '取消',
  720 + customClass: 'oe-dialog-btn',
  721 + beforeClose: (action, instance, done) => {
  722 + if (action === 'confirm') {
  723 + MerDel({
  724 + id: item.id
  725 + }).then(res => {
  726 + this.$message({
  727 + message: '删除成功',
  728 + type: 'success'
  729 + })
  730 + this.getAll()
  731 + done();
  732 + })
  733 + } else {
  734 + done();
  735 + }
743 } 736 }
744 - }) 737 + })
745 }, 738 },
746 - fabu(item,val){ 739 + fabu(item, val) {
747 const h = this.$createElement; 740 const h = this.$createElement;
748 - this.$msgbox({  
749 - title: '消息',  
750 - message: h('p', null, [  
751 - h('span', null, '是否处理'),  
752 - ]),  
753 - showCancelButton: true,  
754 - showClose:false,  
755 - confirmButtonText: '确定',  
756 - cancelButtonText: '取消',  
757 - customClass:'oe-dialog-btn',  
758 - beforeClose: (action, instance, done) => {  
759 - if (action === 'confirm') {  
760 - MerEdit({id:item.id,status:val}).then(res=>{  
761 - this.getAll()  
762 - done();  
763 - })  
764 - } else {  
765 - done();  
766 - }  
767 - } 741 + this.$msgbox({
  742 + title: '消息',
  743 + message: h('p', null, [
  744 + h('span', null, '是否处理'),
  745 + ]),
  746 + showCancelButton: true,
  747 + showClose: false,
  748 + confirmButtonText: '确定',
  749 + cancelButtonText: '取消',
  750 + customClass: 'oe-dialog-btn',
  751 + beforeClose: (action, instance, done) => {
  752 + if (action === 'confirm') {
  753 + MerEdit({
  754 + id: item.id,
  755 + status: val
  756 + }).then(res => {
  757 + this.getAll()
  758 + done();
  759 + })
  760 + } else {
  761 + done();
  762 + }
  763 + }
768 }) 764 })
769 765
770 }, 766 },
771 - handleDelete(index){  
772 - this.addziyuanData.splice(index, 1)  
773 - this.selectedRow = null 767 + handleDelete(index) {
  768 + this.addziyuanData.splice(index, 1)
  769 + this.selectedRow = null
774 } 770 }
775 } 771 }
776 } 772 }
@@ -783,7 +779,6 @@ this.addziyuanData.push(this.selectedRow) @@ -783,7 +779,6 @@ this.addziyuanData.push(this.selectedRow)
783 background-color: #Fff; 779 background-color: #Fff;
784 780
785 } 781 }
786 -  
787 .chengeXia { 782 .chengeXia {
788 border-bottom: 6px solid #3F9B6A; 783 border-bottom: 6px solid #3F9B6A;
789 padding-bottom: 4px; 784 padding-bottom: 4px;
@@ -791,52 +786,15 @@ this.addziyuanData.push(this.selectedRow) @@ -791,52 +786,15 @@ this.addziyuanData.push(this.selectedRow)
791 } 786 }
792 787
793 788
794 -  
795 - .tableBtn {  
796 - display: inline-block;  
797 - margin-right: 10px;  
798 - color: #ACACAC;  
799 - }  
800 -  
801 .formSearch { 789 .formSearch {
802 display: flex; 790 display: flex;
803 width: 100%; 791 width: 100%;
804 font-size: 14px; 792 font-size: 14px;
805 justify-content: space-between; 793 justify-content: space-between;
806 } 794 }
807 -  
808 .greens { 795 .greens {
809 color: #3F9B6A; 796 color: #3F9B6A;
810 } 797 }
811 -  
812 - /deep/ .el-table__row {  
813 - font-size: 14px;  
814 - color: #000000e6;  
815 - height: 42px;  
816 - }  
817 -  
818 - .fenye {  
819 - margin-top: 20px;  
820 - display: flex;  
821 - justify-content: flex-end;  
822 - }  
823 -  
824 - /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {  
825 - background-color: #3F9B6A;  
826 - }  
827 -  
828 - .el-row {  
829 - margin-bottom: 20px;  
830 -  
831 - &:last-child {  
832 - margin-bottom: 0;  
833 - }  
834 - }  
835 -  
836 - .el-col {  
837 - border-radius: 4px;  
838 - }  
839 -  
840 .bg-purple-dark { 798 .bg-purple-dark {
841 background: #99a9bf; 799 background: #99a9bf;
842 } 800 }
@@ -848,207 +806,18 @@ this.addziyuanData.push(this.selectedRow) @@ -848,207 +806,18 @@ this.addziyuanData.push(this.selectedRow)
848 .bg-purple-light { 806 .bg-purple-light {
849 background: #e5e9f2; 807 background: #e5e9f2;
850 } 808 }
851 -  
852 .grid-content { 809 .grid-content {
853 border-radius: 4px; 810 border-radius: 4px;
854 min-height: 36px; 811 min-height: 36px;
855 } 812 }
856 813
857 - .row-bg {  
858 - padding: 10px 0;  
859 - background-color: #f9fafc;  
860 - }  
861 -  
862 - /deep/ .bg-purple[data-v-0e3fe4ec] {  
863 - background: #fff;  
864 - height: 50px;  
865 - }  
866 -  
867 - /deep/ .bg-purple[data-v-3bebae82] {  
868 - background: #fff;  
869 - height: 50px;  
870 - }  
871 -  
872 - ::v-deep .bg-purple {  
873 - background: #fff;  
874 - height: 50px;  
875 - }  
876 -  
877 -  
878 -  
879 - ::v-deep .el-form-item {  
880 - margin-bottom: 16px;  
881 - }  
882 -  
883 - .device-form .el-form-item__label::after {  
884 - content: "*";  
885 - color: #1A1A1A;  
886 - margin-left: 5px;  
887 - font-size: 16px;  
888 - }  
889 -  
890 -  
891 - ::v-deep .el-dialog__wrapper {  
892 - .el-dialog__header {  
893 - background-color: #FAFAFA;  
894 - }  
895 - }  
896 -  
897 - ::v-deep .el-input__inner:focus {  
898 - border: #3F9B6A 1px solid;  
899 - }  
900 -  
901 - .dialog-footer {  
902 - display: flex;  
903 - justify-content: flex-end;  
904 - border-top: solid rgba(209, 209, 209, 0.2) 2px;  
905 - padding-top: 20px;  
906 - }  
907 -  
908 - ::v-deep .el-input__inner:focus {  
909 - border: #3F9B6A 1px solid;  
910 - }  
911 -  
912 - ::v-deep .el-input__inner:hover {  
913 - border: #3F9B6A 1px solid;  
914 - }  
915 -  
916 - ::v-deep .el-select .el-input.is-focus .el-input__inner {  
917 - border-color: #3F9B6A  
918 - }  
919 -  
920 - .el-select-dropdown__item.selected {  
921 - color: #3F9B6A;  
922 - }  
923 -  
924 - .el-pagination__sizes .el-input .el-input__inner:hover {  
925 - border-color: #3F9B6A;  
926 - }  
927 -  
928 - ::v-deep .el-dialog__wrapper {  
929 -  
930 - .dialog_css {  
931 - margin-right: 12px;  
932 - margin-top: 61px !important;  
933 -  
934 - .el-dialog__title {  
935 - font-size: 16px !important;  
936 - font-weight: 600;  
937 - color: #000;  
938 - }  
939 - }  
940 -  
941 - .diaslog_zhong {  
942 - margin-left: 25%;  
943 - margin-top: 61px !important;  
944 - }  
945 -  
946 - }  
947 -  
948 - ::v-deep .diaslog_zhong {  
949 - margin-left: 20%;  
950 - margin-top: 61px !important;  
951 -  
952 - .el-dialog__header {  
953 - background-color: #fff;  
954 - border-bottom: 1px solid #EFEFEF;  
955 -  
956 - .el-dialog__title {  
957 - font-size: 14px;  
958 - color: #000000e6;  
959 - }  
960 - }  
961 -  
962 - .el-dialog__body {  
963 - padding: 10px 30px 30px 20px  
964 - }  
965 - }  
966 -  
967 - /deep/ .el-table_1_column_8 .hetong {  
968 - color: #7DBB9A;  
969 - text-decoration: underline;  
970 - }  
971 -  
972 - /deep/ .first-column-bg {  
973 - background-color: #FAFAFA !important;  
974 - }  
975 -  
976 - ::v-deep .textarea {  
977 - width: 85%;  
978 -  
979 - .el-textarea__inner {  
980 - width: 100%;  
981 - }  
982 - }  
983 -  
984 - ::v-deep .pass_input {  
985 - width: 100%;  
986 -  
987 - .el-input__inner {  
988 - border: none;  
989 - padding: 0;  
990 - }  
991 - }  
992 -  
993 - ::v-deep .pass_select {  
994 - width: 100%;  
995 -  
996 - .el-input__inner {  
997 - border: none;  
998 - padding: 0;  
999 - }  
1000 -  
1001 - .el-icon-arrow-up:before {  
1002 - content: ''  
1003 - }  
1004 -  
1005 - }  
1006 -  
1007 - /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {  
1008 - background-color: #fff;  
1009 - }  
1010 </style> 814 </style>
1011 <style lang="scss" scoped> 815 <style lang="scss" scoped>
1012 - ::v-deep .bian_css {  
1013 - .el-dialog__header {  
1014 - padding: 0px;  
1015 - }  
1016 -  
1017 - .el-input__inner {  
1018 - height: 18px;  
1019 - border: 0px;  
1020 - margin-top: 0px;  
1021 - }  
1022 -  
1023 - .el-input__inner:hover {  
1024 - border: 0px;  
1025 - }  
1026 -  
1027 - .el-input__inner:focus {  
1028 - border: 0px;  
1029 - }  
1030 - }  
1031 -  
1032 - ::v-deep .buttonHover:hover {  
1033 - color: #3f9b6a !important;  
1034 - border-color: #c5e1d2 !important;  
1035 - background-color: #ecf5f0 !important;  
1036 - outline: none;  
1037 - }  
1038 -  
1039 - ::v-deep .el-pagination__total {  
1040 - position: absolute;  
1041 - left: 33px; 816 + ::v-deep .el-dialog__body {
  817 + padding: 0 0 !important;
1042 } 818 }
1043 -  
1044 - ::v-deep .diaslog_zhong {  
1045 - .el-dialog__body {  
1046 - padding: 10px 20px 20px 20px;  
1047 - }  
1048 -  
1049 - .el-upload--picture-card {  
1050 - width: 130px;  
1051 - height: 130px;  
1052 - } 819 + .el-dialog__header{
  820 + padding: 0;
  821 + display: none;
1053 } 822 }
1054 </style> 823 </style>
lvdao-miniapp/pages/my/my.vue
  View file @bf5b631
@@ -23,8 +23,8 @@ @@ -23,8 +23,8 @@
23 <image :src="user.avatar?user.avatar:$imgUrl('/img/head.jpg')" v-else></image> 23 <image :src="user.avatar?user.avatar:$imgUrl('/img/head.jpg')" v-else></image>
24 </view> 24 </view>
25 <view class="info"> 25 <view class="info">
26 - <view class="nickname">  
27 - <text style="width: 100%;" v-if="!user.name" @click="gopath('/pages/login/login')">请登录</text> 26 + <view class="nickname" @click="!user.name?gopath('/pages/login/login'):''">
  27 + <text style="width: 100%;" v-if="!user.name" >请登录</text>
28 <text v-else>{{user.name}}</text> 28 <text v-else>{{user.name}}</text>
29 </view> 29 </view>
30 </view> 30 </view>