webapp / GreenwayWeb

Commit 3a1f257bc4f7ed3aa18d7b22cfd5d923a5383ee3

Authored by 杨鑫
1 parent 0fb84c2e

最新

Inline Side-by-side
Showing 26 changed files with 426 additions and 240 deletions
admin-web-master/src/api/actSp.js
  View file @3a1f257
@@ -35,3 +35,11 @@ export function QRcode(data) { @@ -35,3 +35,11 @@ export function QRcode(data) {
35 data 35 data
36 }) 36 })
37 } 37 }
  38 +//获取活动名单
  39 +export function Registration(data) {
  40 + return request({
  41 + url: '/cereActivityApplicationSignUp/queryByPage',
  42 + method: 'post',
  43 + data
  44 + })
  45 +}
admin-web-master/src/utils/request.js
  View file @3a1f257
@@ -16,8 +16,8 @@ let hostall = window.location.href; @@ -16,8 +16,8 @@ let hostall = window.location.href;
16 let baseURL = '' 16 let baseURL = ''
17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { 17 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) {
18 18
19 - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';  
20 - // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; 19 + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
  20 + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
21 21
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23
admin-web-master/src/views/activity/activityHis.vue
  View file @3a1f257
@@ -1206,15 +1206,17 @@ @@ -1206,15 +1206,17 @@
1206 <el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false" 1206 <el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false"
1207 :close-on-press-escape="false"> 1207 :close-on-press-escape="false">
1208 <div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;"> 1208 <div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;">
1209 - <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">  
1210 - <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"  
1211 - :value="index"> 1209 + <!-- @change="lichangeOne" -->
  1210 + <el-input v-model="ListOne" style="width: 26%;" disabled/>
  1211 + <!-- <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" >
  1212 + <el-option :label="effectivenessListOne.planName" :value="effectivenessListOne.planName">
1212 </el-option> 1213 </el-option>
1213 - </el-select> 1214 + </el-select> -->
  1215 +
1214 <div style="line-height:200%;"> 1216 <div style="line-height:200%;">
1215 <img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;"> 1217 <img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;">
1216 </div> 1218 </div>
1217 - <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo"> 1219 + <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;width: 26%;" @change="lichangeTwo">
1218 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType" 1220 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
1219 :value="index"> 1221 :value="index">
1220 </el-option> 1222 </el-option>
@@ -2335,7 +2337,8 @@ @@ -2335,7 +2337,8 @@
2335 2337
2336 }, 2338 },
2337 xiaoguo(item) { 2339 xiaoguo(item) {
2338 - 2340 +this.effectivenessListOne = item
  2341 +this.ListOne = item.planName
2339 this.xiaoDui = true 2342 this.xiaoDui = true
2340 this.duibiOne = item 2343 this.duibiOne = item
2341 console.log(item) 2344 console.log(item)
@@ -2350,9 +2353,9 @@ @@ -2350,9 +2353,9 @@
2350 this.effectivenessList[index].operationType = actName[0] 2353 this.effectivenessList[index].operationType = actName[0]
2351 }) 2354 })
2352 }) 2355 })
2353 - this.ListOne = '' 2356 + // this.ListOne = ''
2354 this.ListTwo = '' 2357 this.ListTwo = ''
2355 - this.effectivenessListOne = {} 2358 + // this.effectivenessListOne = {}
2356 this.effectivenessListTwo = {} 2359 this.effectivenessListTwo = {}
2357 2360
2358 // actPage({ 2361 // actPage({
@@ -2549,90 +2552,90 @@ @@ -2549,90 +2552,90 @@
2549 this.duibiList = JSON.parse(msg.modifiedData) 2552 this.duibiList = JSON.parse(msg.modifiedData)
2550 2553
2551 }, 2554 },
2552 - lichangeOne(e) {  
2553 - let msg = this.effectivenessList[e]  
2554 - if (typeof msg.modifiedData == 'string') {  
2555 - this.effectivenessListOne = JSON.parse(msg.modifiedData)  
2556 - } else {  
2557 - this.effectivenessListOne = msg.modifiedData  
2558 - }  
2559 -  
2560 - if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo  
2561 - .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=  
2562 - '' && this.effectivenessListTwo  
2563 - .internalLaborCostEstimation != '') {  
2564 - let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this  
2565 - .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo  
2566 - .internalLaborCostEstimation) * 100  
2567 - this.effectivenessListOne.sumNei = sum.toFixed(2)  
2568 - }  
2569 - if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo  
2570 - .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=  
2571 - '' && this.effectivenessListTwo  
2572 - .externalLaborCostEstimation != '') {  
2573 - let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this  
2574 - .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo  
2575 - .externalLaborCostEstimation) * 100  
2576 - this.effectivenessListOne.sumWai = sum.toFixed(2) 2555 + // lichangeOne(e) {
  2556 + // let msg = this.effectivenessList[e]
  2557 + // if (typeof msg.modifiedData == 'string') {
  2558 + // this.effectivenessListOne = JSON.parse(msg.modifiedData)
  2559 + // } else {
  2560 + // this.effectivenessListOne = msg.modifiedData
  2561 + // }
2577 2562
2578 - }  
2579 - if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo  
2580 - .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this  
2581 - .effectivenessListTwo  
2582 - .costEstimationGoods != '') {  
2583 - let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne  
2584 - .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100  
2585 - this.effectivenessListOne.sumShop = sum.toFixed(2) 2563 + // if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
  2564 + // .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
  2565 + // '' && this.effectivenessListTwo
  2566 + // .internalLaborCostEstimation != '') {
  2567 + // let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
  2568 + // .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
  2569 + // .internalLaborCostEstimation) * 100
  2570 + // this.effectivenessListOne.sumNei = sum.toFixed(2)
  2571 + // }
  2572 + // if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
  2573 + // .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
  2574 + // '' && this.effectivenessListTwo
  2575 + // .externalLaborCostEstimation != '') {
  2576 + // let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
  2577 + // .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2578 + // .externalLaborCostEstimation) * 100
  2579 + // this.effectivenessListOne.sumWai = sum.toFixed(2)
2586 2580
2587 - }  
2588 - if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=  
2589 - undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo  
2590 - .setCostEstimate != '') {  
2591 - let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne  
2592 - .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100  
2593 - this.effectivenessListOne.sumSe = sum.toFixed(2) 2581 + // }
  2582 + // if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
  2583 + // .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
  2584 + // .effectivenessListTwo
  2585 + // .costEstimationGoods != '') {
  2586 + // let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
  2587 + // .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2588 + // this.effectivenessListOne.sumShop = sum.toFixed(2)
2594 2589
2595 - }  
2596 - if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo  
2597 - .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=  
2598 - '' && this.effectivenessListTwo  
2599 - .estimatedPromotionalExpenses != '') {  
2600 - let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this  
2601 - .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo  
2602 - .estimatedPromotionalExpenses) * 100 2590 + // }
  2591 + // if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
  2592 + // undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2593 + // .setCostEstimate != '') {
  2594 + // let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
  2595 + // .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
  2596 + // this.effectivenessListOne.sumSe = sum.toFixed(2)
