diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 3a778cb..ce1f8c1 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; // baseURL = 'http://172.16.61.125:9003'; - baseURL = 'http://128.10.249.206:9003'; + // baseURL = 'http://128.10.249.206:9003'; // baseURL = 'http://10.0.0.51:9003'; diff --git a/admin-web-master/src/views/activity/activitySp.vue b/admin-web-master/src/views/activity/activitySp.vue index 39abd3b..ba7d9c8 100644 --- a/admin-web-master/src/views/activity/activitySp.vue +++ b/admin-web-master/src/views/activity/activitySp.vue @@ -777,13 +777,15 @@ + v-if="zhixingBian" /> +
{{ zhixingList.planName }}
+ v-if="zhixingBian" /> +
{{ zhixingList.eventAddrs }}
@@ -792,10 +794,12 @@ prop="event_start_time" style="position: relative"> + end-placeholder="结束日期" > + +
{{ zhixingList.planTime[0]}}-{{ zhixingList.planTime[1]}}
@@ -804,14 +808,16 @@ + v-if="zhixingBian" /> +
{{ zhixingList.sponsor }}
+ v-if="zhixingBian" /> +
{{ zhixingList.participants }}
@@ -877,21 +883,24 @@ + placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.internalLaborCostEstimation }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.externalLaborCostEstimation }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.costEstimationGoods }}
@@ -900,19 +909,22 @@ + v-if="zhixingBian" /> +
{{ zhixingList.setCostEstimate }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.estimatedPromotionalExpenses }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.otherNecessaryEstimates }}
@@ -921,13 +933,15 @@ + placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.totalCostEstimation }}
+ v-if="zhixingBian" /> +
{{ zhixingList.notes }}
@@ -951,20 +965,23 @@ + placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.expectedAttractTraffic }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.expectedParticipation }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.expectedDirectBenefits }}
@@ -972,7 +989,8 @@ + placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.expectedIndirectBenefits }}
diff --git a/admin-web-master/src/views/activity/index.vue b/admin-web-master/src/views/activity/index.vue index ce1f909..f2a130f 100644 --- a/admin-web-master/src/views/activity/index.vue +++ b/admin-web-master/src/views/activity/index.vue @@ -776,13 +776,16 @@ + v-if="zhixingBian" /> +
{{ zhixingList.planName }}
+
+ v-if="zhixingBian"/> +
{{ zhixingList.eventAddrs }}
@@ -791,9 +794,10 @@ prop="event_start_time" style="position: relative"> + v-if="zhixingBian" type="datetimerange" range-separator="至" + start-placeholder="开始日期" end-placeholder="结束日期" > +
{{ zhixingList.planTime[0] }}-{{ zhixingList.planTime[1] }}
@@ -802,13 +806,15 @@ + v-if="zhixingBian" /> +
{{ zhixingList.eventAddrs }}
+ v-if="zhixingBian" /> +
{{ zhixingList.participants }}
@@ -872,21 +878,25 @@ + + placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.internalLaborCostEstimation }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.externalLaborCostEstimation }}
+ v-if="zhixingBian" /> +
{{ zhixingList.costEstimationGoods }}
@@ -895,19 +905,22 @@ + v-if="zhixingBian" /> +
{{ zhixingList.setCostEstimate }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.estimatedPromotionalExpenses }}
+ placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.otherNecessaryEstimates }}
@@ -916,13 +929,15 @@ + v-if="zhixingBian" /> +
{{ zhixingList.totalCostEstimation }}
+ v-if="zhixingBian" /> +
{{ zhixingList.notes }}
@@ -946,20 +961,23 @@ + v-if="zhixingBian" /> +
{{ zhixingList.expectedAttractTraffic }}
+ v-if="zhixingBian" /> +
{{ zhixingList.expectedParticipation }}
+ v-if="zhixingBian" /> +
{{ zhixingList.expectedDirectBenefits }}
@@ -967,7 +985,8 @@ + placeholder="请输入" v-if="zhixingBian" /> +
{{ zhixingList.expectedIndirectBenefits }}
diff --git a/admin-web-master/src/views/media/mediaMana.vue b/admin-web-master/src/views/media/mediaMana.vue index a9e1867..38df269 100644 --- a/admin-web-master/src/views/media/mediaMana.vue +++ b/admin-web-master/src/views/media/mediaMana.vue @@ -26,7 +26,7 @@ 新增 删除 - 效果对比 + @@ -89,7 +89,7 @@
修改
提交审核
-
执行情况及效果评估
+ diff --git a/admin-web-master/src/views/member/memberList/index.vue b/admin-web-master/src/views/member/memberList/index.vue index d9e2593..5afc129 100644 --- a/admin-web-master/src/views/member/memberList/index.vue +++ b/admin-web-master/src/views/member/memberList/index.vue @@ -83,14 +83,14 @@ - - + + - +