From b8e8587d391495883abba91b17594a05efefc3af Mon Sep 17 00:00:00 2001
From: "@AliceXiaoZhan" <1936165216@qq.com>
Date: Wed, 2 Nov 2022 21:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/contactUs/contactUs.js   | 5 ++++-
 pages/contactUs/contactUs.wxml | 5 +++++
 pages/contactUs/contactUs.wxss | 5 +++++
 project.private.config.json    | 2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pages/contactUs/contactUs.js b/pages/contactUs/contactUs.js
index afd8fe4..3ff0466 100644
--- a/pages/contactUs/contactUs.js
+++ b/pages/contactUs/contactUs.js
@@ -1,5 +1,6 @@
 // pages/signIn/signIn.js
 var app = getApp()
+var WxParse = require('../../wxParse/wxParse.js');
 import { getAbout } from "../../api/home"
 let that
 
@@ -20,6 +21,7 @@ Page({
       tel:'',
       phone:'',
       userPhone:'',
+      content:''
     }]
   },
 //   click: function (e) {
@@ -86,7 +88,8 @@ Page({
                   longitude:parseFloat(res.data.map.split(',')[0]),
                    latitude:parseFloat(res.data.map.split(',')[1]),
                 }],
-                userPhone: res.data.contact_phone 
+                userPhone: res.data.contact_phone,
+                content: WxParse.wxParse('content', 'html', res.data.content, that, 5) 
               })
               
               
diff --git a/pages/contactUs/contactUs.wxml b/pages/contactUs/contactUs.wxml
index d3274ed..1cc97b5 100644
--- a/pages/contactUs/contactUs.wxml
+++ b/pages/contactUs/contactUs.wxml
@@ -1,7 +1,12 @@
 <!--pages/signIn/signIn.wxml-->
+<import src="../../wxParse/wxParse.wxml"/> 
 <navBar title-text="联系我们" 
     bindback="back"/>
+    
 <view class="container">
+    <view class="wxParse">
+                <template is="wxParse" data="{{wxParseData:content.nodes}}"/>
+            </view>
     <view class="contact_info" style="margin-top: 6rpx;">
     <van-icon name="manager" color="white" />
     <text style="margin-top: 0rpx;" decode="true">{{phone}}</text>
diff --git a/pages/contactUs/contactUs.wxss b/pages/contactUs/contactUs.wxss
index 8b85be6..241f9db 100644
--- a/pages/contactUs/contactUs.wxss
+++ b/pages/contactUs/contactUs.wxss
@@ -51,4 +51,9 @@ map {
 .telPhone image {
     width: 110rpx;
     height: 110rpx;
+}
+.wxParse-p image {
+    width: 90%;
+    display: block;
+    margin: 0 auto;
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index a4cbb33..86f13c3 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -4,5 +4,5 @@
     },
     "condition": {},
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "安徽骏飞小程序"
+    "projectname": "wechat.junfei.iiixo.com"
 }
\ No newline at end of file