webapp / GreenwayWeb

Commit cfe2752f7ce2a66dd83ba4b5b4cfb91429622780

Authored by 杨鑫
1 parent 3a43fea4

最新

Inline Side-by-side
Showing 28 changed files with 606 additions and 86 deletions
admin-web-master/src/api/newly.js
  View file @cfe2752
... ... @@ -405,6 +405,14 @@ export function cerePlatformMerchantadd(data) {
405 405 data
406 406 })
407 407 }
  408 +// 绑定添加
  409 +export function bamngdingAdd(data) {
  410 + return request({
  411 + url: '/cerePlatformMerchant/addAgain',
  412 + method: 'post',
  413 + data
  414 + })
  415 +}
408 416 // 详情
409 417 export function cerePlatformMerchantinfo(data) {
410 418 return request({
... ...
admin-web-master/src/components/add/addss.vue
  View file @cfe2752
... ... @@ -3,7 +3,7 @@
3 3 <el-form :model="formInline" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm">
4 4  
5 5 <el-form-item label="用户名" prop="username">
6   - <el-input v-model="formInline.username" placeholder="请输入"></el-input>
  6 + <el-input v-model="formInline.username" placeholder="请输入" :disabled="this.moren==1?true:false"></el-input>
7 7 </el-form-item>
8 8  
9 9 <el-form-item label="姓名" prop="name">
... ... @@ -12,7 +12,7 @@
12 12  
13 13  
14 14 <el-form-item label="手机号" prop="phone">
15   - <el-input v-model="formInline.phone" maxlength="11" placeholder="请输入"></el-input>
  15 + <el-input v-model="formInline.phone" maxlength="11" placeholder="请输入" :disabled="this.moren==1?true:false"></el-input>
16 16 </el-form-item>
17 17  
18 18 <el-form-item label="性别" prop="sex">
... ... @@ -94,7 +94,7 @@
94 94 import {
95 95 cerePlatformMerchantadd,
96 96 cerePlatformMerchantedit,
97   -
  97 + bamngdingAdd
98 98 } from '@/api/newly.js'
99 99  
100 100 export default {
... ... @@ -198,6 +198,7 @@
198 198 info: {
199 199 immediate: true,
200 200 handler(newVal) {
  201 + console.log(newVal,'newVal')
201 202 if (Object.keys(newVal).length > 0) {
202 203 this.formInline = newVal
203 204 this.moren = 1
... ... @@ -240,7 +241,6 @@
240 241 ...this.formInline,
241 242 checkState: '2',
242 243 state:'1',
243   - flag:false,
244 244 applyTime: this.updateCurrentTime()
245 245 }).then(res => {
246 246 if (res.code == 200 && res.message !='手机号已被注册') {
... ... @@ -250,21 +250,32 @@
250 250 })
251 251 this.$emit('removeonaction', '1')
252 252 } else if(res.code == 200 && res.message =='手机号已被注册'){
253   - cerePlatformMerchantadd({
254   - ...this.formInline,
255   - checkState: '2',
256   - state:'1',
257   - flag:false,
258   - applyTime: this.updateCurrentTime()
259   - }).then(res => {
260   - if (res.code == 200) {
261   - this.$message({
262   - message: '添加成功',
263   - type: 'success'
264   - })
265   - this.$emit('removeonaction', '1')
266   - }
267   - })
  253 + this.$confirm('是否绑定线上商家？', '提示', {
  254 + confirmButtonText: '确定',
  255 + cancelButtonText: '取消',
  256 + type: 'warning'
  257 + }).then(() => {
  258 + bamngdingAdd({
  259 + ...this.formInline,
  260 + checkState: '2',
  261 + state: '1',
  262 + applyTime: this.updateCurrentTime()
  263 + }).then(response => {
  264 + if (response.code == '200') {
  265 + this.$message({
  266 + message: '绑定成功',
  267 + type: 'success'
  268 + });
  269 + this.$emit('removeonaction', '1');
  270 + }
  271 + })
  272 + }).catch(() => {
  273 + // 用户点击取消，不做任何操作
  274 + this.$message({
  275 + message: '已取消绑定',
  276 + type: 'info'
  277 + });
  278 + });
268 279 }else {
269 280 this.$message({
270 281 message: res.msg,
... ...
admin-web-master/src/components/add/addyixiang.vue
  View file @cfe2752
... ... @@ -218,7 +218,7 @@
218 218 </el-col>
219 219 <el-col :span="8">
220 220 <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
221   - <div class="duiqi">{{info.cereBasicInformationShop.belongingGreenwaySection || '无'}}</div>
  221 + <div class="duiqi">{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection)|| '无'}}</div>
222 222 </el-form-item>
223 223 </el-col>
224 224 <el-col :span="8">
... ... @@ -282,7 +282,7 @@
282 282 <!-- <img v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
283 283 </el-form-item>
284 284 <el-form-item label="其他视频" prop="otherImageVideos" >
285   - <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile($baseURL+info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div>
  285 + <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile(info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div>
286 286 <!-- <div class="duiqi" v-for="item in info.cereBasicInformationShop.otherImageVideos.split(',')">{{$baseURL+item}}</div> -->
287 287 </el-form-item>
288 288 </el-form>
... ... @@ -369,7 +369,7 @@
369 369 </div>
370 370 </el-form-item>
371 371 <el-form-item label="其他视频" prop="otherImageVideos" >
372   - <div class="duiqi" :class="info.cereBasicInformationVenue.otherImageVideos?'greens':''" @click ="info.cereBasicInformationVenue.otherImageVideos?openfile($baseURL+info.cereBasicInformationVenue.otherImageVideos):''">{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}</div>
  372 + <div class="duiqi" :class="info.cereBasicInformationVenue.otherImageVideos?'greens':''" @click ="info.cereBasicInformationVenue.otherImageVideos?openfile(info.cereBasicInformationVenue.otherImageVideos):''">{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}</div>
373 373 </el-form-item>
374 374 </el-form>
375 375 </div>
... ... @@ -438,6 +438,11 @@
438 438 import newmap from "@/components/newmap/index";
439 439 import indexall from "@/components/newmap/indexall";
440 440 import { icManAdd} from '@/api/icManagement';
  441 + import {
  442 + gongyuan,
  443 + parkTrails,
  444 + lvdaoduan,
  445 + } from '@/api/information.js';
441 446 export default {
442 447 components: {
443 448 TitleWithCircle,
... ... @@ -482,7 +487,8 @@
482 487 checkState:'2',
483 488 phone: '',
484 489 },
485   - shopMsg:{}
  490 + shopMsg:{},
  491 + lvdaoList:[]
486 492 }
487 493 },
488 494 created() {
... ... @@ -494,6 +500,7 @@
494 500 if (this.info.cereAdvertisingInformation) {
495 501 this.ontype = this.info.cereAdvertisingInformation.advertisingType
496 502 }
  503 + this.getAll()
497 504 },
498 505 computed: {
499 506  
... ... @@ -594,6 +601,30 @@
594 601 closeFn() {
595 602 this.$emit('change', false);
596 603 },
  604 + async getAll(){
  605 + const lvdao = await lvdaoduan()
  606 + const gongyua = await parkTrails()
  607 + const budao = await gongyuan()
  608 + const lvList = lvdao.data.concat(gongyua.data)
  609 +
  610 + this.lvdaoList = lvList.concat(budao.data)
  611 + },
  612 + getLvdaoNameByCode(code) {
  613 + // 若传入的 code 为空，直接返回空字符串
  614 + if (!code) {
  615 + return '';
  616 + }
  617 + // 遍历 this.lvdaoList 数组
  618 + for (let i = 0; i < this.lvdaoList.length; i++) {
  619 + const item = this.lvdaoList[i];
  620 + // 当传入的 code 等于 item 的 code 时，返回 item 的 name
  621 + if (item.code === code) {
  622 + return item.name;
  623 + }
  624 + }
  625 + // 若遍历完数组都没找到匹配的 code，返回空字符串
  626 + return '无';
  627 + },
597 628 }
598 629 }
599 630 </script>
... ...
admin-web-master/src/components/chakan/cd.vue
  View file @cfe2752
... ... @@ -95,8 +95,9 @@
95 95 <allimg v-if="item" :src="item" fit="contain" v-for="item in editbgid.displayImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
96 96 </div>
97 97 </el-form-item>
98   - <el-form-item label="其他视频" prop="otherImageVideos" >
99   - <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
  98 + <el-form-item label="其他视频" prop="otherMedia" >
  99 + <!-- <div class="duiqi" :class="editbgid.otherImageVideos?'greens':editbgid.otherMedia?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):editbgid.otherMedia?:openfile($baseURL+editbgid.otherMedia)''">{{editbgid.otherImageVideos||editbgid.otherMedia?'查看详情':'无'}}</div> -->
  100 + <div class="duiqi" :class="editbgid.otherMedia?'greens':''" @click ="editbgid.otherMedia?openfile($baseURL+editbgid.otherMedia):''">{{editbgid.otherMedia?'查看详情':'无'}}</div>
100 101 </el-form-item>
101 102 </el-form>
102 103 </div>
... ...
admin-web-master/src/utils/request.js
  View file @cfe2752
... ... @@ -17,12 +17,12 @@ let baseURL = &#39;&#39;
17 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18  
19 19 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
20   - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
  20 + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21  
22 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23  
24 24  
25   - // baseURL = 'http://192.168.2.227:9003';
  25 + baseURL = 'http://128.10.249.25:9003';
26 26  
27 27  
28 28 } else {
... ...
admin-web-master/src/views/business/businessList/index.vue
  View file @cfe2752
... ... @@ -128,7 +128,7 @@
128 128 </el-dialog>
129 129 <div class="zhuti" v-if="onaction == '2'">
130 130 <div style="height:58px;line-height:58px;">
131   - <div style="color:#0006"> <span>合同管理</span> <span style="padding:0 5px;">></span> <span
  131 + <div style="color:#0006"> <span>商家信息管理</span> <span style="padding:0 5px;">></span> <span
132 132 style="color:#000000e6">新增</span></div>
133 133 </div>
134 134  
... ... @@ -152,7 +152,7 @@
152 152 </div>
153 153 <div class="zhuti" v-if="onaction == '4'">
154 154 <div style="height:58px;line-height:58px;">
155   - <div style="color:#0006"> <span>合同管理</span> <span style="padding:0 5px;">></span> <span
  155 + <div style="color:#0006"> <span>商家信息管理</span> <span style="padding:0 5px;">></span> <span
156 156 style="color:#000000e6">编辑</span></div>
157 157 </div>
158 158  
... ...
admin-web-master/src/views/customer/icReview/index.vue
  View file @cfe2752
... ... @@ -108,7 +108,7 @@
108 108  
109 109 <div class="zhuti" v-if="onaction == '2'">
110 110 <div style="height:58px;line-height:58px;">
111   - <div style="color:#0006"> <span>招商租赁审核</span> <span style="padding:0 5px;">></span> <span
  111 + <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
112 112 style="color:#000000e6">新增</span></div>
113 113 </div>
114 114  
... ... @@ -118,7 +118,7 @@
118 118 </div>
119 119 <div class="zhuti" v-if="onaction == '3'">
120 120 <div style="height:58px;line-height:58px;">
121   - <div style="color:#0006"> <span>招商租赁审核</span> <span style="padding:0 5px;">></span> <span
  121 + <div style="color:#0006"> <span>商户意向管理</span> <span style="padding:0 5px;">></span> <span
122 122 style="color:#000000e6">{{onindex=='1'?'查看':'审核'}}</span></div>
123 123 </div>
124 124 <div>
... ...
admin-web-master/src/views/customer/rUser/index.vue
  View file @cfe2752
... ... @@ -294,8 +294,10 @@ import merchantInformation from &#39;../../../components/merchantInformation/index.v
294 294 if (valid) {
295 295 this.ruleForm.id = this.secondData.id
296 296 cerePlatformMerchantedit(this.ruleForm)
297   - this.ggXin = false
298   - this.getAll()
  297 + this.$message({
  298 + message: '修改成功',
  299 + type: 'success'
  300 + })
299 301 }else{
300 302 this.$message({
301 303 message: '请填写完整信息',
... ... @@ -303,7 +305,9 @@ import merchantInformation from &#39;../../../components/merchantInformation/index.v
303 305 })
304 306  
305 307 }
306   - })
  308 + })
  309 + this.getAll()
  310 + this.ggXin = false
307 311 },
308 312 handleCurrentChange(val) {
309 313 this.pageindex.pageNumber = val - 1
... ... @@ -341,6 +345,10 @@ import merchantInformation from &#39;../../../components/merchantInformation/index.v
341 345 beforeClose: (action, instance, done) => {
342 346 if (action === 'confirm') {
343 347 cerePlatformMerchantedit({id:ids,isBlackList:num}).then(res=>{
  348 + this.$message({
  349 + message: '修改成功',
  350 + type: 'success'
  351 + })
344 352 this.getAll()
345 353 done();
346 354 })
... ...
admin-web-master/src/views/customer/rsaManagement/index.vue
  View file @cfe2752
... ... @@ -257,11 +257,11 @@
257 257 <div class="duiqi">{{secondData.idCardNumber}}</div>
258 258 </el-form-item>
259 259 </el-col>
260   - <el-col :span="12">
  260 + <!-- <el-col :span="12">
261 261 <el-form-item label="身份证有效期">
262 262 <div class="duiqi">{{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}</div>
263 263 </el-form-item>
264   - </el-col>
  264 + </el-col> -->
265 265 </el-row>
266 266 <el-row :gutter="20">
267 267 <el-col :span="12">
... ... @@ -355,7 +355,7 @@
355 355 </el-col>
356 356 <el-col :span="12">
357 357 <el-form-item label="手机号" prop="phone">
358   - <el-input v-model.number="ruleForm.phone" placeholder="请输入" />
  358 + <el-input v-model.number="ruleForm.phone" placeholder="请输入" :disabled="edit==false?true:false"/>
359 359 </el-form-item>
360 360 </el-col>
361 361 </el-row>
... ... @@ -366,13 +366,13 @@
366 366 <el-input v-model="ruleForm.idCardNumber" placeholder="请输入" />
367 367 </el-form-item>
368 368 </el-col>
369   - <el-col :span="12">
  369 + <!-- <el-col :span="12">
370 370 <el-form-item label="身份证有效期" prop="idCardValidStart">
371 371 <el-date-picker v-model="ruleForm.idTime" type="daterange" range-separator="至"
372 372 start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" style="width:100%"
373   - @change="idCardchange" />
  373 + @change="idCardchange" @blur="blur" />
374 374 </el-form-item>
375   - </el-col>
  375 + </el-col> -->
376 376 </el-row>
377 377 <el-row :gutter="20">
378 378 <el-col :span="12">
... ... @@ -561,11 +561,11 @@
561 561 message: '手机号只能包含数字',
562 562 trigger: 'blur',
563 563 }],
564   - idCardValidStart: [{
565   - required: true,
566   - message: '请选择身份证有效时间',
567   - trigger: 'change'
568   - }, ],
  564 + // idCardValidStart: [{
  565 + // required: true,
  566 + // message: '请选择身份证有效时间',
  567 + // trigger: 'change'
  568 + // }, ],
569 569 idCardPhotoFront: [{
570 570 required: true,
571 571 message: '请输入身份证照片(正面)',
... ... @@ -703,11 +703,14 @@
703 703 this.getAll();
704 704 },
705 705 idCardchange(e) {
706   -
  706 + console.log(e,'eee')
707 707 this.ruleForm.idCardValidStart = e[0]
708 708 this.ruleForm.idCardValidEnd = e[1]
709   -
  709 +
710 710 },
  711 + blur(){
  712 + this.$forceUpdate()
  713 + },
711 714 // 新增确定
712 715 addCheck() {
713 716  
... ...
admin-web-master/src/views/customer/rsaReview/index.vue
  View file @cfe2752
... ... @@ -226,11 +226,11 @@
226 226 <div class="duiqi">{{secondData.idCardNumber}}</div>
227 227 </el-form-item>
228 228 </el-col>
229   - <el-col :span="12">
  229 + <!-- <el-col :span="12">
230 230 <el-form-item label="身份证有效期">
231 231 <div class="duiqi">{{secondData.idCardValidStart}}-{{secondData.idCardValidEnd}}</div>
232 232 </el-form-item>
233   - </el-col>
  233 + </el-col> -->
234 234 </el-row>
235 235 <el-row :gutter="20">
236 236 <el-col :span="12">
... ... @@ -333,11 +333,11 @@
333 333 <div class="duiqi">{{ruleForm.idCardNumber}}</div>
334 334 </el-form-item>
335 335 </el-col>
336   - <el-col :span="12">
  336 + <!-- <el-col :span="12">
337 337 <el-form-item label="身份证有效期">
338 338 <div class="duiqi">{{ruleForm.idCardValidStart}}-{{ruleForm.idCardValidEnd}}</div>
339 339 </el-form-item>
340   - </el-col>
  340 + </el-col> -->
341 341 </el-row>
342 342 <el-row :gutter="20">
343 343 <el-col :span="12">
... ... @@ -534,11 +534,11 @@
534 534 message: '手机号只能包含数字',
535 535 trigger: 'blur',
536 536 }],
537   - idCardValidStart: [{
538   - required: true,
539   - message: '请选择身份证有效时间',
540   - trigger: 'change'
541   - }, ],
  537 + // idCardValidStart: [{
  538 + // required: true,
  539 + // message: '请选择身份证有效时间',
  540 + // trigger: 'change'
  541 + // }, ],
542 542 idCardPhotoFront: [{
543 543 required: true,
544 544 message: '请输入身份证照片(正面)',
... ...
admin-web-master/src/views/shopbus/settlement/addSettlement.vue
  View file @cfe2752
... ... @@ -29,9 +29,9 @@
29 29 </el-form-item>
30 30 <el-form-item
31 31 label="经营主体"
32   - prop="AuthenType"
  32 + prop="authenType"
33 33 >
34   - <div>{{shopDetails.AuthenType==2?'个体工商户':'企业'}}</div>
  34 + <div>{{shopDetails.authenType==2?'个体工商户':'企业'}}</div>
35 35  
36 36 </el-form-item>
37 37  
... ...
ceres-uniapp-master/config/api.js
  View file @cfe2752
... ... @@ -45,9 +45,9 @@ const TERMINAL = 1
45 45  
46 46 module.exports = {
47 47 terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑
48   - // SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
  48 + SettledMerchantPrefix: TIAOZHUAN + 'settled-merchant' ,
49 49 // 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接
50   - SettledMerchantPrefix:'http://localhost:8082',
  50 + // SettledMerchantPrefix:'http://localhost:8082',
51 51 shareLink: TIAOZHUAN + 'meh5', // 分享地址
52 52 // shareLink: 'http://172.16.61.123:9007/h5', // 分享地址
53 53  
... ...
lvdao-miniapp/pages.json
  View file @cfe2752
... ... @@ -169,6 +169,14 @@
169 169 }
170 170 },
171 171 {
  172 + "path": "pages/mycreated/actList",
  173 + "style": {
  174 + "navigationBarTitleText": "报名名单",
  175 + "navigationBarBackgroundColor": "#FFFFFF",
  176 + "enablePullDownRefresh": true
  177 + }
  178 + },
  179 + {
172 180 "path": "pages/record/record",
173 181 "style": {
174 182 "navigationBarTitleText": "申请记录",
... ... @@ -443,6 +451,13 @@
443 451 }
444 452 },
445 453 {
  454 + "path": "gongao/gongaoList",
  455 + "style": {
  456 + "navigationBarTitleText": "公告列表",
  457 + "navigationBarBackgroundColor": "#FFFFFF"
  458 + }
  459 + },
  460 + {
446 461 "path": "myZiyuan/myZiDetailsnew",
447 462 "style": {
448 463 "navigationBarBackgroundColor": "#FFFFFF",
... ...
lvdao-miniapp/pages/home/home.vue
  View file @cfe2752
... ... @@ -22,9 +22,9 @@
22 22 </swiper-item>
23 23 </swiper>
24 24 </view>
25   - <view class="bg-white">
  25 + <view class="bg-white" @click="gongList()">
26 26 <view class="notice-content">
27   - <view class="notice-left">
  27 + <view class="notice-left" >
28 28 <view>
29 29 <image :src="$imgUrl('/home1.png')"></image>
30 30 </view>
... ... @@ -33,8 +33,9 @@
33 33 <view class="notice-right" v-if="procedureData.length == 0">
34 34 暂无公告
35 35 </view>
  36 + <!-- @click="gaozhi(item)" -->
36 37 <view class="notice-right">
37   - <view class="notice-right-content" @click="gaozhi(item)" v-for="(item,index) in procedureData">
  38 + <view class="notice-right-content" v-for="(item,index) in procedureData">
38 39 <view class="notice-icon">公告</view>
39 40 <view class="notice-text" style="padding-top:4rpx"> {{item.announcementTitle}}</view>
40 41 </view>
... ... @@ -645,6 +646,11 @@
645 646 })
646 647  
647 648 },
  649 + gongList(){
  650 + uni.navigateTo({
  651 + url: `/pagesA/gongao/gongaoList`
  652 + })
  653 + },
648 654 details(item) {
649 655 let items = JSON.stringify(item)
650 656 if (this.current == 0 || this.current == 1) {
... ...
lvdao-miniapp/pages/mycreated/actList.vue 0 → 100644
  View file @cfe2752
  1 +<template>
  2 + <view class="pages">
  3 + <view v-if="tableList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
  4 + <view class="contents">
  5 + <view class="box" v-for="(item,index) in tableList" :key="index">
  6 + <view style="width:50%">
  7 + <view class="title">
  8 + 姓名：{{item.signUpName}}
  9 + </view>
  10 + <view class="desc">
  11 + <view>手机号：{{item.signUpPhone}}</view>
  12 + </view>
  13 + </view>
  14 + <view class="more">
  15 + <view class="icon-more">{{item.signUpTime}}</view>
  16 + </view>
  17 + </view>
  18 + </view>
  19 + <!-- 加载提示 -->
  20 + <view v-if="isLoading" style="text-align: center; padding: 20rpx;">加载中...</view>
  21 + </view>
  22 +</template>
  23 +
  24 +<script>
  25 +export default {
  26 + data() {
  27 + return {
  28 + tableList: [],
  29 + pageindex: {
  30 + activityApplicationId: '',
  31 + pageNumber: 0,
  32 + pageSize: 20,
  33 + },
  34 + isLoading: false, // 加载状态
  35 + };
  36 + },
  37 + onLoad(option) {
  38 + this.pageindex.activityApplicationId = option.ids
  39 + this.getALL();
  40 + },
  41 + onReachBottom() {
  42 + // 滚动到底部时加载更多数据
  43 + this.loadMoreData();
  44 + },
  45 + methods: {
  46 +
  47 + getALL() {
  48 + this.isLoading = true;
  49 + this.$http.sendRequest('/cereActivityApplicationSignUp/queryByPage', 'POST', this.pageindex, 1).then(res => {
  50 + this.tableList = res.data.data.content;
  51 + this.isLoading = false;
  52 + });
  53 + },
  54 + loadMoreData() {
  55 + if (this.isLoading) return; // 如果正在加载，不重复请求
  56 + this.isLoading = true;
  57 + this.pageindex.pageNumber++;
  58 + this.$http.sendRequest('/cereActivityApplicationSignUp/queryByPage', 'POST', this.pageindex, 1).then(res => {
  59 + this.tableList = this.tableList.concat(res.data.data.content);
  60 + this.isLoading = false;
  61 + });
  62 + },
  63 + },
  64 +};
  65 +</script>
  66 +
  67 +
  68 +<style lang="scss" scoped>
  69 + .more{
  70 + text-align: right;
  71 + .more-num {
  72 + display: inline-block;
  73 + background-color: #f04746;
  74 + border-radius: 100rpx;
  75 + color: #fff;
  76 + font-size: 20rpx;
  77 + width: 36rpx;
  78 + height: 36rpx;
  79 + text-align: center;
  80 + line-height: 36rpx;
  81 + }
  82 + .icon-more {
  83 + margin-top: 14rpx;
  84 + font-size: 28rpx;
  85 + color: #afafaf;
  86 + }
  87 + }
  88 + .pages {
  89 + width: 100vw;
  90 + height: 100%;
  91 + position: relative;
  92 + overflow-y: auto;
  93 + background-color: #f6f6f6;
  94 +
  95 + .contents {
  96 + width: 100%;
  97 +
  98 + background-color: #fff;
  99 + margin-top: 20rpx;
  100 +
  101 + .box {
  102 + width: 94%;
  103 + margin: 0 auto;
  104 + padding: 28rpx 0;
  105 + display: flex;
  106 + justify-content: space-between;
  107 + align-items: center;
  108 +
  109 + .title {
  110 + font-size: 28rpx;
  111 + font-weight: bold;
  112 + }
  113 +
  114 + .time {
  115 + margin: 20rpx 0;
  116 + color: #888D9C;
  117 + font-size: 24rpx;
  118 + }
  119 +
  120 + .desc {
  121 + color: #888D9C;
  122 + font-size: 24rpx;
  123 + text-align: justify;
  124 + margin-top: 10px;
  125 + display: -webkit-box;
  126 + -webkit-box-orient: vertical;
  127 + -webkit-line-clamp: 1;
  128 + overflow: hidden;
  129 + text-overflow: ellipsis;
  130 + }
  131 + }
  132 + }
  133 + }
  134 +</style>
0 135 \ No newline at end of file
... ...
lvdao-miniapp/pages/mycreated/mycreated.vue
  View file @cfe2752
... ... @@ -55,6 +55,7 @@
55 55 <u-button type="info" size="mini" @click="tijiao('1',v.id)" v-if="v.auditStatus == '2'" style="margin-right: 22rpx;">撤回</u-button>
56 56 <u-button type="info" size="mini" @click="bianji(v.id)" v-if="v.auditStatus == '1'" style="margin-right: 22rpx;">编辑</u-button>
57 57 <u-button type="info" size="mini" @click="generatePoster(v.id)" v-if="v.auditStatus == '3'" style="margin-right: 22rpx;">显示二维码</u-button>
  58 + <u-button type="info" size="mini" @click="getList(v.id)" v-if="v.auditStatus == '3'" style="margin-right: 22rpx;">报名名单</u-button>
58 59 <u-button type="info" size="mini" @click="delact(v.id)" v-if="v.auditStatus == '1'" style="margin-right: 22rpx;">删除</u-button>
59 60 </view>
60 61 </view>
... ... @@ -224,6 +225,11 @@
224 225 //请求失败
225 226 })
226 227 },
  228 + getList(ids){
  229 + uni.navigateTo({
  230 + url: `/pages/mycreated/actList?ids=${ids}`
  231 + })
  232 + },
227 233 }
228 234 }
229 235 </script>
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @cfe2752
... ... @@ -310,10 +310,10 @@
310 310 },
311 311 methods: {
312 312 async toPath1(path) {
313   - let c1 = uni.getStorageSync('user').phone
  313 + let h1 = uni.getStorageSync('user').phone
314 314 // let c1 = '18188305496'
315 315 await this.$http.sendRequest('/check/getAll', 'POST', {
316   - "shopPhone": c1,
  316 + "shopPhone": h1,
317 317 "checkState": "1",
318 318 "page": 1,
319 319 "pageSize": 1
... ... @@ -325,14 +325,108 @@
325 325 uni.setStorageSync('shopId', '');
326 326 }
327 327 })
328   - uni.navigateTo({
329   - url: path,
  328 + await this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
  329 + "pageSize": 10,
  330 + pageNumber: 0,
  331 + phone: uni.getStorageSync('user').phone
  332 + }).then(res => {
  333 + if (res.data.code == '20004' || res.data.code == '20003') {
  334 + uni.navigateTo({
  335 + url: '/pages/login/login'
  336 + })
  337 + }
  338 + if (res.data.data.content.length > 0) {
  339 + let c1 = res.data.data.content[0]
  340 + console.log(c1.checkState,'checkState')
  341 + if (c1.checkState == '1') {
  342 + uni.showToast({
  343 + icon: 'none',
  344 + title: '商家申请正在审核中',
  345 + duration: 3000
  346 + });
  347 + } else if (c1.checkState == '3') {
  348 + uni.showToast({
  349 + icon: 'none',
  350 + title: '商家申请审核已被拒绝 请重新提交',
  351 + duration: 3000
  352 + });
  353 + setTimeout(() => {
  354 + uni.navigateTo({
  355 + url: '/pagesA/leaseAdd/leaseAdd'
  356 + })
  357 + }, 3000)
  358 + } else if (c1.checkState == '2') {
  359 + uni.navigateTo({
  360 + url: path,
  361 + })
  362 + }
  363 + } else {
  364 + uni.showToast({
  365 + icon: 'none',
  366 + title: '请先申请成为商家',
  367 + duration: 3000
  368 + });
  369 + setTimeout(() => {
  370 + uni.navigateTo({
  371 + url: '/pagesA/leaseAdd/leaseAdd'
  372 + })
  373 + }, 3000)
  374 + }
330 375 })
  376 +
  377 +
  378 +
331 379 },
332 380 toPath(path) {
333   - uni.navigateTo({
334   - url: path,
  381 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
  382 + "pageSize": 10,
  383 + pageNumber: 0,
  384 + phone: uni.getStorageSync('user').phone
  385 + }).then(res => {
  386 + if (res.data.code == '20004' || res.data.code == '20003') {
  387 + uni.navigateTo({
  388 + url: '/pages/login/login'
  389 + })
  390 + }
  391 + if (res.data.data.content.length > 0) {
  392 + let c1 = res.data.data.content[0]
  393 + console.log(c1.checkState,'checkState')
  394 + if (c1.checkState == '1') {
  395 + uni.showToast({
  396 + icon: 'none',
  397 + title: '商家申请正在审核中',
  398 + duration: 3000
  399 + });
  400 + } else if (c1.checkState == '3') {
  401 + uni.showToast({
  402 + icon: 'none',
  403 + title: '商家申请审核已被拒绝 请重新提交',
  404 + duration: 3000
  405 + });
  406 + setTimeout(() => {
  407 + uni.navigateTo({
  408 + url: '/pagesA/leaseAdd/leaseAdd'
  409 + })
  410 + }, 3000)
  411 + } else if (c1.checkState == '2') {
  412 + uni.navigateTo({
  413 + url: path,
  414 + })
  415 + }
  416 + } else {
  417 + uni.showToast({
  418 + icon: 'none',
  419 + title: '请先申请成为商家',
  420 + duration: 3000
  421 + });
  422 + setTimeout(() => {
  423 + uni.navigateTo({
  424 + url: '/pagesA/leaseAdd/leaseAdd'
  425 + })
  426 + }, 3000)
  427 + }
335 428 })
  429 +
336 430 },
337 431 }
338 432 }
... ...
lvdao-miniapp/pagesA/gongao/gongaoList.vue 0 → 100644
  View file @cfe2752
  1 +<template>
  2 + <view class="pages">
  3 + <view v-if="tableList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
  4 + <view class="contents">
  5 + <view class="box" v-for="(item,index) in tableList" @click="getDetail(item)">
  6 + <view style="width:70%">
  7 + <view class="title">
  8 + {{item.announcementTitle}}
  9 + </view>
  10 + <view class="desc">
  11 + <view v-html="item.announcementContent"></view>
  12 + </view>
  13 + </view>
  14 + <view class="more">
  15 + <view class="more-num" v-if="item.isRead == '0'">1</view>
  16 + <view class="icon-more">{{formatDateTime(item.releaseTime)}}</view>
  17 + </view>
  18 + <!-- <view class="time">
  19 + {{formatDateTime(item.createTime)}}
  20 + </view> -->
  21 +
  22 + </view>
  23 + </view>
  24 + <view v-if="isLoading" style="text-align: center; padding: 20rpx;">加载中...</view>
  25 + </view>
  26 +</template>
  27 +
  28 +<script>
  29 + export default {
  30 + data() {
  31 + return {
  32 + tableList: [],
  33 + pageindex: {
  34 + pageNumber: 0,
  35 + pageSize: 20,
  36 + },
  37 + isLoading:false
  38 + }
  39 + },
  40 + onLoad(option) {
  41 +
  42 + },
  43 + onShow(option) {
  44 +
  45 + },
  46 + mounted() {
  47 + this.getALL()
  48 + },
  49 + methods: {
  50 + formatDateTime(dateTimeString) {
  51 + // 将输入的日期时间字符串转换为Date对象
  52 + const inputDate = new Date(dateTimeString);
  53 + const now = new Date();
  54 +
  55 + // 获取年、月、日来进行比较
  56 + const inputYear = inputDate.getFullYear();
  57 + const inputMonth = inputDate.getMonth();
  58 + const inputDay = inputDate.getDate();
  59 +
  60 + const currentYear = now.getFullYear();
  61 + const currentMonth = now.getMonth();
  62 + const currentDay = now.getDate();
  63 +
  64 + // 检查输入的日期是否为今天
  65 + const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay);
  66 +
  67 + // 格式化时间为HH:mm
  68 + const hours = inputDate.getHours().toString().padStart(2, '0');
  69 + const minutes = inputDate.getMinutes().toString().padStart(2, '0');
  70 + const timeString = `${hours}:${minutes}`;
  71 +
  72 + // 如果是今天，则在时间前面加上'今天'
  73 + return isToday ? `今天${timeString}` : timeString;
  74 + },
  75 + onReachBottom() {
  76 + // 滚动到底部时加载更多数据
  77 + this.loadMoreData();
  78 + },
  79 + getALL() {
  80 + this.isLoading = true;
  81 + this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', this.pageindex, 1).then(res => {
  82 +
  83 + this.tableList = res.data.data.content
  84 + this.isLoading = false;
  85 + })
  86 + },
  87 + loadMoreData() {
  88 + if (this.isLoading) return; // 如果正在加载，不重复请求
  89 + this.isLoading = true;
  90 + this.pageindex.pageNumber++;
  91 + this.$http.sendRequest('/cereAnnouncement/queryByPage', 'POST', this.pageindex, 1).then(res => {
  92 + this.tableList = this.tableList.concat(res.data.data.content);
  93 + this.isLoading = false;
  94 + });
  95 + },
  96 + getDetail(items) {
  97 + uni.navigateTo({
  98 + url: `/pages/procedure/procedure?item=${encodeURIComponent(JSON.stringify(items))}`
  99 + // url: `/pagesA/procedureList/procedureDetail?item=${encodeURIComponent(JSON.stringify(item))}`
  100 + })
  101 + },
  102 + }
  103 + }
  104 +</script>
  105 +
  106 +<style lang="scss" scoped>
  107 + .more {
  108 + text-align: right;
  109 +
  110 + .more-num {
  111 + display: inline-block;
  112 + background-color: #f04746;
  113 + border-radius: 100rpx;
  114 + color: #fff;
  115 + font-size: 20rpx;
  116 + width: 36rpx;
  117 + height: 36rpx;
  118 + text-align: center;
  119 + line-height: 36rpx;
  120 + }
  121 +
  122 + .icon-more {
  123 + margin-top: 14rpx;
  124 + font-size: 28rpx;
  125 + color: #afafaf;
  126 + }
  127 + }
  128 +
  129 + .pages {
  130 + width: 100vw;
  131 + height: 100%;
  132 + position: relative;
  133 + overflow-y: auto;
  134 + background-color: #f6f6f6;
  135 +
  136 + .contents {
  137 + width: 100%;
  138 +
  139 + background-color: #fff;
  140 + margin-top: 20rpx;
  141 +
  142 + .box {
  143 + width: 94%;
  144 + margin: 0 auto;
  145 + padding: 28rpx 0;
  146 + display: flex;
  147 + justify-content: space-between;
  148 + align-items: center;
  149 +
  150 + .title {
  151 + font-size: 30rpx;
  152 + font-weight: bold;
  153 + }
  154 +
  155 + .time {
  156 + margin: 20rpx 0;
  157 + color: #888D9C;
  158 + font-size: 24rpx;
  159 + }
  160 +
  161 + .desc {
  162 + color: #888D9C;
  163 + font-size: 24rpx;
  164 + text-align: justify;
  165 + margin-top: 10px;
  166 + display: -webkit-box;
  167 + -webkit-box-orient: vertical;
  168 + -webkit-line-clamp: 1;
  169 + overflow: hidden;
  170 + text-overflow: ellipsis;
  171 +
  172 + }
  173 + }
  174 + }
  175 + }
  176 +</style>
