From e8237f2e1e56ab21e0d0eb5ea425cccc3b093c69 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Wed, 26 Feb 2025 10:32:39 +0800
Subject: [PATCH] 最新

---
 admin-web-master/src/components/add/addyixiang.vue     | 17 ++++++++---------
 admin-web-master/src/utils/request.js                  |  2 +-
 admin-web-master/src/views/customer/icReview/index.vue |  4 ++--
 admin-web-master/src/views/customer/rUser/index.vue    | 18 +++++++++---------
 wenjuan-pc/src/views/investigation/index.vue           |  7 ++++++-
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/admin-web-master/src/components/add/addyixiang.vue b/admin-web-master/src/components/add/addyixiang.vue
index b21a112..c378eff 100644
--- a/admin-web-master/src/components/add/addyixiang.vue
+++ b/admin-web-master/src/components/add/addyixiang.vue
@@ -377,8 +377,7 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <!-- v-if='info.auditStatus == 1' -->
-    <div v-if="info.auditStatus == 1  && issp == '2'">
+    <div v-if="info.intentionStatus != '2'  && info.intentionStatus != '3' && issp == '2' ">
       <!-- <div style="padding-left: 130px;margin: 25px 0;">
         <el-radio v-model="radio" label="2">同意</el-radio>
         <el-radio v-model="radio" label="3">拒绝</el-radio>
@@ -390,28 +389,28 @@
           <el-radio v-model="radio" label="2">有意向</el-radio>
           <el-radio v-model="radio" label="3">无意向</el-radio>
         </el-form-item>
-          <el-form-item label="审核意见">
+          <el-form-item label="意向原因">
             <el-input maxlength="200" show-word-limit rows="4" v-model="info.auditSuggestions" placeholder="请输入审核意见"
               type="textarea" />
           </el-form-item>
         </el-form>
       </div>
     </div>
-    <div v-if="info.auditStatus == '2' || info.auditStatus == '3'">
+    <div v-if="info.intentionStatus == '2' || info.intentionStatus == '3'">
       <TitleWithCircle title="审核结果"/>
       <div style="padding: 20px;">
         <el-form :model="info" label-width="100px" class="demo-ruleForm">
           <el-form-item label="状态">
-            <div class="duiqi">{{info.auditStatus=='2'?'有意向':info.auditStatus=='3'?'无意向':'无'}}</div>
+            <div class="duiqi">{{info.intentionStatus=='2'?'有意向':info.intentionStatus=='3'?'无意向':'无'}}</div>
           </el-form-item>
           <el-form-item label="意向原因">
-            <div class="duiqi">{{info.auditSuggestions || '无'}}</div>
+            <div class="duiqi">{{info.intentionReason || '无'}}</div>
           </el-form-item>
         </el-form>
       </div>
     </div>
     <div>
-      <el-button v-if="info.auditStatus == 1 && issp == '2'" @click="minSev"
+      <el-button v-if="info.intentionStatus != '2'  && info.intentionStatus != '3' && issp == '2'" @click="minSev"
         style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       <el-button class="buttonHover"
         style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
@@ -506,7 +505,7 @@
 
         msgedit({
           id: this.info.id,
-          'auditStatus': this.radio,
+          'intentionStatus': this.radio,
           auditSuggestions: this.info.auditSuggestions
         }).then(res => {
           console.error(res)
@@ -515,7 +514,7 @@
               message: '处理成功',
               type: 'success'
             })