2603 2597
2604 - this.effectivenessListOne.sumXuan = sum.toFixed(2)  
2605 - }  
2606 - if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo  
2607 - .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&  
2608 - this.effectivenessListTwo  
2609 - .otherNecessaryEstimates != '') {  
2610 - let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100  
2611 - this.effectivenessListOne.sumQi = sum.toFixed(2)  
2612 - }  
2613 - if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo  
2614 - .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this  
2615 - .effectivenessListTwo  
2616 - .totalCostEstimation != '') {  
2617 - let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100  
2618 - this.effectivenessListOne.sumAll = sum.toFixed(2)  
2619 - }  
2620 - // sumNei  
2621 - // sumWai  
2622 - // sumShop  
2623 - // sumSe  
2624 - // sumXuan  
2625 - // sumQi  
2626 - // sumAll  
2627 - // internalLaborCostEstimation  
2628 - // externalLaborCostEstimation  
2629 - // costEstimationGoods  
2630 - // setCostEstimate  
2631 - // estimatedPromotionalExpenses  
2632 - // otherNecessaryEstimates  
2633 - // totalCostEstimation 2598 + // }
  2599 + // if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
  2600 + // .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
  2601 + // '' && this.effectivenessListTwo
  2602 + // .estimatedPromotionalExpenses != '') {
  2603 + // let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
  2604 + // .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
  2605 + // .estimatedPromotionalExpenses) * 100
  2606 +
  2607 + // this.effectivenessListOne.sumXuan = sum.toFixed(2)
  2608 + // }
  2609 + // if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
  2610 + // .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
  2611 + // this.effectivenessListTwo
  2612 + // .otherNecessaryEstimates != '') {
  2613 + // let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2614 + // this.effectivenessListOne.sumQi = sum.toFixed(2)
  2615 + // }
  2616 + // if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
  2617 + // .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
  2618 + // .effectivenessListTwo
  2619 + // .totalCostEstimation != '') {
  2620 + // let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2621 + // this.effectivenessListOne.sumAll = sum.toFixed(2)
  2622 + // }
  2623 + // // sumNei
  2624 + // // sumWai
  2625 + // // sumShop
  2626 + // // sumSe
  2627 + // // sumXuan
  2628 + // // sumQi
  2629 + // // sumAll
  2630 + // // internalLaborCostEstimation
  2631 + // // externalLaborCostEstimation
  2632 + // // costEstimationGoods
  2633 + // // setCostEstimate
  2634 + // // estimatedPromotionalExpenses
  2635 + // // otherNecessaryEstimates
  2636 + // // totalCostEstimation
2634 2637
2635 - }, 2638 + // },
2636 lichangeTwo(e) { 2639 lichangeTwo(e) {
2637 let msg = this.effectivenessList[e] 2640 let msg = this.effectivenessList[e]
2638 if (typeof msg.modifiedData == 'string') { 2641 if (typeof msg.modifiedData == 'string') {
@@ -2646,7 +2649,7 @@ @@ -2646,7 +2649,7 @@
2646 '' && this.effectivenessListTwo 2649 '' && this.effectivenessListTwo
2647 .internalLaborCostEstimation != '') { 2650 .internalLaborCostEstimation != '') {
2648 let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this 2651 let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
2649 - .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo 2652 + .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListOne
2650 .internalLaborCostEstimation) * 100 2653 .internalLaborCostEstimation) * 100
2651 this.effectivenessListOne.sumNei = sum.toFixed(2) 2654 this.effectivenessListOne.sumNei = sum.toFixed(2)
2652 } 2655 }
@@ -2654,11 +2657,9 @@ @@ -2654,11 +2657,9 @@
2654 .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation != 2657 .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
2655 '' && this.effectivenessListTwo 2658 '' && this.effectivenessListTwo
2656 .externalLaborCostEstimation != '') { 2659 .externalLaborCostEstimation != '') {
2657 -  
2658 let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this 2660 let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
2659 - .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo 2661 + .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListOne
2660 .externalLaborCostEstimation) * 100 2662 .externalLaborCostEstimation) * 100
2661 - console.log(sum.toFixed(2),'console.log(sum.toFixed(2))')  
2662 this.effectivenessListOne.sumWai = sum.toFixed(2) 2663 this.effectivenessListOne.sumWai = sum.toFixed(2)
2663 2664
2664 } 2665 }
@@ -2667,7 +2668,7 @@ @@ -2667,7 +2668,7 @@
2667 .effectivenessListTwo 2668 .effectivenessListTwo
2668 .costEstimationGoods != '') { 2669 .costEstimationGoods != '') {
2669 let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne 2670 let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
2670 - .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100 2671 + .costEstimationGoods)) / Number(this.effectivenessListOne.costEstimationGoods) * 100
2671 this.effectivenessListOne.sumShop = sum.toFixed(2) 2672 this.effectivenessListOne.sumShop = sum.toFixed(2)
2672 2673
2673 } 2674 }
@@ -2675,7 +2676,7 @@ @@ -2675,7 +2676,7 @@
2675 undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo 2676 undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
2676 .setCostEstimate != '') { 2677 .setCostEstimate != '') {
2677 let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne 2678 let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
2678 - .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100 2679 + .setCostEstimate)) / Number(this.effectivenessListOne.setCostEstimate) * 100
2679 this.effectivenessListOne.sumSe = sum.toFixed(2) 2680 this.effectivenessListOne.sumSe = sum.toFixed(2)
2680 2681
2681 } 2682 }
@@ -2684,7 +2685,7 @@ @@ -2684,7 +2685,7 @@
2684 '' && this.effectivenessListTwo 2685 '' && this.effectivenessListTwo
2685 .estimatedPromotionalExpenses != '') { 2686 .estimatedPromotionalExpenses != '') {
2686 let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this 2687 let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
2687 - .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo 2688 + .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListOne
2688 .estimatedPromotionalExpenses) * 100 2689 .estimatedPromotionalExpenses) * 100
2689 2690
2690 this.effectivenessListOne.sumXuan = sum.toFixed(2) 2691 this.effectivenessListOne.sumXuan = sum.toFixed(2)
@@ -2693,14 +2694,14 @@ @@ -2693,14 +2694,14 @@
2693 .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' && 2694 .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
2694 this.effectivenessListTwo 2695 this.effectivenessListTwo
2695 .otherNecessaryEstimates != '') { 2696 .otherNecessaryEstimates != '') {
2696 - let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100 2697 + let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListOne.otherNecessaryEstimates) * 100
2697 this.effectivenessListOne.sumQi = sum.toFixed(2) 2698 this.effectivenessListOne.sumQi = sum.toFixed(2)
2698 } 2699 }
2699 if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo 2700 if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
2700 .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this 2701 .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
2701 .effectivenessListTwo 2702 .effectivenessListTwo
2702 .totalCostEstimation != '') { 2703 .totalCostEstimation != '') {
2703 - let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100 2704 + let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListOne.totalCostEstimation) * 100
2704 this.effectivenessListOne.sumAll = sum.toFixed(2) 2705 this.effectivenessListOne.sumAll = sum.toFixed(2)
2705 } 2706 }
2706 // sumNei 2707 // sumNei
admin-web-master/src/views/atmosphere/atmosphereHis.vue
  View file @3a1f257
@@ -1203,15 +1203,16 @@ @@ -1203,15 +1203,16 @@
1203 <el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false" 1203 <el-dialog :visible.sync="xiaoDui" title="效果对比" width="55%" center :close-on-click-modal="false"
1204 :close-on-press-escape="false"> 1204 :close-on-press-escape="false">
1205 <div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;"> 1205 <div style="display:flex;padding:20px 20px 0px 20px;width:100%;justify-content: center;">
1206 - <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne"> 1206 + <el-input v-model="ListOne" style="width: 26%;" disabled/>
  1207 + <!-- <el-select v-model="ListOne" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeOne">
