Merge remote-tracking branch 'origin/master'

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app">
+  <div id="app":class="{ 'isCq':isCq }" >
     <div
       :class="{
         'nsgk-global-main':
@@ -54,15 +54,20 @@ export default {
   data: () => {
     return {
       // direction: "",
+      isCq:false
     };
+  },
+  mounted() {
+
   },
   watch: {
-    // $route(to, from) {
-    //   let toName = to.name;
-    //   const toIndex = to.meta.index;
-    //   const fromIndex = from.meta.index;
-    //   this.direction = toIndex < fromIndex ? "forward" : "backward";
-    // },
+    $route(to, from) {
+      let toName = to.name;
+      // 判断当前页面的路由
+      if (toName&&toName.indexOf('CJ')>-1) {
+        this.isCq = true;
+      }
+    },
   },
 };
 </script>
@@ -72,7 +77,7 @@ export default {
 
 :root{
   --transform: scale(1.15);
-  --fontSize: 0.4rem;
+  --fontSize: 0.35rem;
   /*--color:#e8041f;*/
 }
 .nsgk-global-main {

src/router/index.js

@@ -20,7 +20,7 @@ export const constantRoutes = [
   },
   {
     path: '/index',
-    name: 'index',
+    name: 'indexCJ',
     meta: {
       title: '主页',
       keepAlive: true,
@@ -29,7 +29,7 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    name: 'login',
+    name: 'loginCJ',
     meta: {
       title: '登录页',
       hidden: true,
@@ -38,7 +38,7 @@ export const constantRoutes = [
   },
   {
     path: '/register',
-    name: 'register',
+    name: 'registerCJ',
     meta: {
       title: '注册页',
       hidden: true,
@@ -87,7 +87,7 @@ export const constantRoutes = [
   },
   {
     path: '/biddingHall',
-    name: 'biddingHall',
+    name: 'biddingHallCJ',
     meta: {
       title: '竞价大厅',
       hidden: true,
@@ -96,7 +96,7 @@ export const constantRoutes = [
   },
   {
     path: '/project',
-    name: 'project',
+    name: 'projectCJ',
     meta: {
       title: '供应项目'
     },
@@ -104,7 +104,7 @@ export const constantRoutes = [
   },
   {
     path: '/project/projectDetail',
-    name: 'projectDetail',
+    name: 'projectDetailCJ',
     meta: {
       title: '供应项目',
       hidden: true
@@ -113,7 +113,7 @@ export const constantRoutes = [
   },
   {
     path: '/project/projectNeedsDetail',
-    name: 'projectNeedsDetail',
+    name: 'projectNeedsDetailCJ',
     meta: {
       title: '需求项目',
       hidden: true
@@ -122,7 +122,7 @@ export const constantRoutes = [
   },
   {
     path: '/notice/inviteTendersDetail',
-    name: 'inviteTendersDetail',
+    name: 'inviteTendersDetailCJ',
     meta: {
       title: '招标公告',
       hidden: true
@@ -131,7 +131,7 @@ export const constantRoutes = [
   },
   {
     path: '/notice/winTheBiddingDetail',
-    name: 'winTheBiddingDetail',
+    name: 'winTheBiddingDetailCJ',
     meta: {
       title: '中标公告',
       hidden: true
@@ -140,7 +140,7 @@ export const constantRoutes = [
   },
   {
     path: '/news/index',
-    name: 'news',
+    name: 'newsCJ',
     meta: {
       title: '新闻资讯',
       hidden: true,
@@ -149,7 +149,7 @@ export const constantRoutes = [
   },
   {
     path: '/news/newDetail',
-    name: 'newDetail',
+    name: 'newDetailCJ',
     meta: {
       title: '新闻详情',
       hidden: true,
@@ -158,7 +158,7 @@ export const constantRoutes = [
   },
   {
     path: '/notice/index',
-    name: 'notice',
+    name: 'noticeCJ',
     meta: {
       title: '项目公告',
       hidden: true,
@@ -167,7 +167,7 @@ export const constantRoutes = [
   },
   {
     path: '/supply/index',
-    name: 'supply',
+    name: 'supplyCJ',
     meta: {
       title: '个人供求',
       hidden: true,
@@ -176,7 +176,7 @@ export const constantRoutes = [
   },
   {
     path: '/supply/supplyDetail',
-    name: 'supplyDetail',
+    name: 'supplyDetailCJ',
     meta: {
       title: '查看供求',
       hidden: true,
@@ -185,7 +185,7 @@ export const constantRoutes = [
   },
   {
     path: '/interaction/index',
-    name: 'interaction',
+    name: 'interactionCJ',
     meta: {
       title: '互动交流',
       hidden: true,
@@ -194,7 +194,7 @@ export const constantRoutes = [
   },
   {
     path: '/register/index',
-    name: 'registerAgreement',
+    name: 'registerAgreementCJ',
     meta: {
       title: '注册须知',
       hidden: true,
@@ -203,7 +203,7 @@ export const constantRoutes = [
   },
   {
     path: '/register/registerType',
-    name: 'registerType',
+    name: 'registerTypeCJ',
     meta: {
       title: '注册类型',
       hidden: true,
@@ -212,7 +212,7 @@ export const constantRoutes = [
   },
   {
     path: '/register/userRegister',
-    name: 'userRegister',
+    name: 'userRegisterCJ',
     meta: {
       title: '个人用户注册',
       hidden: true,
@@ -221,7 +221,7 @@ export const constantRoutes = [
   },
   {
     path: '/register/companyRegister',
-    name: 'companyRegister',
+    name: 'companyRegisterCJ',
     meta: {
       title: '单位用户注册',
       hidden: true,
@@ -230,7 +230,7 @@ export const constantRoutes = [
   },
   {
     path: '/user',
-    name: 'user',
+    name: 'userCJ',
     meta: {
       title: '个人中心',
     },
@@ -238,7 +238,7 @@ export const constantRoutes = [
   },
   {
     path: '/user/signature/signatureList',
-    name: 'userSignatureList',
+    name: 'userSignatureListCJ',
     meta: {
       title: '合同管理',
       hidden: true,
@@ -247,7 +247,7 @@ export const constantRoutes = [
   },
   {
     path: '/user/signature/signatureDetail',
-    name: 'userSignatureDetail',
+    name: 'userSignatureDetailCJ',
     meta: {
       title: '合同管理',
       hidden: true,
@@ -256,7 +256,7 @@ export const constantRoutes = [
   },
   {
     path: '/user/signature/signaturePdf',
-    name: 'userSignaturePdf',
+    name: 'userSignaturePdfCJ',
     meta: {
       title: '合同预览',
       hidden: true,
@@ -265,7 +265,7 @@ export const constantRoutes = [
   },
   {
     path: '/accountSetting',
-    name: 'accountSetting',
+    name: 'accountSettingCJ',
     meta: {
       title: '账户设置',
       hidden: true,
@@ -274,7 +274,7 @@ export const constantRoutes = [
   },
   {
     path: '/companyInformation',
-    name: 'companyInformation',
+    name: 'companyInformationCJ',
     meta: {
       title: '资料修改',
       hidden: true,
@@ -283,7 +283,7 @@ export const constantRoutes = [
   },
   {
     path: '/userInformation',
-    name: 'userInformation',
+    name: 'userInformationCJ',
     meta: {
       title: '资料修改',
       hidden: true,
@@ -292,7 +292,7 @@ export const constantRoutes = [
   },
   {
     path: '/bankInformation',
-    name: 'bankInformation',
+    name: 'bankInformationCJ',
     meta: {
       title: '银行账户修改',
       hidden: true,
@@ -301,7 +301,7 @@ export const constantRoutes = [
   },
   {
     path: '/passWordInformation',
-    name: 'passWordInformation',
+    name: 'passWordInformationCJ',
     meta: {
       title: '密码修改',
       hidden: true,
@@ -310,7 +310,7 @@ export const constantRoutes = [
   },
   {
     path: '/phoneInformation',
-    name: 'phoneInformation',
+    name: 'phoneInformationCJ',
     meta: {
       title: '手机号修改',
       hidden: true,
@@ -319,7 +319,7 @@ export const constantRoutes = [
   },
   {
     path: '/bidding',
-    name: 'bidding',
+    name: 'biddingCJ',
     meta: {
       title: '我的竞价',
       hidden: true,
@@ -328,7 +328,7 @@ export const constantRoutes = [
   },
   {
     path: '/userInteraction',
-    name: 'userInteraction',
+    name: 'userInteractionCJ',
     meta: {
       title: '我的咨询',
       hidden: true,
@@ -337,7 +337,7 @@ export const constantRoutes = [
   },
   {
     path: '/userSupply',
-    name: 'userSupply',
+    name: 'userSupplyCJ',
     meta: {
       title: '我的供求',
       hidden: true,
@@ -346,7 +346,7 @@ export const constantRoutes = [
   },
   {
     path: '/application',
-    name: 'application',
+    name: 'applicationCJ',
     meta: {
       title: '我的供求',
       hidden: true,
@@ -355,7 +355,7 @@ export const constantRoutes = [
   },
   {
     path: '/policy',
-    name: 'policy',
+    name: 'policyCJ',
     meta: {
       title: '政策法规',
       hidden: true,
@@ -364,7 +364,7 @@ export const constantRoutes = [
   },
   {
     path: '/project/signUp',
-    name: 'signUp',
+    name: 'signUpCJ',
     meta: {
       title: '报名',
       hidden: true
@@ -373,7 +373,7 @@ export const constantRoutes = [
   },
   {
     path: '/noticeDetail',
-    name: 'noticeDetail',
+    name: 'noticeDetailCJ',
     meta: {
       title: '公告详情',
       hidden: true,
@@ -382,7 +382,7 @@ export const constantRoutes = [
   },
   {
     path: '/attestationDetail',
-    name: 'attestationDetail',
+    name: 'attestationDetailCJ',
     meta: {
       title: '鉴证详情',
       hidden: true,
@@ -391,7 +391,7 @@ export const constantRoutes = [
   },
   {
     path: '/policyDetail',
-    name: 'policyDetail',
+    name: 'policyDetailCJ',
     meta: {
       title: '政策法规',
       hidden: true,
@@ -400,7 +400,7 @@ export const constantRoutes = [
   },
   {
     path: '/interactionAdd',
-    name: 'interactionAdd',
+    name: 'interactionAddCJ',
     meta: {
       title: '添加互动交流',
       hidden: true,
@@ -409,7 +409,7 @@ export const constantRoutes = [
   },
   {
     path: '/supplyAdd',
-    name: 'supplyAdd',
+    name: 'supplyAddCJ',
     meta: {
       title: '添加互动交流',
       hidden: true,

src/views/news/index.vue

@@ -14,7 +14,7 @@
       @load="getList()"
     >
       <!--        @load="newList"-->
-      <van-cell v-for="item in newList" :key="item.id" :title="item.title" :label="item.newsTime" :to="{name:'newDetail', query: {id:item.id}}">
+      <van-cell v-for="item in newList" :key="item.id" :title="item.title" :label="item.newsTime" :to="{name:'newDetailCJ', query: {id:item.id}}">
         <!-- 使用 right-icon 插槽来自定义右侧图标 -->
         <template #right-icon>
           <van-image :src="item.img" class="search-icon" width="30%" style="margin-left: 10px;" v-if="item.img" />

src/views/notice/index.vue

@@ -17,7 +17,7 @@
           style="margin-top: 10px;"
           @load="getList"
         >
-          <van-cell v-for="(item,index) in noticeList" icon="play" :key="index" :title="item.projectName" :to="{name:'noticeDetail', query: {id:item.id}}">
+          <van-cell v-for="(item,index) in noticeList" icon="play" :key="index" :title="item.projectName" :to="{name:'noticeDetailCJ', query: {id:item.id}}">
             <template #label>
               项目编号：{{item.projectCode}} <p style="float: right;">{{item.dealTime.substr(0,10)}}</p>
             </template>
@@ -33,7 +33,7 @@
           style="margin-top: 10px;"
           @load="getAttestationList"
         >
-          <van-cell v-for="(item,index) in attestationList" :key="index" icon="play" :title="item.projectName" :to="{name:'attestationDetail', query: {id:item.id}}">
+          <van-cell v-for="(item,index) in attestationList" :key="index" icon="play" :title="item.projectName" :to="{name:'attestationDetailCJ', query: {id:item.id}}">
             <template #label>
               鉴证书编号：[{{item.jzsNumOne}}{{item.jzsNumTwo}}] <p style="float: right;">{{item.jzsSignDate}}</p>
             </template>
@@ -49,7 +49,7 @@
           style="margin-top: 10px;"
           @load="getinviteTendersList"
         >
-          <van-cell v-for="(item,index) in inviteTendersList" :key="index" icon="play" :title="item.projectName" :to="{name:'inviteTendersDetail', query: {id:item.id}}">
+          <van-cell v-for="(item,index) in inviteTendersList" :key="index" icon="play" :title="item.projectName" :to="{name:'inviteTendersDetailCJ', query: {id:item.id}}">
             <template #label>
               招标方：{{item.tenderName}} <p style="float: right;">{{item.logintime}}</p>
             </template>
@@ -65,7 +65,7 @@
           style="margin-top: 10px;"
           @load="getwinTheBiddingList"
         >
-          <van-cell v-for="(item,index) in winTheBiddingList" :key="index" icon="play" :title="item.projectName" :to="{name:'winTheBiddingDetail', query: {id:item.id}}">
+          <van-cell v-for="(item,index) in winTheBiddingList" :key="index" icon="play" :title="item.projectName" :to="{name:'winTheBiddingDetailCJ', query: {id:item.id}}">
             <template #label>
               <div v-if="item.dealType=='1'">
               中标方：{{item.assignee}} <p style="float: right;">{{item.dealTime}}</p>

src/views/policy/index.vue

@@ -17,7 +17,7 @@
           style="margin-top: 10px;"
           @load="getList"
         >
-          <van-cell v-for="(item,index) in List" icon="play" :key="index" :title="item.title" :to="{name:'policyDetail', query: {id:item.id}}">
+          <van-cell v-for="(item,index) in List" icon="play" :key="index" :title="item.title" :to="{name:'policyDetailCJ', query: {id:item.id}}">
             <template #label>
               <p style="float: right;">发布时间：{{item.newsTime}}</p>
             </template>
@@ -33,7 +33,7 @@
           style="margin-top: 10px;"
           @load="getSecondList"
         >
-          <van-cell v-for="(item,index) in secondList" icon="play" :key="index" :title="item.title" :to="{name:'policyDetail', query: {id:item.id}}">
+          <van-cell v-for="(item,index) in secondList" icon="play" :key="index" :title="item.title" :to="{name:'policyDetailCJ', query: {id:item.id}}">
             <template #label>
               <p style="float: right;">发布时间：{{item.newsTime}}</p>
             </template>
@@ -49,7 +49,7 @@
           style="margin-top: 10px;"
           @load="getThreeList"
         >
-          <van-cell v-for="(item,index) in threeList" icon="play" :key="index" :title="item.title" :to="{name:'policyDetail', query: {id:item.id}}">
+          <van-cell v-for="(item,index) in threeList" icon="play" :key="index" :title="item.title" :to="{name:'policyDetailCJ', query: {id:item.id}}">
           <template #label>
             <p style="float: right;">发布时间：{{item.newsTime}}</p>
           </template>