From e33e1424273b416263eddebe4f0054fc6daef9a0 Mon Sep 17 00:00:00 2001
From: pengda <1111@qq.com>
Date: Tue, 22 Jul 2025 09:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/site/addSiteStep/step1.vue | 11 ++++---
 src/components/site/addSiteStep/step2.vue | 34 +++++++++-----------
 src/components/site/addSiteStep/step3.vue | 53 ++++++++++++++++++++++++-------
 3 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/src/components/site/addSiteStep/step1.vue b/src/components/site/addSiteStep/step1.vue
index 41091bc..38c2396 100644
--- a/src/components/site/addSiteStep/step1.vue
+++ b/src/components/site/addSiteStep/step1.vue
@@ -240,13 +240,16 @@ export default {
                   }).then(response => {
                       if(response.status && response.data.uid){
                           that.formData.uid = response.data.uid
-                          this.$emit('handelSiteInfo', that.formData)
+                          that.formData.domain_type = that.domainType
+                          that.formData.domain_prefix = that.domainPrefix
+                          that.formData.domain_name = that.domainName
+                          that.$emit('handelSiteInfo', that.formData)
 
-                          if(this.formData.sale_channel === '2'){
+                          if(that.formData.sale_channel === '2'){
                               //自用站点无需设置收款方式
-                              this.$emit('handelStep', 3)
+                              that.$emit('handelStep', 3)
                           }else{
-                              this.$emit('handelStep', 2)
+                              that.$emit('handelStep', 2)
                           }
                           return true;
                       }
diff --git a/src/components/site/addSiteStep/step2.vue b/src/components/site/addSiteStep/step2.vue
index fd8b993..3de312f 100644
--- a/src/components/site/addSiteStep/step2.vue
+++ b/src/components/site/addSiteStep/step2.vue
@@ -544,31 +544,27 @@ export default {
           this.$router.push('/')
       },
       nextStep() {
-          if(this.siteInfo.sale_channel === '0' && !this.bindTaobaoId && !this.bindJdId){
-              this.$Message.error('请绑定收款方式');
-              return false
+          var data = {
+              uid: this.siteInfo.uid,
+              open_processs: 4,
+              pay_config: {},
           }
-          if(this.siteInfo.sale_channel === '1' && !this.bindWxpayId && !this.bindAlipayId){
-              this.$Message.error('请绑定收款方式');
-              return false
+          if(this.siteInfo.sale_channel === '0'){
+              if(this.isJd && this.bindJdId) data.pay_config = { 4: this.bindJdId }
+              if(!this.isJd && this.bindTaobaoId) data.pay_config = { 0: this.bindTaobaoId }
           }
-          if(this.siteInfo.sale_channel === '3' && !this.bindPddId){
+          if(this.siteInfo.sale_channel === '1'){
+              if(this.bindWxpayId) data.pay_config = { 2: this.bindWxpayId }
+              if(this.bindAlipayId) data.pay_config = { 3: this.bindAlipayId }
+          }
+          if(this.siteInfo.sale_channel === '3'){
+              if(this.bindPddId) data.pay_config = { 11: this.bindPddId }
+          }
+          if(Object.keys(data.pay_config).length === 0) {
               this.$Message.error('请绑定收款方式');
               return false
           }
 
-          var data = {
-              uid: this.siteInfo.uid,
-              open_processs: 4,
-              pay_config: {
-                  0: this.bindTaobaoId,
-                  2: this.bindWxpayId,
-                  3: this.bindAlipayId,
-                  4: this.bindJdId,
-                  11: this.bindPddId,
-              },
-          }
-
           this.$http('POST', '/agentnew/ajax_update_site_pay', data, {
               headers: {
                   'Auth': this.token
diff --git a/src/components/site/addSiteStep/step3.vue b/src/components/site/addSiteStep/step3.vue
index f74e292..388cf24 100644
--- a/src/components/site/addSiteStep/step3.vue
+++ b/src/components/site/addSiteStep/step3.vue
@@ -12,13 +12,13 @@
             <div>
                 <div class="flex-common table-wrap">
                     <el-form>
-                        <GuipTable :border="true" :tableData="serviceList" :loading="tableLoading">
-                            <el-table-column prop="name" fixed="left" label="检测服务" width="200">
+                        <GuipTable :border="true" :tableData="serviceList.slice((currentPage - 1) * pageSize,currentPage * pageSize)" :loading="tableLoading">
+                            <el-table-column prop="name" fixed="left" label="检测服务">
                                 <template slot-scope="scope">
                                     <div class="flex nowrap ">
-                                        <div :class="(scope.row.type == 'a' ? 'green' : 'blue')">{{ scope.row.type == 'a' ? '查重服务' : '写作辅助'
-                                            }}</div>
-                                        <div class="">{{ scope.row.name }}</div>
+<!--                                        <div :class="(scope.row.type == 'a' ? 'green' : 'blue')">{{ scope.row.type == 'a' ? '查重服务' : '写作辅助'-->
+<!--                                            }}</div>-->
+                                        <div class="">{{ scope.row.type_desc }}</div>
                                     </div>
                                 </template>
                             </el-table-column>
@@ -55,7 +55,6 @@
                                 </template>
                             </el-table-column>
 
-
                             <el-table-column prop="sort_id" label="排序">
                                 <template #default="{ row,$index }">
                                     <el-popover v-model="row.sortPopoverVisible" :ref="`popover-${row.type}`"
@@ -107,9 +106,9 @@
                                 </template>
                             </el-table-column>
 
-                            <el-table-column label="操作" fixed="right" min-width="150px">
+                            <el-table-column label="操作" fixed="right">
                                 <template slot-scope="scope">
-                                    <div class="flex">
+                                    <div class="flex gap12">
                                         <el-link :href="serviceEditUrl+'?uid='+siteInfo.uid+'&type='+scope.row.type" target="_blank" type="text">编辑</el-link>
                                         <el-button type="text" @click="handleDelClick(scope.row, scope.$index)">删除</el-button>
                                     </div>
@@ -155,9 +154,15 @@ import {getServicePriceDesc} from "@/utils/common";
 import PaymentMethod from "@/components/paymentMethod.vue";
 import GuipDialog from "@/components/GuipDialog.vue";
 import PromptText from "@/components/PromptText.vue";
+import page from "@/components/Page.vue";
 
 export default {
   name: 'domainSet',
+    computed: {
+        page() {
+            return page
+        }
+    },
   props: {
      siteInfo: {
           type: Object,
@@ -176,7 +181,7 @@ export default {
         serviceList:[],
         tableLoading:false,
         currentPage: 1,    //当前页
-        pageSize: 2,   //每页的容量
+        pageSize: 8,   //每页的容量
         total: 0,   //列表总数
         //支付方式
         payList: [],
@@ -192,6 +197,8 @@ export default {
 
         // 服务列表url
         serviceAddUrl: '/agent/siteAddFinally',
+        // 站点设置url
+        serviceEditUrl: '/agent/siteServiceEdit',
     }
   },
   mounted() {
@@ -245,7 +252,7 @@ export default {
               }
           }).then(response => {
               that.tableLoading = false
-              if(response.status && response.data.length>0){
+              if(response.status && response.data.service_list.length>0){
                   that.$nextTick(() => {
                       that.serviceList = response.data.service_list
                   })
@@ -254,7 +261,6 @@ export default {
               console.error(error, 'error')
           })
       },
-
       handleSizeChange(val) {
           this.pageSize = val
       },
@@ -452,7 +458,6 @@ export default {
           });
           obj.info = obj.info.substr(1, obj.info.length-1);
 
-          await this.saveRequest('/agentnew/ajax_payment_switch', obj, this.editRow)
           const res = await this.saveRequest('/agentnew/ajax_payment_switch', obj, this.editRow)
           if(res && hasClose) {
               this.editRow.payment_method_desc = '自定义支付';
@@ -497,4 +502,28 @@ export default {
   margin-left: 0 !important;
   transform: none !important;
 }
+.green,
+.blue {
+  width: 80px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  color: #0DAF49 !important;
+  letter-spacing: 0.08em;
+  /* 基本 */
+  width: 80px;
+  border-radius: 4px;
+  background: rgba(239, 255, 224, 0.5);
+  box-sizing: border-box;
+  border: 1px solid rgba(0, 194, 97, 0.6);
+  margin-right: 8px;
+}
+
+.blue {
+  background: #F2F7FF;
+  border: 1px solid #BFDAFF;
+  color: #006AFF !important;
+}
 </style>
\ No newline at end of file