1207 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType" 1208 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
1208 :value="index"> 1209 :value="index">
1209 </el-option> 1210 </el-option>
1210 - </el-select> 1211 + </el-select> -->
1211 <div style="line-height:200%;"> 1212 <div style="line-height:200%;">
1212 <img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;"> 1213 <img src="../../assets/images/vs.png" alt="" style="height: 100px;width: 100px;margin-top: -29px;">
1213 </div> 1214 </div>
1214 - <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;" @change="lichangeTwo"> 1215 + <el-select v-model="ListTwo" placeholder="请选择" style="margin:0 20px 20px 20px;width: 26%;" @change="lichangeTwo">
1215 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType" 1216 <el-option v-for="(item,index) in effectivenessList" :key="item.id" :label="item.operationType"
1216 :value="index"> 1217 :value="index">
1217 </el-option> 1218 </el-option>
@@ -2316,7 +2317,8 @@ @@ -2316,7 +2317,8 @@
2316 2317
2317 }, 2318 },
2318 xiaoguo(item) { 2319 xiaoguo(item) {
2319 - 2320 +this.effectivenessListOne = item
  2321 +this.ListOne = item.planName
2320 this.xiaoDui = true 2322 this.xiaoDui = true
2321 this.duibiOne = item 2323 this.duibiOne = item
2322 console.log(item) 2324 console.log(item)
@@ -2330,9 +2332,9 @@ @@ -2330,9 +2332,9 @@
2330 this.effectivenessList[index].operationType = actName[0] 2332 this.effectivenessList[index].operationType = actName[0]
2331 }) 2333 })
2332 }) 2334 })
2333 - this.ListOne = '' 2335 + // this.ListOne = ''
2334 this.ListTwo = '' 2336 this.ListTwo = ''
2335 - this.effectivenessListOne = {} 2337 + // this.effectivenessListOne = {}
2336 this.effectivenessListTwo = {} 2338 this.effectivenessListTwo = {}
2337 2339
2338 // this.xiaoDui = true 2340 // this.xiaoDui = true
@@ -2522,7 +2524,7 @@ @@ -2522,7 +2524,7 @@
2522 this.searchShow = true 2524 this.searchShow = true
2523 }, 2525 },
2524 lichange(e) { 2526 lichange(e) {
2525 - console.log(e) 2527 +
2526 // this.lishiList = e 2528 // this.lishiList = e
2527 // let msg = this.liData[e] 2529 // let msg = this.liData[e]
2528 // this.duibiList = JSON.parse(msg.modifyContent) 2530 // this.duibiList = JSON.parse(msg.modifyContent)
@@ -2530,91 +2532,91 @@ @@ -2530,91 +2532,91 @@
2530 let msg = this.effectivenessList[e] 2532 let msg = this.effectivenessList[e]
2531 this.duibiList = JSON.parse(msg.modifiedData) 2533 this.duibiList = JSON.parse(msg.modifiedData)
2532 }, 2534 },
2533 - lichangeOne(e) {  
2534 - let msg = this.effectivenessList[e]  
2535 - if (typeof msg.modifiedData == 'string') {  
2536 - this.effectivenessListOne = JSON.parse(msg.modifiedData)  
2537 - } else {  
2538 - this.effectivenessListOne = msg.modifiedData  
2539 - }  
2540 -  
2541 - if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo  
2542 - .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=  
2543 - '' && this.effectivenessListTwo  
2544 - .internalLaborCostEstimation != '') {  
2545 - let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this  
2546 - .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo  
2547 - .internalLaborCostEstimation) * 100  
2548 - this.effectivenessListOne.sumNei = sum.toFixed(2)  
2549 - }  
2550 - if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo  
2551 - .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=  
2552 - '' && this.effectivenessListTwo  
2553 - .externalLaborCostEstimation != '') { 2535 + // lichangeOne(e) {
  2536 + // let msg = this.effectivenessList[e]
  2537 + // if (typeof msg.modifiedData == 'string') {
  2538 + // this.effectivenessListOne = JSON.parse(msg.modifiedData)
  2539 + // } else {
  2540 + // this.effectivenessListOne = msg.modifiedData
  2541 + // }
  2542 +
  2543 + // if (this.effectivenessListOne.internalLaborCostEstimation != undefined && this.effectivenessListTwo
  2544 + // .internalLaborCostEstimation != undefined && this.effectivenessListOne.internalLaborCostEstimation !=
  2545 + // '' && this.effectivenessListTwo
  2546 + // .internalLaborCostEstimation != '') {
  2547 + // let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
  2548 + // .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo
  2549 + // .internalLaborCostEstimation) * 100
  2550 + // this.effectivenessListOne.sumNei = sum.toFixed(2)
  2551 + // }
  2552 + // if (this.effectivenessListOne.externalLaborCostEstimation != undefined && this.effectivenessListTwo
  2553 + // .externalLaborCostEstimation != undefined && this.effectivenessListOne.externalLaborCostEstimation !=
  2554 + // '' && this.effectivenessListTwo
  2555 + // .externalLaborCostEstimation != '') {
2554 2556
2555 - let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this  
2556 - .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo  
2557 - .externalLaborCostEstimation) * 100  
2558 - this.effectivenessListOne.sumWai = sum.toFixed(2) 2557 + // let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
  2558 + // .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo
  2559 + // .externalLaborCostEstimation) * 100
  2560 + // this.effectivenessListOne.sumWai = sum.toFixed(2)
2559 2561
2560 - }  
2561 - if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo  
2562 - .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this  
2563 - .effectivenessListTwo  
2564 - .costEstimationGoods != '') {  
2565 - let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne  
2566 - .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100  
2567 - this.effectivenessListOne.sumShop = sum.toFixed(2) 2562 + // }
  2563 + // if (this.effectivenessListOne.costEstimationGoods != undefined && this.effectivenessListTwo
  2564 + // .costEstimationGoods != undefined && this.effectivenessListOne.costEstimationGoods != '' && this
  2565 + // .effectivenessListTwo
  2566 + // .costEstimationGoods != '') {
  2567 + // let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
  2568 + // .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100
  2569 + // this.effectivenessListOne.sumShop = sum.toFixed(2)
2568 2570
2569 - }  
2570 - if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=  
2571 - undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo  
2572 - .setCostEstimate != '') {  
2573 - let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne  
2574 - .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100  
2575 - this.effectivenessListOne.sumSe = sum.toFixed(2) 2571 + // }
  2572 + // if (this.effectivenessListOne.setCostEstimate != undefined && this.effectivenessListTwo.setCostEstimate !=
  2573 + // undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
  2574 + // .setCostEstimate != '') {
  2575 + // let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
  2576 + // .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100
  2577 + // this.effectivenessListOne.sumSe = sum.toFixed(2)
2576 2578
2577 - }  
2578 - if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo  
2579 - .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=  
2580 - '' && this.effectivenessListTwo  
2581 - .estimatedPromotionalExpenses != '') {  
2582 - let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this  
2583 - .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo  
2584 - .estimatedPromotionalExpenses) * 100 2579 + // }
  2580 + // if (this.effectivenessListOne.estimatedPromotionalExpenses != undefined && this.effectivenessListTwo
  2581 + // .estimatedPromotionalExpenses != undefined && this.effectivenessListOne.estimatedPromotionalExpenses !=
  2582 + // '' && this.effectivenessListTwo
  2583 + // .estimatedPromotionalExpenses != '') {
  2584 + // let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
  2585 + // .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo
  2586 + // .estimatedPromotionalExpenses) * 100
