正在显示
100 个修改的文件
包含
63 行增加
和
23 行删除
img/experience.png
已删除
100644 → 0
373.9 KB
img/people.png
已删除
100644 → 0
374.1 KB
1 | // pages/companyintro/companyintro.js | 1 | // pages/companyintro/companyintro.js |
2 | +var WxParse = require('../../wxParse/wxParse.js'); | ||
2 | const app = getApp(); | 3 | const app = getApp(); |
3 | Page({ | 4 | Page({ |
4 | 5 | ||
@@ -19,6 +20,8 @@ Page({ | @@ -19,6 +20,8 @@ Page({ | ||
19 | image: res.image, | 20 | image: res.image, |
20 | content:res.content | 21 | content:res.content |
21 | }) | 22 | }) |
23 | + | ||
24 | + WxParse.wxParse('article', 'html', res.content, t, 5); | ||
22 | }) | 25 | }) |
23 | }, | 26 | }, |
24 | /** | 27 | /** |
1 | +<import src="../../wxParse/wxParse.wxml" /> | ||
2 | + | ||
1 | <view class="top"> | 3 | <view class="top"> |
2 | <image src="/img/headimg.png"></image> | 4 | <image src="/img/headimg.png"></image> |
3 | <view class="topimg"> | 5 | <view class="topimg"> |
@@ -6,5 +8,6 @@ | @@ -6,5 +8,6 @@ | ||
6 | </view> | 8 | </view> |
7 | 9 | ||
8 | <view class="textbox"> | 10 | <view class="textbox"> |
9 | - <rich-text class="textboxword" nodes="{{content}}"></rich-text> | 11 | + <template is="wxParse" data="{{wxParseData:article.nodes}}"/> |
12 | + <!-- <rich-text class="textboxword" nodes="{{content}}"></rich-text> --> | ||
10 | </view> | 13 | </view> |
@@ -8,8 +8,8 @@ Page({ | @@ -8,8 +8,8 @@ Page({ | ||
8 | data: { | 8 | data: { |
9 | imgUrls: [], | 9 | imgUrls: [], |
10 | indicatorDots: false, | 10 | indicatorDots: false, |
11 | - autoplay: false, | ||
12 | - interval: 2000, | 11 | + autoplay: true, |
12 | + interval: 3000, | ||
13 | duration: 1000, | 13 | duration: 1000, |
14 | currentSwiper: 0, | 14 | currentSwiper: 0, |
15 | currentpage:1, | 15 | currentpage:1, |
1 | <view class="headimg"> | 1 | <view class="headimg"> |
2 | - <image src="/img/headimg.png"></image> | 2 | + <!-- <image src="/img/headimg.png"></image> --> |
3 | 3 | ||
4 | <view class="logo"> | 4 | <view class="logo"> |
5 | <image src="/img/logo.png"></image> | 5 | <image src="/img/logo.png"></image> |
@@ -108,9 +108,9 @@ | @@ -108,9 +108,9 @@ | ||
108 | 108 | ||
109 | </view> | 109 | </view> |
110 | 110 | ||
111 | -<view class="bottomimg"> | 111 | +<!-- <view class="bottomimg"> |
112 | <image src="/img/bottom.png"></image> | 112 | <image src="/img/bottom.png"></image> |
113 | -</view> | 113 | +</view> --> |
114 | <!-- 是否预约 --> | 114 | <!-- 是否预约 --> |
115 | <!-- 弹窗 --> | 115 | <!-- 弹窗 --> |
116 | <view class="register" wx:if="{{yuyuecancel}}"> | 116 | <view class="register" wx:if="{{yuyuecancel}}"> |
1 | page { | 1 | page { |
2 | background: #ececec; | 2 | background: #ececec; |
3 | + background: url('https://areial.w.broing.cn/uploads/20191120/20200307212228.png') no-repeat center; | ||
4 | + background-size: 100% 100%; | ||
5 | + | ||
6 | + position: relative | ||
3 | } | 7 | } |
4 | 8 | ||
5 | .headimg { | 9 | .headimg { |
@@ -102,7 +106,7 @@ image { | @@ -102,7 +106,7 @@ image { | ||
102 | .headwhite { | 106 | .headwhite { |
103 | width: 750rpx; | 107 | width: 750rpx; |
104 | height: 228rpx; | 108 | height: 228rpx; |
105 | - background: #fff; | 109 | + |
106 | } | 110 | } |
107 | 111 | ||
108 | .swiperdot { | 112 | .swiperdot { |
@@ -121,20 +125,20 @@ image { | @@ -121,20 +125,20 @@ image { | ||
121 | 125 | ||
122 | .topboxleft { | 126 | .topboxleft { |
123 | width: 412rpx; | 127 | width: 412rpx; |
124 | - height: 244rpx; | 128 | + height: 295rpx; |
125 | font-size: 0; | 129 | font-size: 0; |
126 | position: relative | 130 | position: relative |
127 | } | 131 | } |
128 | /* 服务介绍 */ | 132 | /* 服务介绍 */ |
129 | .topboxright_t{ | 133 | .topboxright_t{ |
130 | - width:244rpx; | ||
131 | - height:244rpx; | 134 | + width:254rpx; |
135 | + height:295rpx; | ||
132 | font-size:0; | 136 | font-size:0; |
133 | position: relative | 137 | position: relative |
134 | } | 138 | } |
135 | .topboxright{ | 139 | .topboxright{ |
136 | width:214rpx; | 140 | width:214rpx; |
137 | - height:214rpx; | 141 | + height:241rpx; |
138 | font-size:0; | 142 | font-size:0; |
139 | position: relative | 143 | position: relative |
140 | } | 144 | } |
@@ -38,6 +38,7 @@ Page({ | @@ -38,6 +38,7 @@ Page({ | ||
38 | let url = "/api/index/experienceDetail"; | 38 | let url = "/api/index/experienceDetail"; |
39 | app.post(url) | 39 | app.post(url) |
40 | .then(res => { | 40 | .then(res => { |
41 | + console.log(res) | ||
41 | t.setData({ | 42 | t.setData({ |
42 | content: res.content | 43 | content: res.content |
43 | }) | 44 | }) |
1 | <view class="experiencetop"> | 1 | <view class="experiencetop"> |
2 | - <image src="/img/experience.png"></image> | 2 | + <image src="{{item}}" mode="widthFix" wx:for="{{content}}" wx:key=""></image> |
3 | 3 | ||
4 | <view class="share"> | 4 | <view class="share"> |
5 | <button open-type='share'></button> | 5 | <button open-type='share'></button> |
6 | <image class="shareimg" src="/img/share.png"></image> | 6 | <image class="shareimg" src="/img/share.png"></image> |
7 | </view> | 7 | </view> |
8 | 8 | ||
9 | - <view class="servicetext"> | 9 | + <!-- <view class="servicetext"> |
10 | <rich-text nodes="{{content}}"></rich-text> | 10 | <rich-text nodes="{{content}}"></rich-text> |
11 | - </view> | 11 | + </view> --> |
12 | + | ||
12 | 13 | ||
13 | - <view class="servicebox"> | 14 | +</view> |
15 | + | ||
16 | +<view class="servicebox"> | ||
14 | 17 | ||
15 | <view class="serviceboxtext">预约免费清洁除螨服务</view> | 18 | <view class="serviceboxtext">预约免费清洁除螨服务</view> |
16 | <view class="servicelsit"> | 19 | <view class="servicelsit"> |
@@ -60,4 +63,3 @@ | @@ -60,4 +63,3 @@ | ||
60 | <view class="queren" wx:else>已预约</view> | 63 | <view class="queren" wx:else>已预约</view> |
61 | </view> | 64 | </view> |
62 | </view> | 65 | </view> |
63 | -</view> |
1 | .experiencetop { | 1 | .experiencetop { |
2 | width: 750rpx; | 2 | width: 750rpx; |
3 | - height: 492rpx; | ||
4 | - font-size: 0; | 3 | + height: 100%; |
4 | + | ||
5 | } | 5 | } |
6 | 6 | ||
7 | image { | 7 | image { |
8 | width: 100%; | 8 | width: 100%; |
9 | - height: 100%; | 9 | + /* height: 100%; */ |
10 | } | 10 | } |
11 | 11 | ||
12 | .share { | 12 | .share { |
@@ -49,9 +49,12 @@ image { | @@ -49,9 +49,12 @@ image { | ||
49 | background: rgba(255, 255, 255, 1); | 49 | background: rgba(255, 255, 255, 1); |
50 | box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.16); | 50 | box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.16); |
51 | opacity: 1; | 51 | opacity: 1; |
52 | - position: absolute; | 52 | + margin:32rpx auto 35rpx; |
53 | + | ||
54 | + box-sizing: border-box; | ||
55 | + /* position: absolute; | ||
53 | bottom: 65rpx; | 56 | bottom: 65rpx; |
54 | - left: 32rpx; | 57 | + left: 32rpx; */ |
55 | } | 58 | } |
56 | 59 | ||
57 | .servicelsit { | 60 | .servicelsit { |
@@ -73,7 +76,14 @@ image { | @@ -73,7 +76,14 @@ image { | ||
73 | height: 56rpx; | 76 | height: 56rpx; |
74 | font-size: 0; | 77 | font-size: 0; |
75 | } | 78 | } |
76 | - | 79 | +.servicelsitleft image{ |
80 | + width:100%; | ||
81 | + height:100%; | ||
82 | +} | ||
83 | +.share image{ | ||
84 | + width:100%; | ||
85 | + height:100%; | ||
86 | +} | ||
77 | .servicelistright { | 87 | .servicelistright { |
78 | width: 389rpx; | 88 | width: 389rpx; |
79 | color: #bdc4ce; | 89 | color: #bdc4ce; |
@@ -102,6 +112,10 @@ image { | @@ -102,6 +112,10 @@ image { | ||
102 | height: 15rpx; | 112 | height: 15rpx; |
103 | font-size: 0; | 113 | font-size: 0; |
104 | } | 114 | } |
115 | +.rightrow image{ | ||
116 | + width:100%; | ||
117 | + height:100%; | ||
118 | +} | ||
105 | 119 | ||
106 | .queren { | 120 | .queren { |
107 | width: 516rpx; | 121 | width: 516rpx; |
1 | // pages/serviceintro/serviceintro.js | 1 | // pages/serviceintro/serviceintro.js |
2 | + | ||
3 | +var WxParse = require('../../wxParse/wxParse.js'); | ||
2 | const app = getApp(); | 4 | const app = getApp(); |
3 | Page({ | 5 | Page({ |
4 | 6 | ||
@@ -27,6 +29,7 @@ Page({ | @@ -27,6 +29,7 @@ Page({ | ||
27 | image: res.image, | 29 | image: res.image, |
28 | content: res.content | 30 | content: res.content |
29 | }) | 31 | }) |
32 | + WxParse.wxParse('article', 'html', res.content, t, 5); | ||
30 | }) | 33 | }) |
31 | }, | 34 | }, |
32 | /** | 35 | /** |
1 | +<import src="../../wxParse/wxParse.wxml" /> | ||
1 | <view class="top"> | 2 | <view class="top"> |
2 | <image src="/img/headimg.png"></image> | 3 | <image src="/img/headimg.png"></image> |
3 | <view class="topimg"> | 4 | <view class="topimg"> |
@@ -6,5 +7,6 @@ | @@ -6,5 +7,6 @@ | ||
6 | </view> | 7 | </view> |
7 | 8 | ||
8 | <view class="textbox"> | 9 | <view class="textbox"> |
9 | - <rich-text class="textboxword" nodes="{{content}}"></rich-text> | 10 | + <!-- <rich-text class="textboxword" nodes="{{content}}"></rich-text> --> |
11 | + <template is="wxParse" data="{{wxParseData:article.nodes}}" /> | ||
10 | </view> | 12 | </view> |
wxParse/emojis/00.gif
0 → 100644
1.8 KB
wxParse/emojis/01.gif
0 → 100644
1.5 KB
wxParse/emojis/02.gif
0 → 100644
1.8 KB
wxParse/emojis/03.gif
0 → 100644
1.8 KB
wxParse/emojis/04.gif
0 → 100644
1.9 KB
wxParse/emojis/05.gif
0 → 100644
1.8 KB
wxParse/emojis/06.gif
0 → 100644
3.5 KB
wxParse/emojis/07.gif
0 → 100644
3.8 KB
wxParse/emojis/08.gif
0 → 100644
4.6 KB
wxParse/emojis/09.gif
0 → 100644
3.2 KB
wxParse/emojis/10.gif
0 → 100644
3.6 KB
wxParse/emojis/100.gif
0 → 100644
1.7 KB
wxParse/emojis/101.gif
0 → 100644
2.4 KB
wxParse/emojis/102.gif
0 → 100644
1.4 KB
wxParse/emojis/103.gif
0 → 100644
2.1 KB
wxParse/emojis/104.gif
0 → 100644
2.1 KB
wxParse/emojis/105.gif
0 → 100644
1.2 KB
wxParse/emojis/106.gif
0 → 100644
1.0 KB
wxParse/emojis/107.gif
0 → 100644
1.0 KB
wxParse/emojis/108.gif
0 → 100644
1.0 KB
wxParse/emojis/109.gif
0 → 100644
1.1 KB
wxParse/emojis/11.gif
0 → 100644
7.8 KB
wxParse/emojis/110.gif
0 → 100644
1.1 KB
wxParse/emojis/111.gif
0 → 100644
1.0 KB
wxParse/emojis/112.gif
0 → 100644
1.1 KB
wxParse/emojis/113.gif
0 → 100644
1015 字节
wxParse/emojis/114.gif
0 → 100644
1003 字节
wxParse/emojis/115.gif
0 → 100644
1.0 KB
wxParse/emojis/116.gif
0 → 100644
996 字节
wxParse/emojis/117.gif
0 → 100644
1.0 KB
wxParse/emojis/118.gif
0 → 100644
1012 字节
wxParse/emojis/119.gif
0 → 100644
1.1 KB
wxParse/emojis/12.gif
0 → 100644
2.2 KB
wxParse/emojis/120.gif
0 → 100644
1008 字节
wxParse/emojis/121.gif
0 → 100644
1.0 KB
wxParse/emojis/122.gif
0 → 100644
999 字节
wxParse/emojis/123.gif
0 → 100644
1.0 KB
wxParse/emojis/124.gif
0 → 100644
1022 字节
wxParse/emojis/125.gif
0 → 100644
1013 字节
wxParse/emojis/126.gif
0 → 100644
1.0 KB
wxParse/emojis/127.gif
0 → 100644
956 字节
wxParse/emojis/128.gif
0 → 100644
1022 字节
wxParse/emojis/129.gif
0 → 100644
972 字节
wxParse/emojis/13.gif
0 → 100644
1.7 KB
wxParse/emojis/130.gif
0 → 100644
980 字节
wxParse/emojis/131.gif
0 → 100644
945 字节
wxParse/emojis/132.gif
0 → 100644
936 字节
wxParse/emojis/133.gif
0 → 100644
1012 字节
wxParse/emojis/134.gif
0 → 100644
968 字节
wxParse/emojis/14.gif
0 → 100644
3.9 KB
wxParse/emojis/15.gif
0 → 100644
1.5 KB
wxParse/emojis/16.gif
0 → 100644
1.4 KB
wxParse/emojis/17.gif
0 → 100644
3.3 KB
wxParse/emojis/18.gif
0 → 100644
7.9 KB
wxParse/emojis/19.gif
0 → 100644
7.9 KB
wxParse/emojis/20.gif
0 → 100644
1.8 KB
wxParse/emojis/21.gif
0 → 100644
1.8 KB
wxParse/emojis/22.gif
0 → 100644
2.9 KB
wxParse/emojis/23.gif
0 → 100644
1.9 KB
wxParse/emojis/24.gif
0 → 100644
2.2 KB
wxParse/emojis/25.gif
0 → 100644
2.4 KB
wxParse/emojis/26.gif
0 → 100644
3.9 KB
wxParse/emojis/27.gif
0 → 100644
2.8 KB
wxParse/emojis/28.gif
0 → 100644
3.2 KB
wxParse/emojis/29.gif
0 → 100644
5.7 KB
wxParse/emojis/30.gif
0 → 100644
1.7 KB
wxParse/emojis/31.gif
0 → 100644
5.1 KB
wxParse/emojis/32.gif
0 → 100644
7.0 KB
wxParse/emojis/33.gif
0 → 100644
4.2 KB
wxParse/emojis/34.gif
0 → 100644
2.1 KB
wxParse/emojis/35.gif
0 → 100644
13.1 KB
wxParse/emojis/36.gif
0 → 100644
1.4 KB
wxParse/emojis/37.gif
0 → 100644
1.2 KB
wxParse/emojis/38.gif
0 → 100644
1.6 KB
wxParse/emojis/39.gif
0 → 100644
1.8 KB
wxParse/emojis/40.gif
0 → 100644
9.9 KB
wxParse/emojis/41.gif
0 → 100644
3.3 KB
wxParse/emojis/42.gif
0 → 100644
13.1 KB
wxParse/emojis/43.gif
0 → 100644
4.2 KB
wxParse/emojis/44.gif
0 → 100644
1.5 KB
wxParse/emojis/45.gif
0 → 100644
4.6 KB
wxParse/emojis/46.gif
0 → 100644
5.0 KB
wxParse/emojis/47.gif
0 → 100644
3.6 KB
wxParse/emojis/48.gif
0 → 100644
1.7 KB
wxParse/emojis/49.gif
0 → 100644
6.2 KB
wxParse/emojis/50.gif
0 → 100644
3.0 KB
-
请 注册 或 登录 后发表评论