0 177 \ No newline at end of file
... ...
lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
  View file @cfe2752
... ... @@ -110,12 +110,31 @@
110 110 return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
111 111 },
112 112 go() {
113   - console.error(this.fileList1)
114   - console.error(this.fileList2)
115   -
  113 + if (!this.model1.idCardNumber) {
  114 + uni.showToast({
  115 + icon: 'none',
  116 + title: '请输入身份证号码'
  117 + });
  118 + return false;
  119 + }
  120 +
116 121 this.model1.applyTime = this.getCurrentTime()
117 122 this.model1.idCardFrontImage = this.fileList1.join(',')
118 123 this.model1.idCardBackImage = this.fileList2.join(',')
  124 + if (!this.model1.idCardFrontImage) {
  125 + uni.showToast({
  126 + icon: 'none',
  127 + title: '请上传身份证照片'
  128 + });
  129 + return false;
  130 + }
  131 + if (!this.model1.idCardBackImage) {
  132 + uni.showToast({
  133 + icon: 'none',
  134 + title: '请上传身份证照片'
  135 + });
  136 + return false;
  137 + }
119 138 this.model1.username = this.model1.name
120 139 this.model1.phone = uni.getStorageSync('user').phone
121 140 console.error({
... ...
lvdao-miniapp/utils/request.js
  View file @cfe2752
... ... @@ -21,17 +21,17 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23  
24   - // bases = 'http://128.10.249.31:9003'+ url;
  24 + bases = 'http://128.10.249.25:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27   - bases = c1 + 'cdwlMall/meserver/admin-server' + url;
  27 + // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28  
29 29 }else if(baseUrl == 3){
30 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33   - // bases = 'http://128.10.249.23:9007' + url;
34   - bases = c1 + 'cdwlMall/meserver/api' + url;
  33 + bases = 'http://128.10.249.25:9007' + url;
  34 + // bases = c1 + 'cdwlMall/meserver/api' + url;
35 35  
36 36 }else{
37 37 // bases = 'http://128.10.249.22:9004' + url;
... ... @@ -39,9 +39,9 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
39 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42   - // bases = 'http://128.10.249.31:9004' + url;
  42 + bases = 'http://128.10.249.25:9004' + url;
43 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44   - bases = c1 + 'cdwlMall/business-server' + url;
  44 + // bases = c1 + 'cdwlMall/business-server' + url;
45 45  
46 46 }
47 47 var token = uni.getStorageSync('token') || '';
... ...
settled-merchant-master/src/views/SettleIn/enterprisesApply.vue
  View file @cfe2752
... ... @@ -232,7 +232,8 @@ export default {
232 232 enterpriseCardStartTime: '', // 证件有效开始时间
233 233 enterpriseCardEndTime: '', // 证件有效结束时间
234 234 enterpriseCardPositive: '', // 身份证正面照
235   - enterpriseCardSide: '' // 身份证反面照
  235 + enterpriseCardSide: '' ,// 身份证反面照
  236 + merchantType: '线上商家'
236 237 },
237 238 idCardList: [],
238 239 dictName: '证件类型',
... ...
settled-merchant-master/src/views/SettleIn/individualBusiness.vue
  View file @cfe2752
... ... @@ -232,7 +232,8 @@ export default {
232 232 subjectCardStartTime: '', // 证件有效开始时间
233 233 subjectCardEndTime: '', // 证件有效结束时间
234 234 subjectCardPositive: '', // 身份证正面照
235   - subjectCardSide: '' // 身份证反面照
  235 + subjectCardSide: '' ,// 身份证反面照
  236 + merchantType: '线上商家'
236 237 },
237 238 idCardList: [],
238 239 dictName: '证件类型',
... ...
settled-merchant-master/src/views/SettleIn/organization.vue
  View file @cfe2752
... ... @@ -230,7 +230,8 @@ export default {
230 230 otherCardStartTime: '', // 证件有效开始时间
231 231 otherCardEndTime: '', // 证件有效结束时间
232 232 otherCardPositive: '', // 身份证正面照
233   - otherCardSide: '' // 身份证反面照
  233 + otherCardSide: '' ,// 身份证反面照
  234 + merchantType: '线上商家'
234 235 },
235 236 idCardList: [],
236 237 dictName: '证件类型',
... ...
settled-merchant-master/src/views/SettleIn/personal.vue
  View file @cfe2752
... ... @@ -186,7 +186,8 @@ export default {
186 186 personalCardEndTime: '', // 证件有效结束时间
187 187 personalCardPositive: '', // 身份证正面照
188 188 personalCardSide: '', // 身份证反面照
189   - personalCardHand: '' // 手持证件照
  189 + personalCardHand: '' ,// 手持证件照
  190 + merchantType: '线上商家'
190 191 },
191 192 idCardList: [],
192 193 dictName: '证件类型',
... ...
settled-merchant-master/src/views/moblie/mEnterprise.vue
  View file @cfe2752
... ... @@ -284,7 +284,8 @@ export default {
284 284 enterpriseCardStartTime: '', // 证件有效开始时间
285 285 enterpriseCardEndTime: '', // 证件有效结束时间
286 286 enterpriseCardPositive: '', // 身份证正面照
287   - enterpriseCardSide: '' // 身份证反面照
  287 + enterpriseCardSide: '' ,// 身份证反面照
  288 + merchantType: '线上商家'
288 289 },
289 290 idCardList: [],
290 291 dictName: '证件类型',
... ...
settled-merchant-master/src/views/moblie/mOtherOrg.vue
  View file @cfe2752
... ... @@ -283,7 +283,8 @@ export default {
283 283 otherCardStartTime: '', // 证件有效开始时间
284 284 otherCardEndTime: '', // 证件有效结束时间
285 285 otherCardPositive: '', // 身份证正面照
286   - otherCardSide: '' // 身份证反面照
  286 + otherCardSide: '' ,// 身份证反面照
  287 + merchantType: '线上商家'
287 288 },
288 289 idCardList: [],
289 290 dictName: '证件类型',
... ...
settled-merchant-master/src/views/moblie/mPersonal.vue
  View file @cfe2752
... ... @@ -206,7 +206,8 @@ export default {
206 206 personalCardEndTime: '', // 证件有效结束时间
207 207 personalCardPositive: '', // 身份证正面照
208 208 personalCardSide: '', // 身份证反面照
209   - personalCardHand: '' // 手持证件照
  209 + personalCardHand: '' ,// 手持证件照
  210 + merchantType: '线上商家'
210 211 },
211 212 idCardList: [],
212 213 dictName: '证件类型',
... ...
settled-merchant-master/src/views/moblie/mUinitBusiness.vue
  View file @cfe2752
... ... @@ -287,7 +287,8 @@ export default {
287 287 subjectCardStartTime: '', // 证件有效开始时间
288 288 subjectCardEndTime: '', // 证件有效结束时间
289 289 subjectCardPositive: '', // 身份证正面照
290   - subjectCardSide: '' // 身份证反面照
  290 + subjectCardSide: '' ,// 身份证反面照
  291 + merchantType: '线上商家'
291 292 },
292 293 idCardList: [],
293 294 dictName: '证件类型',
... ...