2585 2587
2586 - this.effectivenessListOne.sumXuan = sum.toFixed(2)  
2587 - }  
2588 - if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo  
2589 - .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&  
2590 - this.effectivenessListTwo  
2591 - .otherNecessaryEstimates != '') {  
2592 - let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100  
2593 - this.effectivenessListOne.sumQi = sum.toFixed(2)  
2594 - }  
2595 - if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo  
2596 - .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this  
2597 - .effectivenessListTwo  
2598 - .totalCostEstimation != '') {  
2599 - let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100  
2600 - this.effectivenessListOne.sumAll = sum.toFixed(2)  
2601 - }  
2602 - // sumNei  
2603 - // sumWai  
2604 - // sumShop  
2605 - // sumSe  
2606 - // sumXuan  
2607 - // sumQi  
2608 - // sumAll  
2609 - // internalLaborCostEstimation  
2610 - // externalLaborCostEstimation  
2611 - // costEstimationGoods  
2612 - // setCostEstimate  
2613 - // estimatedPromotionalExpenses  
2614 - // otherNecessaryEstimates  
2615 - // totalCostEstimation  
2616 -  
2617 - }, 2588 + // this.effectivenessListOne.sumXuan = sum.toFixed(2)
  2589 + // }
  2590 + // if (this.effectivenessListOne.otherNecessaryEstimates != undefined && this.effectivenessListTwo
  2591 + // .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
  2592 + // this.effectivenessListTwo
  2593 + // .otherNecessaryEstimates != '') {
  2594 + // let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100
  2595 + // this.effectivenessListOne.sumQi = sum.toFixed(2)
  2596 + // }
  2597 + // if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
  2598 + // .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
  2599 + // .effectivenessListTwo
  2600 + // .totalCostEstimation != '') {
  2601 + // let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100
  2602 + // this.effectivenessListOne.sumAll = sum.toFixed(2)
  2603 + // }
  2604 + // // sumNei
  2605 + // // sumWai
  2606 + // // sumShop
  2607 + // // sumSe
  2608 + // // sumXuan
  2609 + // // sumQi
  2610 + // // sumAll
  2611 + // // internalLaborCostEstimation
  2612 + // // externalLaborCostEstimation
  2613 + // // costEstimationGoods
  2614 + // // setCostEstimate
  2615 + // // estimatedPromotionalExpenses
  2616 + // // otherNecessaryEstimates
  2617 + // // totalCostEstimation
  2618 +
  2619 + // },
2618 lichangeTwo(e) { 2620 lichangeTwo(e) {
2619 let msg = this.effectivenessList[e] 2621 let msg = this.effectivenessList[e]
2620 if (typeof msg.modifiedData == 'string') { 2622 if (typeof msg.modifiedData == 'string') {
@@ -2627,7 +2629,7 @@ @@ -2627,7 +2629,7 @@
2627 '' && this.effectivenessListTwo 2629 '' && this.effectivenessListTwo
2628 .internalLaborCostEstimation != '') { 2630 .internalLaborCostEstimation != '') {
2629 let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this 2631 let sum = (Number(this.effectivenessListTwo.internalLaborCostEstimation) - Number(this
2630 - .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListTwo 2632 + .effectivenessListOne.internalLaborCostEstimation) ) / Number(this.effectivenessListOne
2631 .internalLaborCostEstimation) * 100 2633 .internalLaborCostEstimation) * 100
2632 this.effectivenessListOne.sumNei = sum.toFixed(2) 2634 this.effectivenessListOne.sumNei = sum.toFixed(2)
2633 } 2635 }
@@ -2636,7 +2638,7 @@ @@ -2636,7 +2638,7 @@
2636 '' && this.effectivenessListTwo 2638 '' && this.effectivenessListTwo
2637 .externalLaborCostEstimation != '') { 2639 .externalLaborCostEstimation != '') {
2638 let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this 2640 let sum = (Number(this.effectivenessListTwo.externalLaborCostEstimation) - Number(this
2639 - .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListTwo 2641 + .effectivenessListOne.externalLaborCostEstimation)) / Number(this.effectivenessListOne
2640 .externalLaborCostEstimation) * 100 2642 .externalLaborCostEstimation) * 100
2641 this.effectivenessListOne.sumWai = sum.toFixed(2) 2643 this.effectivenessListOne.sumWai = sum.toFixed(2)
2642 2644
@@ -2646,7 +2648,7 @@ @@ -2646,7 +2648,7 @@
2646 .effectivenessListTwo 2648 .effectivenessListTwo
2647 .costEstimationGoods != '') { 2649 .costEstimationGoods != '') {
2648 let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne 2650 let sum = (Number(this.effectivenessListTwo.costEstimationGoods) - Number(this.effectivenessListOne
2649 - .costEstimationGoods)) / Number(this.effectivenessListTwo.costEstimationGoods) * 100 2651 + .costEstimationGoods)) / Number(this.effectivenessListOne.costEstimationGoods) * 100
2650 this.effectivenessListOne.sumShop = sum.toFixed(2) 2652 this.effectivenessListOne.sumShop = sum.toFixed(2)
2651 2653
2652 } 2654 }
@@ -2654,7 +2656,7 @@ @@ -2654,7 +2656,7 @@
2654 undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo 2656 undefined && this.effectivenessListOne.setCostEstimate != '' && this.effectivenessListTwo
2655 .setCostEstimate != '') { 2657 .setCostEstimate != '') {
2656 let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne 2658 let sum = (Number(this.effectivenessListTwo.setCostEstimate) - Number(this.effectivenessListOne
2657 - .setCostEstimate)) / Number(this.effectivenessListTwo.setCostEstimate) * 100 2659 + .setCostEstimate)) / Number(this.effectivenessListOne.setCostEstimate) * 100
2658 this.effectivenessListOne.sumSe = sum.toFixed(2) 2660 this.effectivenessListOne.sumSe = sum.toFixed(2)
2659 2661
2660 } 2662 }
@@ -2663,7 +2665,7 @@ @@ -2663,7 +2665,7 @@
2663 '' && this.effectivenessListTwo 2665 '' && this.effectivenessListTwo
2664 .estimatedPromotionalExpenses != '') { 2666 .estimatedPromotionalExpenses != '') {
2665 let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this 2667 let sum = (Number(this.effectivenessListTwo.estimatedPromotionalExpenses) - Number(this
2666 - .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListTwo 2668 + .effectivenessListOne.estimatedPromotionalExpenses)) / Number(this.effectivenessListOne
2667 .estimatedPromotionalExpenses) * 100 2669 .estimatedPromotionalExpenses) * 100
2668 2670
2669 this.effectivenessListOne.sumXuan = sum.toFixed(2) 2671 this.effectivenessListOne.sumXuan = sum.toFixed(2)
@@ -2672,14 +2674,14 @@ @@ -2672,14 +2674,14 @@
2672 .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' && 2674 .otherNecessaryEstimates != undefined && this.effectivenessListOne.otherNecessaryEstimates != '' &&
2673 this.effectivenessListTwo 2675 this.effectivenessListTwo
2674 .otherNecessaryEstimates != '') { 2676 .otherNecessaryEstimates != '') {
2675 - let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListTwo.otherNecessaryEstimates) * 100 2677 + let sum = (Number(this.effectivenessListTwo.otherNecessaryEstimates) - Number(this.effectivenessListOne.otherNecessaryEstimates)) / Number(this.effectivenessListOne.otherNecessaryEstimates) * 100
2676 this.effectivenessListOne.sumQi = sum.toFixed(2) 2678 this.effectivenessListOne.sumQi = sum.toFixed(2)
2677 } 2679 }
2678 if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo 2680 if (this.effectivenessListOne.totalCostEstimation != undefined && this.effectivenessListTwo
2679 .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this 2681 .totalCostEstimation != undefined && this.effectivenessListOne.totalCostEstimation != '' && this
2680 .effectivenessListTwo 2682 .effectivenessListTwo
2681 .totalCostEstimation != '') { 2683 .totalCostEstimation != '') {
2682 - let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListTwo.totalCostEstimation) * 100 2684 + let sum = (Number(this.effectivenessListTwo.totalCostEstimation) - Number(this.effectivenessListOne.totalCostEstimation)) / Number(this.effectivenessListOne.totalCostEstimation) * 100
2683 this.effectivenessListOne.sumAll = sum.toFixed(2) 2685 this.effectivenessListOne.sumAll = sum.toFixed(2)
2684 } 2686 }
2685 // sumNei 2687 // sumNei
admin-web-master/src/views/serve/actSp.vue
  View file @3a1f257
