Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/api/modules/businessProduction.js

@@ -27,4 +27,7 @@ export default {
    personalAllotRealAmount(params){
       return request.post(`businessProduction/allotRealAmount/personal`,params)
    },
+   getValidateInfo(params1,params2){
+      return request.get(`businessProduction/validate/${params1}/${params2}`)
+   }
 }

src/router/index.js

@@ -71,6 +71,10 @@ VueRouter.prototype.push = function push(location, onResolve, onReject) {
       path: '/document/window',
       component: () => import('@/components/DocumentWindow')
     },
+    {
+      path: '/prod/validate',
+      component: () => import('@/views/mobile/prodValidate/index'),
+    },
   ];
 
 const files = require.context('./modules', false, /\.js$/);
@@ -81,8 +85,8 @@ requireAll(files);
 
 const createRouter = () => new VueRouter({
   mode: 'hash', // require service support
-  base: '/admin',
-  //base: '/admin-test',
+  // base: '/admin',
+  base: '/admin-test',
   scrollBehavior: () => ({ y: 0 }),
   routes: routes
 });

src/router/permission.js

@@ -10,7 +10,7 @@ import utils from '@/utils/utils'
 
 NProgress.configure({ showSpinner: false }); // NProgress Configuration
 
-const whiteList = ['/login', '/404', '/401']; // no redirect whitelist
+const whiteList = ['/login', '/404', '/401','/prod/validate']; // no redirect whitelist
 export function getList(tree) {
   const list = [];
 

src/views/mobile/prodValidate/index.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="moblie">
+      <div v-if="validateTarget.productionNo" class="base" style="background-color: RGB(240,239,244);padding-top: 10vw;">
+          <span style="color:red;">请认准我们的认证网站是:http://noa.scdayou.com/,谨防假冒网站地址!</span>
+      </div>
+      <div v-else class="base" style="background-color: RGB(240,239,244);padding-top: 10vw;">
+          <span style="color:red;">未获取到报告信息，请联系客服人员。</span>
+      </div>
+      <div class="base">
+          <div>报告号</div>
+          <div class="value">{{validateTarget.productionNo}}</div>
+      </div>
+      <div class="base">
+        <div>委托方</div>
+          <div class="value">{{ validateTarget.bailor }}</div>
+      </div>
+      <div class="base">
+        <div>报告名称</div>
+          <div class="value">{{ validateTarget.productionName }}</div>
+      </div>
+      <div class="base">
+        <div>评估总面积</div>
+          <div class="value">{{validateTarget.acreage?validateTarget.acreage+' 平方米':''}}</div>
+      </div>
+      <div class="base">
+        <div>评估总价</div>
+          <div class="value">{{validateTarget.amount?validateTarget.amount+ ' 万元':''}}</div>
+      </div>
+  </div>
+</template>
+  <script>
+  
+    export default {
+      name: 'productionValidate',
+
+      data() {
+        return {
+          validateTarget:{
+            productionNo:null,
+            bailor:null,
+            productionName:null,
+            acreage:null,
+            amount:null
+          }
+        }
+      },
+      created() {
+        document.title = '报告验证';
+        const businessType = this.$route.query.businessType;
+        const businessId = this.$route.query.targetId;
+        this.getValidateInfo(businessType,businessId);
+      },
+      methods: {
+         getValidateInfo(businessType,businessId){
+            this.$api.businessProduction.getValidateInfo(businessType,businessId).then(res=>{
+              if (res.code === 200){
+                  if (res.data){
+                    this.validateTarget = res.data;
+                  }
+              }
+            })
+         }
+      },
+    }
+  </script>
+  <style  scoped>
+    .moblie{
+      width: 100vw; /* 宽度为视口宽度的50% */
+      height: 100vh; /* 高度为视口高度的70% */
+      background-color: RGB(240,239,244);
+    }
+    .base{
+      width: 100vw;
+      font-size: 15px;
+      color:darkgrey;
+      background-color: white;
+      margin-bottom: 1px;
+      padding: 5vw;
+      font-family: 'Microsoft YaHei';
+    }
+    .value{
+      margin-top: 3vw;
+      color:black;
+      font-size: 18px;
+      padding-left: 5vw;
+    }
+  </style>
+  

vue.config.js

@@ -28,7 +28,7 @@ module.exports = {
    */
   // publicPath: '/',
   publicPath: process.env.NODE_ENV === 'production'
-    ? '/admin' // [通过 ip:port/admin 访问，并注意配置route 的base] ??history模式下打包有问题, 只能使用'/' 不能是'./'否则静态资源会报错，要直接点访问只能使用hash模式('./')?? https://cli.vuejs.org/zh/config/#publicpath
+    ? '/admin-test' // [通过 ip:port/admin 访问，并注意配置route 的base] ??history模式下打包有问题, 只能使用'/' 不能是'./'否则静态资源会报错，要直接点访问只能使用hash模式('./')?? https://cli.vuejs.org/zh/config/#publicpath
     : '/',
   outputDir: 'dist',
   assetsDir: 'static',
@@ -42,18 +42,18 @@ module.exports = {
       errors: true
     },
     proxy: {
-      '/api': {
-        // prod
-        target: 'http://127.0.0.1:8088',
-        changeOrigin: true,
-        pathRewrite: {}
-      },
       // '/api': {
-      //   // test (docker)
-      //   target: 'http://127.0.0.1:8089',
+      //   // prod
+      //   target: 'http://127.0.0.1:8088',
       //   changeOrigin: true,
       //   pathRewrite: {}
       // },
+      '/api': {
+        // test (docker)
+        target: 'http://127.0.0.1:8089',
+        changeOrigin: true,
+        pathRewrite: {}
+      },
       '/dfs': {
         target: 'http://127.0.0.1:80',
         changeOrigin: true,