Merge branch 'master' of git.dev.advichcloud.com:wangfan/adweb3-web

src/views/adweb/logistics/AdwebLogistics.vue

@@ -25,7 +25,7 @@
         // 获取 字典中存放的token
         const token = res.result || '';
         // 动态生成 URL
-        iframeSrc.value = `https://meiri56.com:7779?company=${encodeURIComponent(siteCode)}&companyName=${encodeURIComponent(realName)}&userId=${encodeURIComponent(userId)}&token=${encodeURIComponent(token)}`;
+        iframeSrc.value = `https://meiri56.cn?company=${encodeURIComponent(siteCode)}&companyName=${encodeURIComponent(realName)}&userId=${encodeURIComponent(userId)}&token=${encodeURIComponent(token)}`;
       } else {
         console.error('未获取到 token！');
       }

src/views/adweb/payments/AdwebPayments.vue

@@ -0,0 +1,92 @@
+<template>
+  <div class="tools-wrap">
+    <a-row :gutter="[20, 20]">
+      <a-col :span="12">
+        <div class="wrap new">
+          <img src="../../../assets/payments/pingpong.png" />
+          <div class="content">
+            <p class="title">PingPong Checkout</p>
+            <p class="describe">全球收单，品质之选。面向50亿消费者，支持全球50+种主流币种支付</p>
+            <p class="info">
+              <a-button type="primary" @click="openWindow('https://pay.pingpongx.com/aq/register?salerId=000167')">去使用</a-button>
+            </p>
+          </div>
+        </div>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    openWindow(url) {
+      // 获取屏幕的宽度和高度
+      const screenWidth = window.screen.width;
+      const screenHeight = window.screen.height;
+
+      // 设置窗口宽度为屏幕的2/3，高度为屏幕的完整高度
+      const windowWidth = screenWidth * 2 / 3;
+      const windowHeight = screenHeight;
+
+      // 计算窗口的位置，使其居中显示
+      const left = (screenWidth - windowWidth) / 2;
+      const top = 0;
+
+      // 设置窗口特性
+      const windowFeatures = `width=${windowWidth},height=${windowHeight},left=${left},top=${top},menubar=no,toolbar=no,location=no,resizable=yes,scrollbars=yes,status=no`;
+
+      // 打开新窗口
+      window.open(url, '_blank', windowFeatures);
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+.tools-wrap {
+  .wrap {
+    background: #fff;
+    border-radius: 10px;
+    padding: 30px;
+    margin: 10px;
+    display: flex;
+    align-items: start;
+    img {
+      width: 70px;
+      flex: 12% 0 0;
+      border-radius: 10px;
+    }
+    .content {
+      flex: 88% 0 0;
+      padding: 00 50px;
+      .title {
+        font-size: 24px;
+        color: #333;
+        margin-bottom: 5px;
+      }
+      .describe {
+        font-size: 14px;
+        color: #333;
+        min-height: 50px;
+      }
+      .info {
+        margin: 20px 0 0;
+        align-items: end;
+        width: 100%;
+        display: flex;
+        span {
+          font-size: 14px;
+          color: #999;
+          margin-right: 20px;
+          flex: 1;
+        }
+        button {
+          flex: 20% 0 0;
+          border-radius: 0;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/adweb/site/AdwebSite.data.ts

@@ -22,7 +22,7 @@ export const columns: BasicColumn[] = [
     align: 'left',
     dataIndex: 'channelProviderName',
     resizable: true,
-    width: 160,
+    width: 200,
     customRender: function ({ text }) {
       if (text) {
         return text;
@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
     title: '站点名称',
     align: 'left',
     dataIndex: 'name',
-    width: 250,
+    width: 280,
     resizable: true,
   },
   {
@@ -101,9 +101,9 @@ export const columns: BasicColumn[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  uid: { title: '用户ID,与用户表关联', order: 0, view: 'sel_user', type: 'string' },
+  uid: { title: '创建人', order: 0, view: 'sel_user', type: 'string' },
   code: {
-    title: '站点code,生成6位长度随机码，取值范围[a-z0-9],保证系统唯一',
+    title: '站点code',
     order: 1,
     view: 'text',
     type: 'string',
@@ -111,7 +111,7 @@ export const superQuerySchema = {
   name: { title: '站点名称', order: 2, view: 'text', type: 'string' },
   domain: { title: '站点域名', order: 3, view: 'text', type: 'string' },
   status: {
-    title: '当前状态：0：已删除；1：正常；2:未发布  3:拉取测试站点中 ；4：发布正式站点中 ;5:拉取异常',
+    title: '当前状态',
     order: 4,
     view: 'number',
     type: 'number',

src/views/adweb/site/AdwebSiteList.vue

@@ -300,8 +300,12 @@
    * 编辑事件
    */
   function handleEdit(record: Recordable) {
-    registerModal.value.disableSubmit = false;
-    registerModal.value.edit(record);
+    if (isAdmin.value) {
+      registerModal.value.disableSubmit = false;
+      registerModal.value.edit(record);
+    } else {
+      return window.open(record.domain + '/adweb-admin/');
+    }
   }
 
   /**

src/views/adweb/site/components/AdwebSiteForm.vue

@@ -4,31 +4,60 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row>
-						<a-col :span="24">
-							<a-form-item label="用户ID,与用户表关联" v-bind="validateInfos.uid">
-						<j-select-user v-model:value="formData.uid"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="站点名称" v-bind="validateInfos.name">
-								<a-input v-model:value="formData.name" placeholder="请输入站点名称"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="站点域名" v-bind="validateInfos.domain">
-								<a-input v-model:value="formData.domain" placeholder="请输入站点域名"  allow-clear ></a-input>
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="到期时间，默认为ctime+1年" v-bind="validateInfos.etime">
-								<a-date-picker placeholder="请选择到期时间，默认为ctime+1年"  v-model:value="formData.etime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  allow-clear />
-							</a-form-item>
-						</a-col>
-						<a-col :span="24">
-							<a-form-item label="发布正式环境时间（首次发布）" v-bind="validateInfos.issueTime">
-								<a-date-picker placeholder="请选择发布正式环境时间（首次发布）"  v-model:value="formData.issueTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"  allow-clear />
-							</a-form-item>
-						</a-col>
+            <a-col :span="24">
+              <a-form-item label="创建人" v-bind="validateInfos.uid">
+                <j-select-user v-model:value="formData.uid" allow-clear disabled="true" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="站点名称" v-bind="validateInfos.name">
+                <a-input v-model:value="formData.name" placeholder="请输入站点名称" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否发布" v-bind="validateInfos.status">
+                <a-radio-group v-model:value="formData.status" option-type="button" :options="statusList" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="是否有正式域名" v-bind="validateInfos.isDomain">
+                <a-radio-group v-model:value="formData.isDomain" option-type="button" :options="isDomainList" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="站点域名" v-bind="validateInfos.domain">
+                <a-input v-model:value="formData.domain" placeholder="请输入站点域名" allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="临时站点域名" v-bind="validateInfos.domainDev">
+                <a-input v-model:value="formData.domainDev" placeholder="请输入临时站点域名" allow-clear disabled="true" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="到期时间" v-bind="validateInfos.etime">
+                <a-date-picker
+                  placeholder="请选择到期时间，默认为ctime+1年"
+                  v-model:value="formData.etime"
+                  showTime
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="发布正式时间" v-bind="validateInfos.issueTime">
+                <a-date-picker
+                  placeholder="请选择发布正式环境时间（首次发布）"
+                  v-model:value="formData.issueTime"
+                  showTime
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
           </a-row>
         </a-form>
       </template>
@@ -37,8 +66,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
-  import { defHttp } from '/src/utils/http/axios';
+  import { computed, defineExpose, defineProps, nextTick, reactive, ref } from 'vue';
   import { useMessage } from '/src/hooks/web/useMessage';
   import JSelectUser from '/src/components/Form/src/jeecg/components/JSelectUser.vue';
   import { getValueType } from '/src/utils';
@@ -48,8 +76,8 @@
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
-    formData: { type: Object, default: () => ({})},
-    formBpm: { type: Boolean, default: true }
+    formData: { type: Object, default: () => ({}) },
+    formBpm: { type: Boolean, default: true },
   });
   const formRef = ref();
   const useForm = Form.useForm;
@@ -59,6 +87,9 @@
     uid: '',
     name: '',
     domain: '',
+    isDomain: 0,
+    status: 0,
+    domainDev: '',
     etime: '',
     issueTime: '',
   });
@@ -68,26 +99,67 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = reactive({
-    uid: [{ required: true, message: '请输入用户ID,与用户表关联!'},],
-    name: [{ required: true, message: '请输入站点名称!'},],
-    domain: [{ required: true, message: '请输入站点域名!'},],
-    etime: [{ required: true, message: '请输入到期时间，默认为ctime+1年!'},],
+    uid: [{ required: true, message: '请输入用户ID,与用户表关联!' }],
+    name: [{ required: true, message: '请输入站点名称!' }],
+    domain: [{ required: true, message: '请输入站点域名!' }],
+    etime: [{ required: true, message: '请输入到期时间，默认为ctime+1年!' }],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 
+  const isDomainList = ref([
+    {
+      value: 0,
+      label: '否',
+    },
+    {
+      value: 1,
+      label: '是',
+    },
+  ]);
+
+  const statusList = ref([
+    {
+      value: 0,
+      label: '已删除',
+    },
+    {
+      value: 1,
+      label: '已发布',
+    },
+    {
+      value: 2,
+      label: '临时站点已创建',
+    },
+    {
+      value: 3,
+      label: '临时站点正在创建',
+    },
+    {
+      value: 4,
+      label: '临时站点创建失败',
+    },
+    {
+      value: 5,
+      label: '正式站点正在创建',
+    },
+    {
+      value: 6,
+      label: '正式站点创建失败',
+    },
+  ]);
+
   // 表单禁用
-  const disabled = computed(()=>{
-    if(props.formBpm === true){
-      if(props.formData.disabled === false){
+  const disabled = computed(() => {
+    if (props.formBpm === true) {
+      if (props.formData.disabled === false) {
         return false;
-      }else{
+      } else {
         return true;
       }
     }
     return props.formDisabled;
   });
 
-
   /**
    * 新增
    */
@@ -103,10 +175,10 @@
       resetFields();
       const tmpData = {};
       Object.keys(formData).forEach((key) => {
-        if(record.hasOwnProperty(key)){
-          tmpData[key] = record[key]
+        if (record.hasOwnProperty(key)) {
+          tmpData[key] = record[key];
         }
-      })
+      });
       //赋值
       Object.assign(formData, tmpData);
     });
@@ -150,7 +222,6 @@
       });
   }
 
-
   defineExpose({
     add,
     edit,

src/views/adweb/subscribePlan/SubscribePlan.data.ts

@@ -4,7 +4,7 @@ export const columns: BasicColumn[] = [
   {
     title: '套餐类型',
     align: 'left',
-    dataIndex: 'marketType_dictText',
+    dataIndex: 'planType_dictText',
   },
   {
     title: '套餐名称',
@@ -16,13 +16,13 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'keywordCount',
     customRender: function({text, record})  {
-      if (record.marketType == 'SEO') {
+      if (record.planType == 'SEO') {
         return text + '个'
-      } else if (record.marketType == 'ARTICLE') {
+      } else if (record.planType == 'ARTICLE') {
         return text + '篇'
-      } else if (record.marketType == 'PSEUDOORIGINAL') {
+      } else if (record.planType == 'PSEUDOORIGINAL') {
         return text + '次'
-      }else if (record.marketType == 'STATIONCONSTRUCTION') {
+      }else if (record.planType == 'STATIONCONSTRUCTION') {
         return text + '个'
       }
     }
@@ -52,7 +52,7 @@ export const columns: BasicColumn[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  marketType: {title: '套餐类型', order: 0, view: 'list', type: 'string'},
+  planType: {title: '套餐类型', order: 0, view: 'list', type: 'string'},
   planName: {title: '套餐名称', order: 1, view: 'text', type: 'string'},
   keywordCount: {title: '关键词数量', order: 2, view: 'number', type: 'number'},
   target: {title: '关键词达标目标', order: 3, view: 'number', type: 'number'},

src/views/adweb/subscribePlan/SubscribePlanList.vue

@@ -5,9 +5,9 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
           <a-col :lg="6">
-            <a-form-item name="marketType">
+            <a-form-item name="planType">
               <template #label><span title="套餐类型">套餐类型</span></template>
-              <j-dict-select-tag v-model:value="queryParam.marketType" dictCode="dict_market_type" placeholder="请选择套餐类型" allow-clear />
+              <j-dict-select-tag v-model:value="queryParam.planType" dictCode="dict_plan_type" placeholder="请选择套餐类型" allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -60,13 +60,13 @@
       <template #bodyCell="{ column, record, index, text }">
 
 <!--       自定义列 -->
-        <template v-if="column.key == 'marketType_dictText'">
-          <template v-if="record.marketType == 'SEO'">
+        <template v-if="column.key == 'planType_dictText'">
+          <template v-if="record.planType == 'SEO'">
             <a-tag color="green">
               {{ text }}
             </a-tag>
           </template>
-          <template v-else-if="record.marketType == 'PSEUDOORIGINAL'">
+          <template v-else-if="record.planType == 'PSEUDOORIGINAL'">
             <a-tag color="cyan">
               {{ text }}
             </a-tag>
@@ -86,18 +86,18 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <SeoMarketPlanModal ref="registerModal" @success="handleSuccess" />
+    <SubscribePlanModal ref="registerModal" @success="handleSuccess" />
 <!--    <IntegrityCheckingDrawer ref="integrityCheckingDrawer" />-->
   </div>
 </template>
 
-<script lang="ts" name="adweb-seoMarketPlan" setup>
+<script lang="ts" name="adweb-subscribePlan" setup>
   import { reactive, ref } from 'vue';
   import { BasicTable, TableAction } from '/src/components/Table';
   import { useListPage } from '/src/hooks/system/useListPage';
   import { columns, superQuerySchema } from './SubscribePlan.data';
   import { batchDelete, deleteOne, getExportUrl, getImportUrl, list } from './SubscribePlan.api';
-  import SeoMarketPlanModal from './components/SubscribePlanModal.vue';
+  import SubscribePlanModal from './components/SubscribePlanModal.vue';
   // import IntegrityCheckingDrawer from './components/IntegrityCheckingDrawer.vue';
 
   import { useUserStore } from '/src/store/modules/user';

src/views/adweb/subscribePlan/components/IntegrityCheckingDrawer.vue

@@ -170,7 +170,7 @@
           return;
         }
         this.loading = true;
-        postAction('/serp/seoMarketPlan/saveTemplate', {
+        postAction('/adweb/subscribePlan/saveTemplate', {
           checkList: JSON.stringify(d),
           planId: this.id,
         })
@@ -190,7 +190,7 @@
       showDrawer(id) {
         let that = this;
         that.id = id;
-        getAction('/serp/seoMarketPlan/integrityChecking?planId=' + id)
+        getAction('/adweb/subscribePlan/integrityChecking?planId=' + id)
           .then((res) => {
             if (res.success) {
               that.data = res.result;

src/views/adweb/subscribePlan/components/SubscribePlanForm.vue

@@ -5,8 +5,8 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row>
             <a-col :span="24">
-              <a-form-item label="套餐类型" v-bind="validateInfos.marketType">
-                <j-dict-select-tag v-model:value="formData.marketType" dictCode="dict_market_type" placeholder="请选择套餐类型" allow-clear />
+              <a-form-item label="套餐类型" v-bind="validateInfos.planType">
+                <j-dict-select-tag v-model:value="formData.planType" dictCode="dict_plan_type" placeholder="请选择套餐类型" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -21,7 +21,8 @@
             </a-col>
             <a-col :span="24">
               <a-form-item label="关键词达标目标" v-bind="validateInfos.target">
-                <a-input-number v-model:value="formData.target" placeholder="请输入关键词达标目标" style="width: 100%" />
+                <a-input style="width: 20%" value="排名TOP" disabled />
+                <a-input-number v-model:value="formData.target" placeholder="请输入关键词达标目标" style="width: 80%" />
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -35,7 +36,7 @@
               </a-form-item>
             </a-col>
 
-            <div class="ant-modal-title" id="vcDialogTitle0" style="margin-bottom: 15px;">SEO指标</div>
+            <div class="ant-modal-title" id="vcDialogTitle0" style="margin-bottom: 15px">SEO指标</div>
 
             <a-col :span="24">
               <a-form-item label="文章" v-bind="validateInfos.article">
@@ -72,7 +73,6 @@
                 <a-input-number v-model:value="formData.pageView" placeholder="访问数量" style="width: 100%" />
               </a-form-item>
             </a-col>
-
           </a-row>
         </a-form>
       </template>
@@ -100,7 +100,7 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    marketType: '',
+    planType: '',
     planName: '',
     keywordCount: undefined,
     target: undefined,
@@ -119,7 +119,7 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = reactive({
-    marketType: [{ required: true, message: '请输入套餐类型!' }],
+    planType: [{ required: true, message: '请输入套餐类型!' }],
     planName: [{ required: true, message: '请输入套餐名称!' }],
     keywordCount: [{ required: true, message: '请输入关键词数量!' }],
     target: [{ required: true, message: '请输入关键词达标目标!' }],
@@ -219,4 +219,9 @@
   .antd-modal-form {
     padding: 14px;
   }
+  :deep(.ant-form-item-control-input-content) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 </style>

src/views/adweb/subscribePlan/components/SubscribePlanModal.vue

@@ -8,13 +8,13 @@
     @cancel="handleCancel"
     cancelText="关闭"
   >
-    <SeoMarketPlanForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false" />
+    <SubscribePlanForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false" />
   </j-modal>
 </template>
 
 <script lang="ts" setup>
   import { ref, nextTick, defineExpose } from 'vue';
-  import SeoMarketPlanForm from './SubscribePlanForm.vue';
+  import SubscribePlanForm from './SubscribePlanForm.vue';
   import JModal from '/src/components/Modal/src/JModal/JModal.vue';
 
   const title = ref<string>('');

src/views/adweb/theme/components/AdwebCreateSite.vue

@@ -22,7 +22,7 @@
           </a-form-item>
           <a-form-item name="uid" label="用户名称">
             <a-select v-model:value="createSiteForm.uid" show-search :filter-option="filterOption" placeholder="请选择用户名称">
-              <a-select-option v-for="item in userList" :key="item.id" :value="item.realname"
+              <a-select-option v-for="item in userList" :key="item.id" :realname="item.realname"
                 >{{ item.realname }} => {{ item.username }}</a-select-option
               >
             </a-select>
@@ -43,7 +43,7 @@
                 />
               </a-col>
               <a-col :span="3">
-                <router-link :to="{ path: '/deliver/serp/seoMarketPlan/list', query: { from: 'themeList' } }">
+                <router-link :to="{ path: '/system/subscribePlan', query: { from: 'themeList' } }">
                   <a-button type="primary" block>新增</a-button>
                 </router-link>
               </a-col>
@@ -122,13 +122,12 @@
   const ins = ref(0);
   // 用户搜索
   const filterOption = (input: string, option: any) => {
-    console.log(option, 'option ');
-    if (option.value == null) {
+    if (option.realname == null) {
       return false;
     }
 
-    console.log(input, option.value);
-    return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    console.log(input, option.realname);
+    return option.realname.toLowerCase().indexOf(input.toLowerCase()) >= 0;
   };
 
   const { createMessage } = useMessage();