@@ -59,13 +59,15 @@ @@ -59,13 +59,15 @@
59 <template slot-scope="scope"> 59 <template slot-scope="scope">
60 <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div> 60 <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
61 <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">审核</div> 61 <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">审核</div>
  62 + <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
62 <div @click="Qcode(scope.row)" class="tableBtn greens" >活动二维码</div> 63 <div @click="Qcode(scope.row)" class="tableBtn greens" >活动二维码</div>
63 </template> 64 </template>
64 </el-table-column> 65 </el-table-column>
65 </el-table> 66 </el-table>
66 <div class="fenye"> 67 <div class="fenye">
  68 + <div style="line-height: 200%;">共{{total}}条</div>
67 <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage" 69 <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
68 - :page-sizes="[10, 20, 50, 100]" layout="total,prev, pager,next" :total="total " 70 + :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total "
69 @size-change="handleSizeChange" @current-change="handleCurrentChange" /> 71 @size-change="handleSizeChange" @current-change="handleCurrentChange" />
70 </div> 72 </div>
71 </div> 73 </div>
@@ -276,6 +278,42 @@ @@ -276,6 +278,42 @@
276 </div> 278 </div>
277 279
278 </el-dialog> 280 </el-dialog>
  281 + <!-- 报名名单 -->
  282 + <el-dialog :visible.sync="baoming" title="报名名单" style="padding: 0;" width="55%" center
  283 + :close-on-click-modal="false" :show-close="false">
  284 + <div style="padding:20px;">
  285 + <div style="padding:20px;">
  286 + <el-table :data="mingList"
  287 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  288 + <el-table-column label="序号" min-width="150">
  289 + <template slot-scope="scope">
  290 + {{scope.$index +1 }}
  291 + </template>
  292 + </el-table-column>
  293 + <el-table-column label="联系人" prop="signUpName" min-width="150">
  294 +
  295 + </el-table-column>
  296 + <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
  297 +
  298 + </el-table-column>
  299 + <el-table-column label="报名时间" prop="signUpTime" min-width="150">
  300 +
  301 + </el-table-column>
  302 + </el-table>
  303 + <div class="fenye">
  304 + <div style="line-height: 200%;">共{{mingtotal}}条</div>
  305 + <el-pagination :hide-on-single-page='flag' background :current-page="actPage.pageNumber"
  306 + layout="prev, pager, next" :total="mingtotal"
  307 + @current-change="mingChange" />
  308 + </div>
  309 + </div>
  310 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  311 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  312 + @click="baoming =false">返回</el-button>
  313 + </div>
  314 + </div>
  315 +
  316 + </el-dialog>
279 </div> 317 </div>
280 </template> 318 </template>
281 319
@@ -285,7 +323,8 @@ @@ -285,7 +323,8 @@
285 actSpAdd, 323 actSpAdd,
286 actSpEdit, 324 actSpEdit,
287 actSpDel, 325 actSpDel,
288 - QRcode 326 + QRcode,
  327 + Registration
289 } from '../../api/actSp.js' 328 } from '../../api/actSp.js'
290 import wangEditor from "@/components/editor/index" 329 import wangEditor from "@/components/editor/index"
291 import upimg from "@/components/ImageUpload/index" 330 import upimg from "@/components/ImageUpload/index"
@@ -329,7 +368,16 @@ @@ -329,7 +368,16 @@
329 liuYe:3,//3通过or4驳回 368 liuYe:3,//3通过or4驳回
330 Liunie:false, 369 Liunie:false,
331 showQF:false, 370 showQF:false,
332 - qfUrl:'' 371 + qfUrl:'',
  372 + mingList:[],
  373 + mingtotal:0,
  374 + baoming:false,
  375 + actPage:{
  376 + activityApplicationId:'',
  377 + pageNumber:0,
  378 + pageSize:10,
  379 + }
  380 +
333 } 381 }
334 }, 382 },
335 383
@@ -415,6 +463,22 @@ this.total = res.data.content.length @@ -415,6 +463,22 @@ this.total = res.data.content.length
415 this.qfUrl = res.data 463 this.qfUrl = res.data
416 }) 464 })
417 }, 465 },
  466 + async getMing(ids) {
  467 + this.actPage.activityApplicationId=ids
  468 + this.actPage.pageNumber = 0
  469 + const res = await Registration(this.actPage)
  470 + this.mingList = res.data.content
  471 + this.mingtotal = res.totalElements
  472 +
  473 + this.baoming = true
  474 +
  475 + },
  476 + async mingChange(val){
  477 + this.actPage.pageNumber = val
  478 + const res = await Registration(this.actPage)
  479 + this.mingList = res.data.content
  480 + this.mingtotal = res.totalElements
  481 + }
418 } 482 }
419 } 483 }
420 </script> 484 </script>
@@ -453,7 +517,7 @@ this.total = res.data.content.length @@ -453,7 +517,7 @@ this.total = res.data.content.length
453 .fenye { 517 .fenye {
454 margin-top: 20px; 518 margin-top: 20px;
455 display: flex; 519 display: flex;
456 - justify-content: flex-end; 520 + justify-content: space-between;
457 position: relative; 521 position: relative;
458 } 522 }
459 523
ceres-uniapp-master/components/canvasShow/basics/banner.vue
  View file @3a1f257
1 <template> 1 <template>
2 <div class="banner" :class="'terminal' + terminal"> 2 <div class="banner" :class="'terminal' + terminal">
3 <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange"> 3 <swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="true" :style="{'height':bannerHeight + 'rpx'}" @change="swiperChange">
4 - <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url('item.imageUrl +')'}" @click="jumpLink(item.jumpUrl)"> 4 + <swiper-item class="banner-item" v-for="(item,index) in bannerList" :key="index" :style="{backgroundImage: 'url(item.imageUrl)'}" @click="jumpLink(item.jumpUrl)">
5 <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src="item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div> 5 <div class="a-link" @click="jumpLink(item.jumpUrl)"><img class="img" :src="item.imageUrl" v-show="item.imageUrl" mode="widthFix"></div>
6 </swiper-item> 6 </swiper-item>
7 </swiper> 7 </swiper>
ceres-uniapp-master/config/api.js
  View file @3a1f257
1 1
2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' 2 // const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'
3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' 3 // const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
4 -// const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'  
5 -// const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'  
6 -// const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/' 4 +const DOMAIN_PREFIXPING = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'
  5 +const DOMAIN_PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'
  6 +const TIAOZHUAN = 'https://zhgw-uat.028wlkj.com/cdwlMall/'
