1 【小昆山官网】我的消息 - 点击我的消息左边的返回按钮没有返回上一页

2 【小昆山官网】登录页面-在手机验证码页面获取短信验证码的同时在注册与忘记密码页面也在获取验证码
3 【小昆山官网】招商载体 - 详情页房源地址超长没有显示...
4 【小昆山官网】房源详情页 - 服务详情图片要显示固定尺寸
5 【小昆山官网】招商载体 - 超出一行...显示
6 【小昆山官网】招商载体 - 房源为面议时，列表也显示面议
7 【小昆山官网】房源详情页 - 房源图片、可注册字段没有显示
8 【小昆山官网】招商载体 - 列表页总面积字段显示错误

digital-park-web/digital-park/src/router/modules/investment-service.js

@@ -20,7 +20,7 @@ export default [
                 component: () =>
                     import("../../views/investment-service/InvestmentServiceList/InvestmentServiceList.vue"),
                 meta: {
-                    title: "园区服务",
+                    title: "招商服务",
                 },
             },
             // 产品详情

digital-park-web/digital-park/src/utils/common.js

@@ -46,7 +46,7 @@ export const parseMarkdown = (markdownText) => {
         .replace(/^\> (.*$)/gim, '<blockquote>$1</blockquote>')
         .replace(/\*\*(.*)\*\*/gim, '<b>$1</b>')
         .replace(/\*(.*)\*/gim, '<i>$1</i>')
-        .replace(/!\[(.*?)\]\((.*?)\)/gim, "<img alt='$1' src='" + imgUrl + "$2' />")
+        .replace(/!\[(.*?)\]\((.*?)\)/gim, "<img alt='$1' src='" + imgUrl + "$2' width='100%'/>")
         .replace(/\[(.*?)\]\((.*?)\)/gim, "<a href='$2'>$1</a>")
         .replace(/\n$/gim, '<br />')
         .replace(/[\r\n]/g, "<br />")

digital-park-web/digital-park/src/views/investment-service/InvestmentService.vue

@@ -3,15 +3,21 @@
         <div class="investment-header">
             <Nav></Nav>
             <div class="header-box">
-                <div class="breadcrumb-nav">
+                <div class="breadcrumb-nav" v-if="!isDetail">
                     <span class="current-position">
                         <i class="el-icon-location"></i> 当前位置：
                     </span>
-                    <span class="current-position link" @click="toPath('/')">首页</span>
+                    <span class="current-position link active">招商服务</span>
+                </div>
+                <div class="breadcrumb-nav" v-else>
+                    <span class="current-position">
+                        <i class="el-icon-location"></i> 当前位置：
+                    </span>
+                    <span class="current-position link" @click="goPath">招商服务</span>
                     <span class="current-position link">
                         <i class="el-icon-arrow-right"></i>
                     </span>
-                    <span class="current-position link active">招商服务</span>
+                    <span class="current-position link active">详情</span>
                 </div>
                 <div class="content">
                     <div class="title">招商服务</div>
@@ -31,6 +37,21 @@ import Nav from "@components/Header.vue";
 import Footer from "@components/Footer.vue";
 export default {
     components: { Nav, Footer },
+    data() {
+        return {
+            isDetail: false,
+        };
+    },
+    mounted() {
+        if (this.$route.meta.title !== "招商服务") {
+            this.isDetail = true;
+        }
+    },
+    methods:{
+        goPath(){
+            this.$router.push('/investment-service/product-list');
+        },
+    },
 };
 </script>
 

digital-park-web/digital-park/src/views/investment-service/InvestmentServiceList/components/PropertyManage.vue

@@ -12,11 +12,8 @@
                     </span>
                     地址：{{ item.address }}
                 </div>
-                <div class="main-des">
-                    <span class="first">最短起租：{{ item.shortestRent }}</span>|
-                    <span>总面积：{{ item.housingInformationList[0].housingArea }}m²</span>|
-                    <span>支付方式：{{ item.payment }}</span>|
-                    <span>{{ item.type }}</span>
+                <div class="main-des" :title="getDesc(item)">
+                    {{ getDesc(item) }}
                 </div>
                 <div class="main-advantageList" :title="item.advantageList.join('、')">
                     <span
@@ -29,7 +26,10 @@
                 <div class="main-optional">{{ getOptional(item) }}</div>
             </div>
             <div class="main-right fr">
-                <div class="main-showPrice">
+                <div class="main-showPrice" v-if="item.housingInformationList[0].showTotalPrice == '面议'">
+                    <span class="main-price">面议</span>
+                </div>
+                <div class="main-showPrice" v-else>
                     <span class="main-price">{{ item.housingInformationList[0].price }}</span>
                     <span>{{ item.housingInformationList[0].unit }}</span>
                 </div>
@@ -66,6 +66,16 @@ export default {
                 },
             });
         },