-            this.info.auditStatus = this.radio
+            this.info.intentionStatus = this.radio
           } else {
             this.$message({
               message: '处理失败',
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 2878793..cfa4e91 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -18,7 +18,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'http://128.10.250.186:9003';
+  baseURL = 'http://128.10.250.134:9003';
 
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
diff --git a/admin-web-master/src/views/customer/icReview/index.vue b/admin-web-master/src/views/customer/icReview/index.vue
index 72841f8..b1164f6 100644
--- a/admin-web-master/src/views/customer/icReview/index.vue
+++ b/admin-web-master/src/views/customer/icReview/index.vue
@@ -75,9 +75,9 @@
               {{scope.row.applicationTime}}
             </template>
           </el-table-column>
-          <el-table-column label="状态"  porp='auditStatus'>
+          <el-table-column label="状态"  porp='intentionStatus'>
             <template slot-scope="scope">
-              {{scope.row.auditStatus =='1'?'待审核':scope.row.auditStatus =='2'?'有意向':scope.row.auditStatus =='3'?'无意向':scope.row.auditStatus =='4'?'已签约':'已终止'}}
+              {{scope.row.intentionStatus ==''?'待审核':scope.row.intentionStatus =='2'?'有意向':scope.row.intentionStatus =='3'?'无意向':''}}
             </template>
           </el-table-column>
 
diff --git a/admin-web-master/src/views/customer/rUser/index.vue b/admin-web-master/src/views/customer/rUser/index.vue
index 0f7a431..860894b 100644
--- a/admin-web-master/src/views/customer/rUser/index.vue
+++ b/admin-web-master/src/views/customer/rUser/index.vue
@@ -47,11 +47,11 @@
 
             </el-table-column>
           <el-table-column label="申请时间" prop="applyTime" min-width="200" />
-          <el-table-column label="黑名单" prop="isBlacklist" min-width="150">
+          <el-table-column label="黑名单" prop="isBlackList" min-width="150">
 
             <template slot-scope="scope">
 
-              {{scope.row.isBlacklist=='0'?'否':'是'}}
+              {{scope.row.isBlackList=='0'?'是':'否'}}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="200" fixed="right">
@@ -59,14 +59,14 @@
               <div class="tableBtn greens" @click="handleEditForm(scope.row)">
                 查看
               </div>
-			  <!-- v-if="scope.row.isBlacklist=='0'" -->
+			  <!-- v-if="scope.row.isBlackList=='0'" -->
               <div class="tableBtn greens" @click="addbuss(scope.row)" >
                 评级
               </div>
-              <div class="tableBtn greens" @click="sethei(scope.row.id,'1')" v-if="scope.row.isBlacklist=='0'">
+              <div class="tableBtn greens" @click="sethei(scope.row.id,'0')" v-if="scope.row.isBlackList=='' || scope.row.isBlackList=='1' ">
                 加入黑名单
               </div>
-              <div class="tableBtn greens" @click="sethei(scope.row.id,'0')" v-else>
+              <div class="tableBtn greens" @click="sethei(scope.row.id,'1')" v-else>
                 取消黑名单
               </div>
             </template>
@@ -266,7 +266,7 @@ import merchantInformation from '../../../components/merchantInformation/index.v
       // 查询
      async onSubmit() {
    const res = await cerePlatformMerchant(this.pageindex)
-   this.total = res.data.content.length
+   this.total = res.data.totalElements
    this.tableData = res.data.content
       },
 
@@ -292,8 +292,8 @@ import merchantInformation from '../../../components/merchantInformation/index.v
        addCheck() {
 		  this.$refs.rulePing.validate((valid) => {
 		    if (valid) {
-				 this.ruleForm.shopId = this.secondData.shopId
-				 rUserAdd(this.ruleForm)
+				 this.ruleForm.id = this.secondData.id
+				 cerePlatformMerchantedit(this.ruleForm)
 				this.ggXin = false
 				  this.getAll()
 				}else{
@@ -328,7 +328,7 @@ import merchantInformation from '../../../components/merchantInformation/index.v
       },
      async sethei(ids, num) {
        // console.log(ids, num)
-      await rUserEdit({id:ids,isBlacklist:num})
+      await cerePlatformMerchantedit({id:ids,isBlackList:num})
       this.getAll()
       }
     }
diff --git a/wenjuan-pc/src/views/investigation/index.vue b/wenjuan-pc/src/views/investigation/index.vue
index d5fcdb5..d470e10 100644
--- a/wenjuan-pc/src/views/investigation/index.vue
+++ b/wenjuan-pc/src/views/investigation/index.vue
@@ -550,7 +550,9 @@
                   </div>
                   <div v-if="formInline.rewardForParticipation === '转盘抽奖'" style="padding: 0  0 20px 20px;">
                     <div>
-                      奖励 <el-input v-model="choujiang" style="width:50px;" />次
+        <!--              奖励 <el-input v-model="choujiang" style="width:50px;" />次 -->
+					  <el-button class="buttonHover" style="color: #fff;background-color: #3F9B6A;"
+					    @click="actGo">创建活动</el-button>
                     </div>
                   </div>
                   <div v-if="formInline.rewardForParticipation === '优惠券'" style="padding: 0  0 20px 20px;">
@@ -2676,6 +2678,9 @@ if(this.daxiangData.question[key].type == '单选') {
       this.options[index].index = index + 1
       this.options.sort()
     },
+	actGo(){
+		   // window.location.href = ``
+	},
   }
 
 }
--
libgit2 0.21.4