7 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' 7 // const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/'
8 // const DOMAIN_PREFIXPING = 'http://128.10.249.8:9003' 8 // const DOMAIN_PREFIXPING = 'http://128.10.249.8:9003'
9 // const DOMAIN_PREFIX = 'http://128.10.249.8:9007' 9 // const DOMAIN_PREFIX = 'http://128.10.249.8:9007'
10 -const host = `${window.location.protocol}//${window.location.host}`  
11 -const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`  
12 -const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`  
13 -const TIAOZHUAN = `${host}/cdwlMall/` 10 +// const host = `${window.location.protocol}//${window.location.host}`
  11 +// const DOMAIN_PREFIXPING = `${host}/cdwlMall/meserver/admin-server`
  12 +// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api`
  13 +// const TIAOZHUAN = `${host}/cdwlMall/`
14 14
15 15
16 16
ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
  View file @3a1f257
@@ -35,7 +35,7 @@ export default { @@ -35,7 +35,7 @@ export default {
35 methods: { 35 methods: {
36 goToOrder() { 36 goToOrder() {
37 uni.navigateTo({ 37 uni.navigateTo({
38 - url: '../orderModule/index?type=0' 38 + url: '/pages_category_page1/orderModule/index'
39 }) 39 })
40 }, 40 },
41 goToHome() { 41 goToHome() {
ceres-uniapp-master/pages_category_page1/goodsModule/userEvaluate.vue
  View file @3a1f257
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 > 31 >
32 <view class="evaluate-content flex-items flex-row flex-sp-between "> 32 <view class="evaluate-content flex-items flex-row flex-sp-between ">
33 <view class="flex-items"> 33 <view class="flex-items">
34 - <image class="user-headSmallImg u-skeleton-circle" v-if="item.headImage" :src="item.headImage"></image> 34 + <image class="user-headSmallImg u-skeleton-circle" v-if="item.headImage" :src="$baseURL+item.headImage"></image>
35 <image class="user-headSmallImg u-skeleton-circle" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/storeLogo.png" v-else></image> 35 <image class="user-headSmallImg u-skeleton-circle" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/storeLogo.png" v-else></image>
36 <view class="skuValue u-skeleton-fillet"> 36 <view class="skuValue u-skeleton-fillet">
37 <label class="fs28" v-if="item.name">{{item.name}}</label> 37 <label class="fs28" v-if="item.name">{{item.name}}</label>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 > 95 >
96 <view class="evaluate-content flex-column" @click="commentDetails(index)" > 96 <view class="evaluate-content flex-column" @click="commentDetails(index)" >
97 <view class="flex-items"> 97 <view class="flex-items">
98 - <image class="user-headSmallImg" v-if="item.headImage" :src="item.headImage"></image> 98 + <image class="user-headSmallImg" v-if="item.headImage" :src="$baseURL+item.headImage"></image>
99 <image class="user-headSmallImg" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/storeLogo.png" v-else></image> 99 <image class="user-headSmallImg" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/storeLogo.png" v-else></image>
100 <label class="fs28 mar-left-20" v-if="item.name">{{item.name}}</label> 100 <label class="fs28 mar-left-20" v-if="item.name">{{item.name}}</label>
101 <label class="fs28 mar-left-20" v-else>匿名</label> 101 <label class="fs28 mar-left-20" v-else>匿名</label>
ceres-uniapp-master/pages_category_page1/store/index.vue
  View file @3a1f257
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </view> 41 </view>
42 </view> 42 </view>
43 </view> 43 </view>
44 - <view class="distributorBox flex-items flex-sp-between" @click="applyForRecruit"> 44 + <!-- <view class="distributorBox flex-items flex-sp-between" @click="applyForRecruit">
45 <view class="distributor"> 45 <view class="distributor">
46 <view class="flex-display flex-items"> 46 <view class="flex-display flex-items">
47 <image class="item-btn-icon" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//user/fenxiao2.png" 47 <image class="item-btn-icon" src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/img//user/fenxiao2.png"
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <view class="rightArrow"> 52 <view class="rightArrow">
53 <image src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/arrowRight.png"></image> 53 <image src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/arrowRight.png"></image>
54 </view> 54 </view>
55 - </view> 55 + </view> -->
56 <!-- <scroll-view style="white-space: nowrap;width: 100%;" scroll-x="true"> 56 <!-- <scroll-view style="white-space: nowrap;width: 100%;" scroll-x="true">
57 <view style="display: inline-block;" v-for="item of conlist" @click="couponshow = true"> 57 <view style="display: inline-block;" v-for="item of conlist" @click="couponshow = true">
58 <view class="couponItem u-skeleton-fillet flex-items" style="margin-right: 20rpx;" > 58 <view class="couponItem u-skeleton-fillet flex-items" style="margin-right: 20rpx;" >
lvdao-miniapp/pages.json
  View file @3a1f257
@@ -163,7 +163,7 @@ @@ -163,7 +163,7 @@
163 { 163 {
164 "path": "pages/mycreated/mycreated", 164 "path": "pages/mycreated/mycreated",
165 "style": { 165 "style": {
166 - "navigationBarTitleText": "我的活动申请", 166 + "navigationBarTitleText": "我的活动",
167 "navigationBarBackgroundColor": "#FFFFFF", 167 "navigationBarBackgroundColor": "#FFFFFF",
168 "enablePullDownRefresh": true 168 "enablePullDownRefresh": true
169 } 169 }
lvdao-miniapp/pages/activityDetail/activityDetail.scss
  View file @3a1f257
@@ -33,6 +33,9 @@ @@ -33,6 +33,9 @@
33 // 活动信息 33 // 活动信息
34 .info-box { 34 .info-box {
35 margin-top: 30rpx; 35 margin-top: 30rpx;
  36 + background-color: #FFFFFF;
  37 + padding: 20px;
  38 + border-radius: 10px;
36 .title { 39 .title {
37 font-weight: 700; 40 font-weight: 700;
38 color: #3D3D3D; 41 color: #3D3D3D;
@@ -45,3 +48,30 @@ @@ -45,3 +48,30 @@
45 } 48 }
46 } 49 }
47 50
  51 +/* 底部 */
  52 +.page-footer{
  53 + position: fixed;
  54 + left: 0;
  55 + bottom: 0;
  56 + // display: flex;
  57 + // align-items: center;
  58 + // justify-content: center;
  59 + width: 100%;
  60 + height: 125rpx;
  61 + background-color: #FFFFFF;
  62 + padding-bottom: constant(safe-area-inset-bottom);
  63 + padding-bottom: env(safe-area-inset-bottom);
  64 + .footer-btn {
  65 + padding: 0 20px;
  66 + margin-top: 20rpx;
  67 + }
  68 + .footer-service {
  69 + display: flex;
  70 + flex-direction: column;
  71 + align-items: center;
  72 + text {
  73 + margin-top: 6rpx;
  74 + line-height: 42rpx;
  75 + }
  76 + }
  77 +}
lvdao-miniapp/pages/activityDetail/activityDetail.vue
  View file @3a1f257
@@ -22,6 +22,25 @@ @@ -22,6 +22,25 @@
22 <view class="info-item">活动类型：{{tableData.activityType}}</view> 22 <view class="info-item">活动类型：{{tableData.activityType}}</view>
23 </view> 23 </view>
24 </view> 24 </view>
  25 + <!-- 底部 -->
  26 + <!-- <view style="height: 125rpx;"></view> -->
  27 + <view class="page-footer" v-if="tableData.auditStatus == 3">
  28 + <view class="footer-btn">
  29 + <u-button type="success" @click="baoShow">报名参加</u-button>
  30 + </view>
  31 + </view>
  32 + <u-popup class="userForm" v-model="joinShow" mode="center" border-radius="20" :closeable="true" width="90%" >
  33 + <view style="padding: 30rpx;">
  34 + <u-form class="form-box" :model="form" ref="uForm" :label-width="120" >
  35 + <view style="padding: 10rpx;">
  36 + <view class="title">请填写您的报名信息</view>
  37 + <u-form-item label="*姓名"><u-input v-model="form.signUpName" /></u-form-item>
  38 + <u-form-item label="*电话"><u-input v-model="form.signUpPhone" /></u-form-item>
  39 + <u-button type="success" @click="submit">提交</u-button>
  40 + </view>
  41 + </u-form>
  42 + </view>
  43 + </u-popup>
25 </view> 44 </view>
26 </template> 45 </template>
27 46
@@ -40,8 +59,8 @@ export default { @@ -40,8 +59,8 @@ export default {
40 ], 59 ],
41 joinShow: false, 60 joinShow: false,
42 form: { 61 form: {
43 - name: '',  
44 - pahone: '', 62 + signUpName: '',
  63 + signUpPhone: '',
45 }, 64 },
46 pagesize: { 65 pagesize: {
47 id:'', 66 id:'',
@@ -88,17 +107,74 @@ export default { @@ -88,17 +107,74 @@ export default {
88 107
89 }, 108 },
90 methods: { 109 methods: {
91 - submit() {  
92 - this.joinShow = false;  
93 - uni.switchTab({  
94 - url: '/pages/home/home'  
95 - })  
96 - }, 110 + baoShow(){
  111 + this.joinShow = true
  112 + this.form.signUpName = ''
  113 + this.form.signUpPhone = ''
  114 + },
  115 + submit() {
  116 + if (!this.form.signUpName) {
  117 + uni.showToast({
  118 + icon: 'none',
  119 + title: '请输入姓名'
  120 + });
  121 + return
  122 + }
  123 +
  124 +
  125 + if (!this.form.signUpPhone) {
  126 + uni.showToast({
  127 + icon: 'none',
  128 + title: '请输入联系电话'
  129 + });
  130 + return
  131 + }
  132 + this.form.signUpTime = this.getCurrentDateTime()
  133 + this.$http.sendRequest('/cereActivityApplicationSignUp/insert', 'POST',this.form,3).then(res => {
  134 + console.log('res',res.data)
  135 + if(res.data.code == '200'){
  136 + setTimeout(()=>{
  137 + uni.switchTab({
  138 + url: '/pages/home/home'
  139 + })
  140 + },1000)
  141 + }else{
  142 +
  143 + }
  144 + // uni.showToast({
  145 + // title: res.data.data,
  146 + // duration: 2000,
  147 +
  148 + // })
  149 + // this.$refs.uToast.show({
  150 + // title: res.data.data,
  151 + // url: '/pages/home/home'
  152 + // })
  153 + // uni.switchTab({
  154 + // url: '/pages/home/home'
  155 + // })
  156 + })
  157 + this.joinShow = false
  158 +
  159 +
  160 + },
  161 +
97 leaseAdd(){ 162 leaseAdd(){
98 uni.navigateTo({ 163 uni.navigateTo({
99 url: '/pages/leaseAdd/leaseAdd' 164 url: '/pages/leaseAdd/leaseAdd'
100 }) 165 })
101 }, 166 },
  167 + getCurrentDateTime() {
  168 + const now = new Date();
  169 + const year = now.getFullYear();
  170 + const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的，所以需要+1
  171 + const day = String(now.getDate()).padStart(2, '0');
  172 + const hours = String(now.getHours()).padStart(2, '0');
  173 + const minutes = String(now.getMinutes()).padStart(2, '0');
  174 + const seconds = String(now.getSeconds()).padStart(2, '0');
  175 +
  176 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  177 + },
102 } 178 }
103 }; 179 };
104 </script> 180 </script>
lvdao-miniapp/pages/workbench/workbench.vue
  View file @3a1f257
@@ -180,9 +180,11 @@ @@ -180,9 +180,11 @@
180 }, 180 },
181 // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, 181 // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' },
182 { 182 {
183 - name: '活动参与', 183 + name: '我的活动',
184 img: '/wdhd.png', 184 img: '/wdhd.png',
185 - path: '/pages/participation/participation' 185 + path: '/pages/mycreated/mycreated'
  186 +
  187 + // path: '/pages/participation/participation'
186 }, 188 },
187 { 189 {
188 name: '活动申请', 190 name: '活动申请',
lvdao-miniapp/pagesA/application/application.vue
  View file @3a1f257
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class="voucher-img"> 12 <view class="voucher-img">
13 <view class="voucher-list" style="width: 100%;"> 13 <view class="voucher-list" style="width: 100%;">
14 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;"> 14 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
15 - <textarea name="" id="" cols="30" rows="7" placeholder="请输入" 15 + <textarea name="" id="" cols="30" rows="4" placeholder="请输入"
16 style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;" 16 style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;"
17 v-model="rulform.schemeTitle"></textarea> 17 v-model="rulform.schemeTitle"></textarea>
18 </view> 18 </view>
lvdao-miniapp/utils/request.js
  View file @3a1f257
1 1
2 // let hostall = window.location.href; 2 // let hostall = window.location.href;
3 // let c1 = hostall.split('cdwlMall')[0]; 3 // let c1 = hostall.split('cdwlMall')[0];
4 -let c1 = 'https://jy.scjysm.asia:18086/'  
5 -// let c1 = 'https://zhgw-uat.028wlkj.com/' 4 +// let c1 = 'https://jy.scjysm.asia:18086/'
  5 +let c1 = 'https://zhgw-uat.028wlkj.com/'
6 //封装request请求 6 //封装request请求
7 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { 7 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
8 //判断header提交数据类型 8 //判断header提交数据类型
@@ -24,7 +24,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -24,7 +24,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
24 // bases = 'http://128.10.249.20:9003'+ url; 24 // bases = 'http://128.10.249.20:9003'+ url;
25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; 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 }else if(baseUrl == 3){ 29 }else if(baseUrl == 3){
30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
merchant-web-master/dist.zip deleted
View file @0fb84c2
No preview for this file type
merchant-web-master/src/utils/request.js
  View file @3a1f257
@@ -19,7 +19,8 @@ let PREFIX; @@ -19,7 +19,8 @@ let PREFIX;
19 if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){ 19 if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
20 // 其他情况的默认值 20 // 其他情况的默认值
21 // PREFIX = 'http://8.130.38.56:8027/business-server'; 21 // PREFIX = 'http://8.130.38.56:8027/business-server';
22 - PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; 22 + PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
  23 + // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
23 // PREFIX = 'http://128.10.249.8:9004'; 24 // PREFIX = 'http://128.10.249.8:9004';
24 }else{ 25 }else{
25 // PREFIX = '/merchant-business'; 26 // PREFIX = '/merchant-business';
merchant-web-master/src/utils/request2.js
  View file @3a1f257
@@ -18,10 +18,10 @@ let hostall = window.location.href; @@ -18,10 +18,10 @@ let hostall = window.location.href;
18 let PREFIX; 18 let PREFIX;
19 if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){ 19 if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'|| host == 'localhost:9530'){
20 // 其他情况的默认值 20 // 其他情况的默认值
21 - // PREFIX = 'http://8.130.38.56:8027/business-server';  
22 - // PREFIX = 'https://jy.scjysm.asia:18086/merchant-business';  
23 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'; 21 // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api';
24 - PREFIX = 'http://128.10.249.48:9007'; 22 + PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api';
  23 +
  24 + // PREFIX = 'http://128.10.249.48:9007';
25 }else{ 25 }else{
26 // PREFIX = '/merchant-business'; 26 // PREFIX = '/merchant-business';
27 // PREFIX = 'http://8.130.38.56:9004'; 27 // PREFIX = 'http://8.130.38.56:9004';
merchant-web-master/src/views/commodity/commoditySystem/addCommodity copy.vue
  View file @3a1f257
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 <el-form-item class="form-item-long" label="供应商"> 85 <el-form-item class="form-item-long" label="供应商">
86 <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" /> 86 <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
87 </el-form-item> 87 </el-form-item>
88 - <el-form-item class="form-item-long" label="成本价(/元)" prop="cost"> 88 + <el-form-item class="form-item-long" label="成本价（元）" prop="cost">
89 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" /> 89 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
90 </el-form-item> 90 </el-form-item>
91 <el-form-item label="需要物流" prop="ifLogistics"> 91 <el-form-item label="需要物流" prop="ifLogistics">
merchant-web-master/src/views/commodity/commoditySystem/addCommodity.vue
  View file @3a1f257
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 </el-form-item> 72 </el-form-item>
73 </el-col> 73 </el-col>
74 <el-col :span="12"> 74 <el-col :span="12">
75 - <el-form-item class="form-item-long" label="成本价(/元)" prop="cost"> 75 + <el-form-item class="form-item-long" label="成本价（元）" prop="cost">
76 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" /> 76 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
77 </el-form-item> 77 </el-form-item>
78 </el-col> 78 </el-col>
@@ -148,8 +148,9 @@ @@ -148,8 +148,9 @@
148 <div style="padding: 20px;"> 148 <div style="padding: 20px;">
149 <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button> 149 <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
150 <el-button v-if="active" style="background-color: #3F9B6A;color: #fff" @click="next">下一步</el-button> 150 <el-button v-if="active" style="background-color: #3F9B6A;color: #fff" @click="next">下一步</el-button>
  151 + <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="last">上一步</el-button>
151 <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="save">保存</el-button> 152 <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="save">保存</el-button>
152 - <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="last">上一步</el-button> 153 +
153 </div> 154 </div>
154 </div> 155 </div>
155 </template> 156 </template>
merchant-web-master/src/views/commodity/commoditySystem/addComponent.vue
  View file @3a1f257
@@ -43,13 +43,13 @@ @@ -43,13 +43,13 @@
43 <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" /> 43 <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" />
44 </template> 44 </template>
45 </el-table-column> 45 </el-table-column>
46 - <el-table-column label="售价(/元)"> 46 + <el-table-column label="售价（元）">
47 <template slot-scope="scope"> 47 <template slot-scope="scope">
48 <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> --> 48 <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
49 <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" /> 49 <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
50 </template> 50 </template>
51 </el-table-column> 51 </el-table-column>
52 - <el-table-column label="原价(/元)"> 52 + <el-table-column label="原价（元）">
53 <template slot-scope="scope"> 53 <template slot-scope="scope">
54 <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> --> 54 <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
55 <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" /> 55 <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
merchant-web-master/src/views/salesSta/dataSta.vue
  View file @3a1f257
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 29
30 销售总额 30 销售总额
31 </template> 31 </template>
32 - ￥{{tongji.transactionsCompleted + tongji.invalidOrderAmount}} 32 + ￥{{(tongji.transactionsCompleted + tongji.invalidOrderAmount).toFixed(2)}}
33 </el-descriptions-item> 33 </el-descriptions-item>
34 <el-descriptions-item> 34 <el-descriptions-item>
35 <template slot="label"> 35 <template slot="label">
merchant-web-master/src/views/stockControl/inventory/addCommodity.vue
  View file @3a1f257
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 </el-form-item> 72 </el-form-item>
73 </el-col> 73 </el-col>
74 <el-col :span="12"> 74 <el-col :span="12">
75 - <el-form-item class="form-item-long" label="成本价(/元)" prop="cost"> 75 + <el-form-item class="form-item-long" label="成本价（元）" prop="cost">
76 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" /> 76 <el-input v-model.number="form.cost" type="number" maxlength="10" show-word-limit placeholder="请输入成本价" />
77 </el-form-item> 77 </el-form-item>
78 </el-col> 78 </el-col>
@@ -148,8 +148,9 @@ @@ -148,8 +148,9 @@
148 <div style="padding: 20px;"> 148 <div style="padding: 20px;">
149 <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button> 149 <el-button v-if="active" class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="back">取消</el-button>
150 <el-button v-if="active" style="background-color: #3F9B6A;color: #fff" @click="next">下一步</el-button> 150 <el-button v-if="active" style="background-color: #3F9B6A;color: #fff" @click="next">下一步</el-button>
  151 + <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="last">上一步</el-button>
151 <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="save">保存</el-button> 152 <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="save">保存</el-button>
152 - <el-button v-if="!active" style="background-color: #3F9B6A;color: #fff" @click="last">上一步</el-button> 153 +
153 </div> 154 </div>
154 </div> 155 </div>
155 </template> 156 </template>
merchant-web-master/src/views/stockControl/inventory/addComponent.vue
  View file @3a1f257
@@ -43,13 +43,13 @@ @@ -43,13 +43,13 @@
43 <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" /> 43 <el-input v-model="singleStyle.skuValue" :sss="scope" maxlength="40" />
44 </template> 44 </template>
45 </el-table-column> 45 </el-table-column>
46 - <el-table-column label="售价(/元)"> 46 + <el-table-column label="售价（元）">
47 <template slot-scope="scope"> 47 <template slot-scope="scope">
48 <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> --> 48 <!-- <el-input v-model="scope.row.price" type="number" oninput="value=value.replace(/-/, '')" /> -->
49 <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" /> 49 <el-input-number v-model="scope.row.price" :controls="false" :min="0" :precision="2" :step="0.01" />
50 </template> 50 </template>
51 </el-table-column> 51 </el-table-column>
52 - <el-table-column label="原价(/元)"> 52 + <el-table-column label="原价（元）">
53 <template slot-scope="scope"> 53 <template slot-scope="scope">
54 <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> --> 54 <!-- <el-input v-model="scope.row.originalPrice" type="number" oninput="value=value.replace(/-/, '')" /> -->
55 <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" /> 55 <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
merchant-web-master/src/views/stockControl/stocksForewarn/index.vue
  View file @3a1f257
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </template> 61 </template>
62 </el-table-column> 62 </el-table-column>
63 <el-table-column prop="productName" label="商品名称" min-width="10%" /> 63 <el-table-column prop="productName" label="商品名称" min-width="10%" />
64 - <el-table-column 64 + <!-- <el-table-column
65 prop="stockNumber" 65 prop="stockNumber"
66 label="属性" 66 label="属性"
67 show-overflow-tooltip 67 show-overflow-tooltip
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <template slot-scope="scope"> 69 <template slot-scope="scope">
70 属性:1 70 属性:1
71 </template> 71 </template>
72 - </el-table-column> 72 + </el-table-column> -->
73 <el-table-column 73 <el-table-column
74 prop="stockNumber" 74 prop="stockNumber"
75 label="库存数量" 75 label="库存数量"