tj

bcf6f4f7 · 宋毅 · 4c1d35fc · bcf6f4f7 · bcf6f4f7 · bcf6f4f7
Commit bcf6f4f7 authored Feb 16, 2020 by 宋毅
22 changed files
--- a/channel-access/src/api/api.js
+++ b/channel-access/src/api/api.js
 import axios from "axios";
-let baseUrl = "/api/web/auth/accessAuth/getAppTokenByHosts";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/web/auth/accessAuth/getAppTokenByHosts';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/web/auth/accessAuth/getAppTokenByHosts';
+}
+// let baseUrl = "/api/web/auth/accessAuth/getAppTokenByHosts";
 //获取token
 export function getTokens() {
-    return axios.post(baseUrl, {
+    return axios.post(baseURL, {
        actionType: "getAppTokenByHosts", //固定写法就行
        actionBody: {}
    });

--- a/channel-access/src/api/enterpriseQuery.js
+++ b/channel-access/src/api/enterpriseQuery.js
 import http from "@/http/http.js";
 import axios from "axios";
-let baseUrl = "/api/web/action/enterpriseQuery/springBoard";
+// let baseUrl = "/api/web/action/enterpriseQuery/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/web/action/enterpriseQuery/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/web/action/enterpriseQuery/springBoard';
+}
 //获取企业域名信息数量
 export function ipCountByAuthor(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "ipCountByAuthor",
        actionBody: { author: name }
    });
 }
 //获取企业域名信息列表
 export function ipListByAuthor(name, pageSize, currentPage) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "ipListByAuthor",
        actionBody: {
            author: name, //公司名称
@@ -23,7 +30,7 @@ export function ipListByAuthor(name, pageSize, currentPage) {
 //获取企业证照信息数量
 export function licenseCountByAuthor(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "licenseCountByAuthor",
        actionBody: {
            author: name //公司名称
@@ -33,7 +40,7 @@ export function licenseCountByAuthor(name) {
 //获取企业高薪信息数量
 export function gxCountByAuthor(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "gxCountByAuthor",
        actionBody: {
            author: name //公司名称
@@ -43,7 +50,7 @@ export function gxCountByAuthor(name) {
 //获取企业的分支机构（从企查查获取）
 export function getQccBranches(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "getQccBranches",
        actionBody: { author: name }
    });
@@ -51,7 +58,7 @@ export function getQccBranches(name) {
 //获取企业高薪信息列表
 export function gxListByAuthor(name, pageSize, currentPage) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "gxListByAuthor",
        actionBody: {
            author: name, //公司名称
@@ -63,7 +70,7 @@ export function gxListByAuthor(name, pageSize, currentPage) {
 //获取企业所有证照数量
 export function getcountAll(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "getcountAll",
        actionBody: {
            author: name //公司名称

--- a/channel-access/src/api/licenseQuery.js
+++ b/channel-access/src/api/licenseQuery.js
 import http from "@/http/http.js";
-let baseUrl = "/api/web/action/licenseQuery/springBoard";
+// let baseUrl = "/api/web/action/licenseQuery/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/web/action/licenseQuery/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/web/action/licenseQuery/springBoard';
+}
 //根据公司得到推荐要办的证书
 export function getLicenses(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "getLicenses",
        actionBody: {
            name: name //公司名称

--- a/channel-access/src/api/patentQuery.js
+++ b/channel-access/src/api/patentQuery.js
 import http from "@/http/http.js";
-let baseUrl = "/api/web/action/patentQuery/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/web/action/patentQuery/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/web/action/patentQuery/springBoard';
+}
+// let baseUrl = "/api/web/action/patentQuery/springBoard";
 //根据申请人获取专利量接口
 export function paCountByApplicantName(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "paCountByApplicantName",
        actionBody: {
            applicant_name: name //公司名称
@@ -12,7 +19,7 @@ export function paCountByApplicantName(name) {
 //根据申请人获取专利详情列表
 export function paShortListByApplicantName(name, pageSize, currentPage) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "paShortListByApplicantName",
        actionBody: {
            applicant_name: name, //公司名称
@@ -24,7 +31,7 @@ export function paShortListByApplicantName(name, pageSize, currentPage) {
 //根据公司名称得到软件著作权数量
 export function softwareCountByAuthor(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "softwareCountByAuthor",
        actionBody: {
            author: name
@@ -34,7 +41,7 @@ export function softwareCountByAuthor(name) {
 //根据公司名称得到软件著作权详情
 export function softwareListByAuthor(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "softwareListByAuthor",
        actionBody: {
            author: name, //公司名称
@@ -46,7 +53,7 @@ export function softwareListByAuthor(name) {
 //根据公司名称得到著作权量
 export function worksCountByAuthor(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "worksCountByAuthor",
        actionBody: {
            author: name //公司名称
@@ -56,7 +63,7 @@ export function worksCountByAuthor(name) {
 //根据公司名称得到著作权详情
 export function worksListByAuthor(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "worksListByAuthor",
        actionBody: {
            author: name, //公司名称

--- a/channel-access/src/api/paymentApi.js
+++ b/channel-access/src/api/paymentApi.js
 import http from "@/http/http.js";
+let baseURL = "";
-let baseUrl = "/api/payment/paymentApi/getQrCode";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/payment/paymentApi/getQrCode';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/payment/paymentApi/getQrCode';
+}
+// let baseUrl = "/api/payment/paymentApi/getQrCode";
 export function paymentApi(params) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "paypc",
        actionBody: {
            uapp_id: "12312312312", //平台渠道ID

--- a/channel-access/src/api/policy.js
+++ b/channel-access/src/api/policy.js
+import http from "@/http/http.js";
+import { getCookie } from "@/utils/getToken.js"
+// let baseUrl = "/api/web/action/policy/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/web/action/policy/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/web/action/policy/springBoard';
+}
+// 政策需求列表（后台）
+export function getPolicyNeedList(params) {
+    return http.post(baseURL, {
+        actionType: "getPolicyNeedList",
+        actionBody: params
+    });
+}
+// 需求信息备注提交(后台页面)
+export function submitPolicyNeedNotes() {
+    return http.post(baseURL, {
+        actionType: "submitPolicyNeedNotes",
+        actionBody: {
+            "needId": "3",
+            "customerIntention": "wyx",
+            "intentionContent": "补办了"
+        }
+    });
+}
--- a/channel-access/src/api/tmOrder.js
+++ b/channel-access/src/api/tmOrder.js
 import http from "@/http/http.js";
+// let baseUrl = "/api/web/action/tmOrder/springBoard";
+// let baseUrl1 = "/api/web/action/product/springBoard";
-let baseUrl = "/api/web/action/tmOrder/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+  baseURL = '/api/web/action/tmOrder/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+  baseURL = '/web/action/tmOrder/springBoard';
+}
+let baseURL1 = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+  baseURL1 = '/api/web/action/product/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+  baseURL1 = '/web/action/product/springBoard';
+}
 // 获取jdtrademark商标注册申请类型：自主/专家辅助/担保 卡片信息
-// 产品列表-根据产品大类获取-应用中心
+// 产品列表-根据产品二类获取 7.1.2
 export function getProductListCards() {
-  return http.post(baseUrl, {
+  return http.post(baseURL1, {
    actionBody: {
-      typeOneCode: "sbfu"
+      pathCode: "sbfu"
    },
-    actionType: "getCAProductListByTypeOneCode",
+    actionType: "getProductList",
-    actionProcess: "jd"
  });
 }
 // 产品详情:点击首页的 专家辅助申请 和 担保申请-进入相应的专家辅助申请 和 担保申请产品详情页面
 // 产品详情-应用中心
 export function getProductDetail(channelitemcode) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionBody: {
      // 自助: FW_GOODS-581976-1
      //   辅助：FW_GOODS-580010-1
@@ -32,7 +45,7 @@ export function getProductDetail(channelitemcode) {
 // 自主提报商标注册方式的获取订单编号
 // 商标提报
 export function submitSelfregTmOrder(channelitemcode) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionBody: {
      itemCode: "zzsbzc",
      channelParams: {},

--- a/channel-access/src/api/tmQuery.js
+++ b/channel-access/src/api/tmQuery.js
 import http from "@/http/http.js";
-let baseUrl = "/api/web/action/tmQuery/springBoard";
+// let baseUrl = "/api/web/action/tmQuery/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+  baseURL = '/api/web/action/tmQuery/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+  baseURL = '/web/action/tmQuery/springBoard';
+}
 // 商标详情查询接口
 export function tradeMarkDetail(params) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "tradeMarkDetail",
    actionBody: params
  });
@@ -12,7 +19,7 @@ export function tradeMarkDetail(params) {
 //企业查询接口
 export function getCompanyInfoNoUser(name) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "getCompanyInfoNoUser",
    actionBody: {
      company_name: name
@@ -22,7 +29,7 @@ export function getCompanyInfoNoUser(name) {
 // 近12期初审公告
 export function noticequeryTMZCSQ() {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "noticequeryTMZCSQ",
    actionBody: {
      noticetype: "TMZCSQ"
@@ -32,7 +39,7 @@ export function noticequeryTMZCSQ() {
 // 公告列表检索接口
 export function noticequery(params) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "noticequery",
    actionBody: params
  });
@@ -40,7 +47,7 @@ export function noticequery(params) {
 // 初审公告详情查询接口
 export function noticeSearch(params) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "noticesearch",
    actionBody: params
  });
@@ -48,7 +55,7 @@ export function noticeSearch(params) {
 //商标精确检索接口
 export function findTrademarkNameAccurate(params) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "findTrademarkNameAccurate",
    actionBody: params
  });
@@ -56,7 +63,7 @@ export function findTrademarkNameAccurate(params) {
 //近似商标查询接口
 export function findTrademarkName(params) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "findTrademarkName",
    actionBody: params
  });
@@ -64,7 +71,7 @@ export function findTrademarkName(params) {
 //商标申请号查询接口
 export function findTrademarkzchAccurate(params) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "findTrademarkzchAccurate",
    actionBody: params
  });
@@ -72,7 +79,7 @@ export function findTrademarkzchAccurate(params) {
 //商标申请人查询接口
 export function findTrademarkzcr(params) {
-  return http.post(baseUrl, {
+  return http.post(baseURL, {
    actionType: "findTrademarkzcr",
    actionBody: params
  });

--- a/channel-access/src/api/tmTools.js
+++ b/channel-access/src/api/tmTools.js
 import http from "@/http/http.js";
 import axios from "axios";
-let baseUrl = "/api/web/action/tmTools/springBoard";
+// let baseUrl = "/api/web/action/tmTools/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/web/action/tmTools/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/web/action/tmTools/springBoard';
+}
 // 获取selftmreg的尼斯查询 一级查询得到二级树  二级查询得到三级树
 export function getNiceQueryCategory(nclcodeSCode) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionBody: {
            nclcode: nclcodeSCode
        },
@@ -14,7 +21,7 @@ export function getNiceQueryCategory(nclcodeSCode) {
 // 获取selftmreg的尼斯查询分类过滤数据
 export function getNiceQueryFilter(key, classCodes) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionBody: {
            // name: "123", //Y strin 尼斯名称
            // ncls: ["01", "02", "03"] //N List 尼斯大类编码列表
@@ -27,7 +34,7 @@ export function getNiceQueryFilter(key, classCodes) {
 //文字转图片
 export function word2pic(word) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionBody: {
            word: word
        },
@@ -36,7 +43,7 @@ export function word2pic(word) {
 }
 //获取oss
 export function getOss() {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionBody: {},
        actionType: "getOssConfig"
    });
@@ -44,7 +51,7 @@ export function getOss() {
 //商标样式转换
 export function uploadStandardTm(url) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "uploadStandardTm",
        actionBody: {
            key: url
@@ -54,7 +61,7 @@ export function uploadStandardTm(url) {
 //企业近似查询
 export function getCompanyInfoByLikeName(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "getCompanyInfoByLikeName",
        actionBody: {
            likestr: name
@@ -64,7 +71,7 @@ export function getCompanyInfoByLikeName(name) {
 //图片转pdf
 export function pic2pdf(url) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "pic2pdf",
        actionBody: {
            key: url
@@ -74,7 +81,7 @@ export function pic2pdf(url) {
 //企业注册信息查询
 export function getEntregistryByCompanyName(name) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "getEntregistryByCompanyName",
        actionBody: {
            companyName: name
@@ -85,9 +92,9 @@ export function getEntregistryByCompanyName(name) {
 export function getEntregistryByCompanyName2(name) {
    return axios.post(
        "http://boss.gongsibao.com/api/gsbicsearch/companynameonesearch", {
-            appKey: "c90f935cd5ec49ff848edad31f53c14d",
+        appKey: "c90f935cd5ec49ff848edad31f53c14d",
-            companyName: name
+        companyName: name
-        }
+    }
    );
 }
@@ -95,8 +102,8 @@ export function getEntregistryByCompanyName2(name) {
 export function getGuDong(name) {
    return axios.post(
        "http://boss.gongsibao.com/api/gsbicsearch/shareholdersearch", {
-            appKey: "c90f935cd5ec49ff848edad31f53c14d",
+        appKey: "c90f935cd5ec49ff848edad31f53c14d",
-            companyName: name
+        companyName: name
-        }
+    }
    );
 }
\ No newline at end of file
--- a/channel-access/src/api/user.js
+++ b/channel-access/src/api/user.js
 import http from "@/http/http.js";
-let baseUrl = "/api/web/auth/accessAuth/springBoard";
+// let baseUrl = "/api/web/auth/accessAuth/springBoard";
+let baseURL = "";
+if (process.env.NODE_ENV == 'development') {//开发环境
+    baseURL = '/api/web/auth/accessAuth/springBoard';
+} else if (process.env.NODE_ENV == 'production') {//生产环境
+    baseURL = '/web/auth/accessAuth/springBoard';
+}
 //获取短信验证码
 export function getVerifyCode(phone) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "getVerifyCode",
        actionBody: {
            mobile: phone // Y 手机号
@@ -13,7 +20,7 @@ export function getVerifyCode(phone) {
 //验证码登录
 export function userPinByLgoinVcode(params) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "userPinByLgoinVcode",
        actionBody: params
    });
@@ -21,7 +28,7 @@ export function userPinByLgoinVcode(params) {
 //账号密码登录
 export function userPinByLgoin(params) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "userPinByLgoin",
        actionBody: params
    });
@@ -29,7 +36,7 @@ export function userPinByLgoin(params) {
 //用户注册
 export function userPinByRegister(params) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "userPinByRegister",
        actionBody: params
    });
@@ -37,7 +44,7 @@ export function userPinByRegister(params) {
 //按照手机号和验证码修改密码
 export function putUserPwdByMobile(params) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "putUserPwdByMobile",
        actionBody: params
    });
@@ -45,7 +52,7 @@ export function putUserPwdByMobile(params) {
 //退出
 export function logout(userpin) {
-    return http.post(baseUrl, {
+    return http.post(baseURL, {
        actionType: "logout",
        actionBody: {
            userpin: userpin //  Y 用户登录凭证key

--- a/channel-access/src/components/globalfooter.vue
+++ b/channel-access/src/components/globalfooter.vue
@@ -3,7 +3,9 @@
    <div class="globalfooter-main">
      <div class="globalfooter-main-top">
        <div>
-          <div class="bannerImg"><img src="" alt="" /></div>
+          <div class="bannerImg">
+            <img src alt />
+          </div>
          <p>北京创知厚德科技有限公司</p>
          <span>地址：北京市来广营朝来科技园10号楼101号</span>
        </div>
@@ -23,14 +25,17 @@
        <div>
          <p>客服二维码</p>
          <div class="qrCode">
-            <img src="" alt="" />
+            <img src alt />
          </div>
        </div>
      </div>
-      <div class="globalfooter-main-bom">
+      <!-- <div class="globalfooter-main-bom">
        2015-2019 公司宝 京ICP备15033495 号 京ICP证160919号
        国家知识产权局批准机构代码：11577
-      </div>
+      </div>-->
+      <div
+        class="globalfooter-main-bom"
+      >2018-2020 gongsibao.com 版权所有 ICP备案证书号:京ICP证150505号 京ICP备14043829号-2 POWERED by 启服通</div>
    </div>
  </div>
 </template>

--- a/channel-access/src/components/globalheader.vue
+++ b/channel-access/src/components/globalheader.vue
@@ -2,24 +2,22 @@
  <div class="globalheader" ref="header">
    <div class="globalheader-main">
      <div class="globalheader-main-left">
-        <div><img src="" alt="" /></div>
+        <div>
+          <img src alt />
+        </div>
        <h3>启服通</h3>
        <p>{{ title }}</p>
      </div>
-      <div
+      <div v-if="!userpin" class="globalheader-main-right" @click="$router.push(url)">{{ name }}</div>
-        v-if="!userpin"
-        class="globalheader-main-right"
-        @click="$router.push(url)"
-      >
-        {{ name }}
-      </div>
      <div v-else class="globalheader-main-right">
        <el-dropdown @command="handleCommand">
          <span class="el-dropdown-link">
            <i class="el-icon-s-custom"></i>
-            {{ username }}<i class="el-icon-caret-bottom"></i>
+            {{ username }}
+            <i class="el-icon-caret-bottom"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="myPolicy">政策后台</el-dropdown-item>
            <el-dropdown-item command="myOrder">我的订单</el-dropdown-item>
            <el-dropdown-item command="myMsg">个人信息</el-dropdown-item>
            <el-dropdown-item command="exit">退出</el-dropdown-item>
@@ -59,6 +57,9 @@ export default {
  methods: {
    handleCommand(command) {
      switch (command) {
+        case "myPolicy":
+          this.$router.push("/policyadmin");
+          break;
        case "myOrder":
          this.$router.push("/jdindentlist");
          break;

--- a/channel-access/src/components/qilianFooter.vue
+++ b/channel-access/src/components/qilianFooter.vue
 <template>
-  <div class="qilianFooter">
+  <!-- <div class="qilianFooter">
    © 2015-2018 dscmall.cn 版权所有 ICP备案证书号:京ICP证150505号
    京ICP备14043829号-2 POWERED by 企链
+  </div> -->
+<div class="qilianFooter">
+     2018-2020 gongsibao.com 版权所有  ICP备案证书号:京ICP证150505号 京ICP备14043829号-2 POWERED by 启服通
  </div>
 </template>

--- a/channel-access/src/router/index.js
+++ b/channel-access/src/router/index.js
 import Vue from "vue";
 import VueRouter from "vue-router";
-// import { getCookie } from "@/utils/getToken.js";
+import { getCookie } from "@/utils/getToken.js";
 Vue.use(VueRouter);
@@ -26,6 +26,10 @@ const routes = [
  //     redirect: "/home"
  // },
  {
+    path: "/",
+    redirect: "/user"
+  },
+  {
    path: "/user",
    name: "user",
    redirect: "/user/login",
@@ -121,7 +125,13 @@ const routes = [
    path: "/bycnoticedetail",
    name: "bycnoticedetail",
    component: () => import("@/views/pages/bycnoticedetail/Bycnoticedetail")
-  }
+  },
+  ///// 政策后台页面
+  {
+    path: "/policyadmin",
+    name: "policyadmin",
+    component: () => import("@/views/pages/policyadmin/policyadmin.vue")
+  },
 ];
 const router = new VueRouter({
  routes,

--- a/channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
+++ b/channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
@@ -6,27 +6,15 @@
          <div class="brand-title">商标注册申请</div>
          <div class="brand-text">
            <span>
-              <img
+              <img src="../../../assets/imgs/dui.png" style="margin-right: 10px;" alt />
-                src="../../../assets/imgs/dui.png"
-                style="margin-right: 10px;"
-                alt
-              />
              诚信商家
            </span>
            <span>
-              <img
+              <img src="../../../assets/imgs/dui.png" style="margin-right: 10px;" alt />
-                src="../../../assets/imgs/dui.png"
-                style="margin-right: 10px;"
-                alt
-              />
              1v1专业服务
            </span>
            <span>
-              <img
+              <img src="../../../assets/imgs/dui.png" style="margin-right: 10px;" alt />
-                src="../../../assets/imgs/dui.png"
-                style="margin-right: 10px;"
-                alt
-              />
              省钱省心省力
            </span>
          </div>
@@ -50,7 +38,7 @@
                  >
                    <div>
                      <div>
-                        <img :src="item.icon_url" alt />
+                        <img :src="item.pic_url" alt />
                      </div>
                      <div>{{ item.item_name }}</div>
                    </div>
@@ -62,10 +50,7 @@
                    }"
                  >
                    <ul>
-                      <li
+                      <li v-for="(t, i) in JSON.parse(item.product_desc)" :key="i + t">
-                        v-for="(t, i) in JSON.parse(item.product_desc).desc"
-                        :key="i + t"
-                      >
                        <div>
                          <img src="../../../assets/imgs/dbx.png" alt />
                        </div>
@@ -75,15 +60,9 @@
                    <div>
                      <div>
                        <sup>￥</sup>
-                        <span>{{ item.price }}</span
+                        <span>{{ item.price }}</span>/件
-                        >/件
-                      </div>
-                      <div
-                        class="brandreg-swiper-content-button"
-                        @click="goOwnBuyPage(index)"
-                      >
-                        立即购买
                      </div>
+                      <div class="brandreg-swiper-content-button" @click="goOwnBuyPage(index)">立即购买</div>
                    </div>
                  </div>
                </div>
@@ -111,8 +90,9 @@ export default {
  mounted() {
    getProductListCards().then(res => {
      // 请求数据并装填到datalist里面
-      // console.log(res.data);
+      console.log(res);
-      this.dataList = res.data.splice(0, 3);
+      this.dataList = res.data;
+      // this.dataList = res.data.splice(0, 3);
      // console.log(this.dataList);
    });
  },

--- a/channel-access/src/views/pages/policyadmin/policyadmin.vue
+++ b/channel-access/src/views/pages/policyadmin/policyadmin.vue
+<template>
+  <div class="policy-page">
+    <div class="header">
+      <div class="center">政策需求中心</div>
+    </div>
+    <div class="search center">
+      <el-form :inline="true" :model="policySearchKeys" class="demo-form-inline">
+        <el-form-item label="政策名称：">
+          <el-input v-model="policySearchKeys.policyName" placeholder="请输入关键词"></el-input>
+        </el-form-item>
+        <el-form-item label="地区：">
+          <el-select v-model="policySearchKeys.policyProvince" placeholder="不限">
+            <el-option label="全国" value="全国"></el-option>
+            <el-option label="中央" value="中央"></el-option>
+            <el-option label="北京市" value="北京市"></el-option>
+            <el-option label="天津市" value="天津市"></el-option>
+            <el-option label="河北省" value="河北省"></el-option>
+            <el-option label="山西省" value="山西省"></el-option>
+            <el-option label="内蒙古" value="内蒙古"></el-option>
+            <el-option label="辽宁省" value="辽宁省"></el-option>
+            <el-option label="吉林省" value="吉林省"></el-option>
+            <el-option label="黑龙江省" value="黑龙江省"></el-option>
+            <el-option label="上海市" value="上海市"></el-option>
+            <el-option label="江苏省" value="江苏省"></el-option>
+            <el-option label="浙江省" value="浙江省"></el-option>
+            <el-option label="安徽省" value="安徽省"></el-option>
+            <el-option label="福建省" value="福建省"></el-option>
+            <el-option label="江西省" value="江西省"></el-option>
+            <el-option label="山东省" value="山东省"></el-option>
+            <el-option label="河南省" value="河南省"></el-option>
+            <el-option label="湖北省" value="湖北省"></el-option>
+            <el-option label="湖南省" value="湖南省"></el-option>
+            <el-option label="广东省" value="广东省"></el-option>
+            <el-option label="广西" value="广西"></el-option>
+            <el-option label="海南省" value="海南省"></el-option>
+            <el-option label="重庆市" value="重庆市"></el-option>
+            <el-option label="四川省" value="四川省"></el-option>
+            <el-option label="贵州省" value="贵州省"></el-option>
+            <el-option label="云南省" value="云南省"></el-option>
+            <el-option label="西藏自治区" value="西藏自治区"></el-option>
+            <el-option label="陕西省" value="陕西省"></el-option>
+            <el-option label="甘肃省" value="甘肃省"></el-option>
+            <el-option label="青海省" value="青海省"></el-option>
+            <el-option label="宁夏" value="宁夏"></el-option>
+            <el-option label="新疆维吾尔自治区" value="新疆维吾尔自治区"></el-option>
+            <el-option label="台湾省" value="台湾省"></el-option>
+            <el-option label="香港特别行政区" value="香港特别行政区"></el-option>
+            <el-option label="澳门特别行政区" value="澳门特别行政区"></el-option>
+            <el-option label="海外" value="海外"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="政策类型：">
+          <el-select v-model="policySearchKeys.policyType" placeholder="不限">
+            <el-option label="不限" value=" "></el-option>
+            <el-option label="行政措施" value="zdfc"></el-option>
+            <el-option label="金融贷款" value="jrdk"></el-option>
+            <el-option label="税收优惠" value="ssjm"></el-option>
+            <el-option label="租金减免" value="fzbt"></el-option>
+            <el-option label="人力资源" value="rlzy"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户意向：">
+          <el-select v-model="policySearchKeys.customerIntention" placeholder="全部">
+            <el-option label="全部" value=" "></el-option>
+            <el-option label="有意向" value="yyx"></el-option>
+            <el-option label="无意向" value="wyx"></el-option>
+            <el-option label="暂无跟进" value="dgj"></el-option>
+          </el-select>
+        </el-form-item>
+        <span>申请日期:</span>
+        <el-date-picker v-model="chooseDate" type="datetime" placeholder="选择日期时间"></el-date-picker>
+        <el-form-item class="selfwidth">
+          <el-button type="primary" @click="onSubmit">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="showdata center">
+      <div class="lists center">
+        <el-table :data="policeData" v-loading="loading" max-height="440px">
+          <el-table-column prop="policyNo" label="政策编号" align="center" width="100">
+            <template slot-scope="scope">
+              <span>{{ scope.row.policyNo ? scope.row.policyNo : "---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="policyName"
+            label="政策名称"
+            align="center"
+            min-width="150"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.policyName ? "《"+scope.row.policyName+"》" : "---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="policyProvince" label="地区" align="center" width="100">
+            <template slot-scope="scope">
+              <span>{{ scope.row.policyProvince ? scope.row.policyProvince : "---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="policyType" label="政策类型" align="center" width="90">
+            <template slot-scope="scope">
+              <span>{{ scope.row.policyType ? scope.row.policyType=='zdfc'?'行政措施': scope.row.policyType=='fzbz'?'租金减免': scope.row.policyType=='jrdk'?'金融贷款':scope.row.policyType=='ssjm'?'税收优惠':scope.row.policyType=='rlzy'?'人力资源':"":"---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="contacts" label="客户姓名" align="center" width="90">
+            <template slot-scope="scope">
+              <span>{{ scope.row.contacts ? scope.row.contacts : "---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="mobile" label="客户电话" align="center" width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.mobile ? scope.row.mobile : "---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="company"
+            label="公司名称"
+            align="center"
+            min-width="100"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row.company ? scope.row.company : "---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="industry" label="所属行业" align="center" width="100">
+            <template slot-scope="scope">
+              <span>{{ scope.row.industry ? scope.row.industry : "---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="customerIntention" label="客户意向" align="center" width="90">
+            <template slot-scope="scope">
+              <span>{{ scope.row.customerIntention ? scope.row.customerIntention=='yyx'?"有意向": scope.row.customerIntention=='wyx'?"无意向":scope.row.customerIntention=='dgj'?"暂无跟进": "":"---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="applyDate" label="申请日期" align="center" width="100">
+            <template slot-scope="scope">
+              <span>{{ scope.row.applyDate ? scope.row.applyDate.split("T")[0]:"---" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="note" label="操作" align="center">
+            <el-button type="text">备注</el-button>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="20"
+          layout="total, prev, pager, next"
+          :total="this.policeData.length"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getPolicyNeedList, submitPolicyNeedNotes } from "@/api/policy.js";
+export default {
+  data() {
+    return {
+      policySearchKeys: {
+        policyName: "",
+        policyProvince: "",
+        policyType: "",
+        customerIntention: ""
+      },
+      // 日期选择器
+      chooseDate: "",
+      // 表单数据
+      policeData: [],
+      currentPage: 1,
+      // loading动画
+      loading: false
+    };
+  },
+  created() {
+    this.loading = true;
+    getPolicyNeedList({
+      policyName: "",
+      policyProvince: "",
+      policyCity: "",
+      policyType: "",
+      customerIntention: "",
+      pageSize: "20",
+      pageIndex: "1"
+    }).then(res => {
+      console.log("初始的查询的全部数据", res);
+      if (res.status == 0) {
+        this.policeData = res.data;
+        this.loading = false;
+      }
+    });
+    // submitPolicyNeedNotes().then(res => {
+    //   console.log(res);
+    // });
+  },
+  methods: {
+    // 点击查询，提交查询参数
+    onSubmit() {
+      console.log("submit!");
+      // 提交查询的字段
+      let params = {
+        policyName: this.policySearchKeys.policyName,
+        policyProvince: this.policySearchKeys.policyProvince,
+        policyCity: "",
+        policyType: this.policySearchKeys.policyType,
+        customerIntention: this.policySearchKeys.customerIntention,
+        pageSize: "20",
+        pageIndex: "1"
+      };
+      console.log("点击按钮提交查询参数", params);
+      this.loading = true;
+      getPolicyNeedList(params).then(res => {
+        console.log("查询后的数据", res);
+        if (res.status == 0) {
+          this.policeData = res.data;
+          this.loading = false;
+        }
+      });
+    },
+    // 分页器
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    }
+  }
+};
+</script>
+<style lang="scss" >
+.policy-page {
+  .center {
+    width: 1200px;
+    margin: 0 auto;
+  }
+  .header {
+    height: 60px;
+    width: 100%;
+    line-height: 60px;
+    background: #000;
+    color: #fff;
+    font-size: 18px;
+    /* padding-left: 20px; */
+  }
+  .search {
+    background: rgba(247, 248, 252, 1);
+    margin-bottom: 10px;
+    padding-top: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .el-form {
+      .el-form-item {
+        .el-form-item__label {
+          padding-right: 0px;
+        }
+        .el-form-item__content {
+          width: 120px;
+        }
+      }
+      .selfwidth {
+        width: 80px;
+      }
+      .el-date-editor {
+        width: 200px;
+        margin: 0 20px;
+      }
+    }
+  }
+  .showdata {
+    min-height: 500px;
+    display: flex;
+    flex-direction: column;
+    border: 1px solid #ddd;
+    .lists {
+      flex: 1;
+      .el-table {
+        width: 1198px;
+        /*  */
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #333333;
+        .el-table__header-wrapper .el-table__header .has-gutter tr th {
+          background: rgba(247, 248, 252, 1);
+        }
+        .el-table__body-wrapper {
+          .el-table__row {
+            td {
+              height: 20px;
+              padding-bottom: 0;
+              padding-top: 0;
+            }
+          }
+        }
+      }
+    }
+    .pagination {
+      width: 1198px;
+      height: 60px;
+      background: rgba(247, 248, 252, 1);
+      margin: 0 auto;
+      text-align: right;
+      .el-pagination {
+        margin: 15px 0;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
--- a/channel-access/src/views/pages/selftmreg/PayOrder.vue
+++ b/channel-access/src/views/pages/selftmreg/PayOrder.vue
+<!-- 第四步：支付订单页面 -->
+<template>
+  <div>支付订单页面</div>
+</template>
\ No newline at end of file
--- a/channel-access/src/views/pages/user/forgetPassword/index.vue
+++ b/channel-access/src/views/pages/user/forgetPassword/index.vue
@@ -11,24 +11,17 @@
      <el-form-item prop="name">
        <el-input v-model="ruleForm.name" placeholder="请输入账号"></el-input>
      </el-form-item>
-      <el-form-item prop="verificationCode"
+      <el-form-item prop="verificationCode">
-        ><el-input
+        <el-input v-model="ruleForm.verificationCode" placeholder="请输入验证码"></el-input>
-          v-model="ruleForm.verificationCode"
+        <el-button @click="getVerificationCode">{{ btnInnerText }}</el-button>
-          placeholder="请输入验证码"
-        ></el-input
-        ><el-button @click="getVerificationCode">{{ btnInnerText }}</el-button>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input
+        <el-input v-model="ruleForm.password" placeholder="请输入密码" show-password></el-input>
-          v-model="ruleForm.password"
-          placeholder="请输入密码"
-          show-password
-        ></el-input>
      </el-form-item>
      <el-button type="primary" @click="submitForm()">确定</el-button>
      <p>
-        <span @click="$router.push('/user/login')">登陆</span
+        <span @click="$router.push('/user/login')">登录</span>
-        ><span @click="$router.push('/user/register')">注册</span>
+        <span @click="$router.push('/user/register')">注册</span>
      </p>
    </el-form>
  </div>
@@ -63,7 +56,7 @@ export default {
    getVerificationCode() {
      if (this.flag) {
        if (/^1[3|4|5|7|8][0-9]{9}$/.test(this.ruleForm.name)) {
-      console.log(123)
+          console.log(123);
          this.flag = false;
          //获取验证码
          getVerifyCode(this.ruleForm.name).then(res => {
@@ -109,7 +102,7 @@ export default {
        this.ruleForm.password
      ) {
        putUserPwdByMobile(from).then(res => {
-          console.log(res)
+          console.log(res);
          if (res.status == 0) {
            this.$message({
              message: "修改成功！",

--- a/channel-access/src/views/pages/user/login/index.vue
+++ b/channel-access/src/views/pages/user/login/index.vue
@@ -24,7 +24,7 @@ export default {
  },
  data() {
    return {
-      activeName: "first"
+      activeName: "second"
    };
  },
  mounted() {},

--- a/channel-access/src/views/pages/user/login/verificationCode.vue
+++ b/channel-access/src/views/pages/user/login/verificationCode.vue
@@ -6,21 +6,19 @@
      label-width="100px"
      class="demo-dynamic"
      :rules="rules"
-      ><el-form-item prop="buyerPhone"
+    >
-        ><el-input
+      <el-form-item prop="buyerPhone">
-          v-model="dynamicValidateForm.phone"
+        <el-input v-model="dynamicValidateForm.phone" placeholder="请输入手机号码"></el-input>
-          placeholder="请输入手机号码"
-        ></el-input>
      </el-form-item>
-      <el-form-item
+      <el-form-item>
-        ><el-input
+        <el-input v-model="dynamicValidateForm.verifyCode" placeholder="请输入验证码"></el-input>
-          v-model="dynamicValidateForm.verifyCode"
+        <el-button @click="getVerificationCode">{{ btnInnerText }}</el-button>
-          placeholder="请输入验证码"
-        ></el-input
-        ><el-button @click="getVerificationCode">{{ btnInnerText }}</el-button>
      </el-form-item>
      <el-button type="primary" @click="submitForm()">登录</el-button>
-      <p>点击【登录】即可表示同意<span>《启服通用户协议》</span></p>
+      <p>
+        点击【登录】即可表示同意
+        <span>《启服通用户协议》</span>
+      </p>
    </el-form>
    <p>未注册用户，系统默认为您创建账号</p>
  </div>
@@ -109,13 +107,16 @@ export default {
        this.dynamicValidateForm.verifyCode
      ) {
        userPinByLgoinVcode(form).then(res => {
+          console.log(res);
          if (res.status == 0) {
            seveCookie("userpin", res.data.userpin);
-            seveCookie("username", this.ruleForm.name);
+            seveCookie("username", this.dynamicValidateForm.phone);
            this.$message({
              message: "登录成功！",
              type: "success"
            });
+            this.$router.push("/jdtrademark");
+            //  this.$router.push("/policyadmin");
          } else if (res.status == 2030) {
            this.$message.error("验证码错误！");
          } else if (res.status == 2060) {

--- a/channel-access/src/views/pages/user/register/index.vue
+++ b/channel-access/src/views/pages/user/register/index.vue
@@ -11,22 +11,18 @@
      <el-form-item prop="name">
        <el-input v-model="ruleForm.name" placeholder="请输入账号"></el-input>
      </el-form-item>
-      <el-form-item prop="verificationCode"
+      <el-form-item prop="verificationCode">
-        ><el-input
+        <el-input v-model="ruleForm.verificationCode" placeholder="请输入验证码"></el-input>
-          v-model="ruleForm.verificationCode"
+        <el-button @click="getVerificationCode">{{ btnInnerText }}</el-button>
-          placeholder="请输入验证码"
-        ></el-input
-        ><el-button @click="getVerificationCode">{{ btnInnerText }}</el-button>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input
+        <el-input v-model="ruleForm.password" placeholder="请输入密码" show-password></el-input>
-          v-model="ruleForm.password"
-          placeholder="请输入密码"
-          show-password
-        ></el-input>
      </el-form-item>
      <el-button type="primary" @click="submitForm()">确定</el-button>
-      <p>已有账号，<span @click="$router.push('/user/login')">去登陆</span></p>
+      <p>
+        已有账号，
+        <span @click="$router.push('/user/login')">去登陆</span>
+      </p>
    </el-form>
  </div>
 </template>
@@ -108,6 +104,7 @@ export default {
              message: "注册成功！",
              type: "success"
            });
+            this.$router.push("/user/login");
          } else if (res.status == 2030) {
            this.$message.error("验证码错误！");
          } else if (res.status == 2060) {
@@ -115,7 +112,13 @@ export default {
              message: "请不要重新登录！",
              type: "warning"
            });
+          } else if (res.status == 2000) {
+            this.$message({
+              message: res.msg,
+              type: "warning"
+            });
          } else {
+            console.log(res);
            this.$message.error("注册失败！");
          }
        });

--- a/channel-access/vue.config.js
+++ b/channel-access/vue.config.js
@@ -10,7 +10,8 @@ module.exports = {
    hotOnly: false,
    proxy: {
      "/api": {
-        target: "http://gsb.qifu.gongsibao.com:4011", //API服务器的地址
+        // target: "http://gsb.qifu.gongsibao.com:4011", //API服务器的地址
+        target: "http://gsb.qifu.gongsibao.com:4012", //API服务器的地址
        ws: true, //代理websockets
        changeOrigin: true, // 虚拟的站点需要更管origin
        pathRewrite: {