+        // 获取详情
+        getDesc(item){
+            let str = `
+                最短起租：${ item.shortestRent }  |
+                总面积：${ item.totalArea }m²  |
+                支付方式：${ item.payment }  |
+                ${ item.type }
+            `
+            return str
+        },
         // 获取可选
         getOptional(item) {
             let decoration = [];
@@ -131,13 +141,14 @@ export default {
         }
         .main-des {
             @include font(16px, #637485);
-            span {
-                margin-right: 10px;
-                margin-left: 5px;
-                &.first {
-                    margin-left: 0;
-                }
-            }
+            @include text-ellipsis();
+            // span {
+            //     margin-right: 10px;
+            //     margin-left: 5px;
+            //     &.first {
+            //         margin-left: 0;
+            //     }
+            // }
         }
         .main-advantageList {
             margin: 10px 0;

digital-park-web/digital-park/src/views/investment-service/property-detail/PropertyDetail.scss

@@ -61,6 +61,12 @@
                 margin-top: 10px;
                 height: 30px;
                 line-height: 30px;
+                color: #637485;
+                .mian-detail-span {
+                    font-weight: bold;
+                    color: #334a5f;
+                }
+                @include text-ellipsis()
             }
             .main-btn {
                 margin-top: 20px;

digital-park-web/digital-park/src/views/investment-service/property-detail/PropertyDetail.vue

@@ -15,7 +15,7 @@
                         <span class="mian-detail-span">详情：</span>
                         {{ propertyDetail.introduce }}
                     </div>
-                    <div class="mian-detail listing-address" :title="propertyDetail.address">
+                    <div class="listing-address" :title="propertyDetail.address">
                         <span class="mian-detail-span">房源地址：</span>
                         {{ propertyDetail.address }}
                     </div>
@@ -51,6 +51,9 @@
                                 ></video>
                             </span>
                         </div>
+                        <div v-else-if="item.prop == 'canRegister'">
+                            {{ scope.row[item.prop] ? '是' : '否' }}
+                        </div>
                         <div v-else>{{ scope.row[item.prop] | formatNull}}</div>
                     </template>
                 </el-table-column>

digital-park-web/digital-park/src/views/login/LoginFrom/LoginFrom.vue

@@ -389,6 +389,10 @@ export default {
             this.loginMethod = status;
             this.getVerificationCode();
             this.clearAllError();
+            this.isOvertime = false;
+            clearInterval(this.sendTimer);
+            this.word = "发送验证码";
+            this.phoneCodeDisable = false;
         },
         // 获取title
         getTitleText() {

digital-park-web/digital-park/src/views/my-related/mseeage/Message.scss

@@ -17,6 +17,9 @@
                 margin-left: 10px;
                 font-weight: bold;
             }
+            .title-icon {
+                cursor: pointer;
+            }
         }
 
         .table-box {

digital-park-web/digital-park/src/views/my-related/mseeage/Message.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="message-content-container">
             <div class="title">
-                <img src="~@assets/image/myRelated/titleIcon.png" class="title-icon fl" alt="icon" />
+                <img @click="goBack" src="~@assets/image/myRelated/titleIcon.png" class="title-icon fl" alt="icon" />
                 <span class="title-span fl">我的消息</span>
             </div>
             <div class="table-box" v-loading="pageLoading" element-loading-text="数据加载中...">
@@ -225,6 +225,10 @@ export default {
         openDetail(row) {
             this.$refs.MessageDetailDialog.openDialog(row);
         },
+        // 返回上一页
+        goBack(){
+            this.$router.push('/my-business');
+        },
     },
 };
 </script>