Commit 2fbd29c340962541926ce58ab42eb761db0fbbe1
1 parent
1344a239
OA单
Showing
10 changed files
with
112 additions
and
5 deletions
components/diy_floatingWindow/diy_floatingWindow.js
0 → 100644
1 | +Component({ | ||
2 | + properties: { | ||
3 | + // 这里定义了innerText属性,属性值可以在组件使用时指定 | ||
4 | + object:{ | ||
5 | + type: Object, | ||
6 | + value:null | ||
7 | + }, | ||
8 | + | ||
9 | + }, | ||
10 | + data: { | ||
11 | + // 这里是一些组件内部数据 | ||
12 | + someData: {} | ||
13 | + }, | ||
14 | + methods: { | ||
15 | + //--智能跳转-- | ||
16 | + go_url:function (e) { | ||
17 | + var url=e.currentTarget.dataset.url; | ||
18 | + getApp().goto(url); | ||
19 | + }, | ||
20 | + | ||
21 | + berror:function(e){ | ||
22 | + var iurl=getApp().globalData.setting.imghost; | ||
23 | + var ob={}; | ||
24 | + var txt="object.title_img"; | ||
25 | + ob[txt] = iurl +'/miniapp/images/logo.png?v=1'; | ||
26 | + this.setData(ob); | ||
27 | + }, | ||
28 | + nv_void(e){ | ||
29 | + var feedId=e.currentTarget.dataset.feedid; | ||
30 | + var finderUserName=e.currentTarget.dataset.finderusername; | ||
31 | + var video_type=e.currentTarget.dataset.video_type; | ||
32 | + getApp().openChannelsActivity({ | ||
33 | + feedId, | ||
34 | + finderUserName, | ||
35 | + video_type | ||
36 | + }) | ||
37 | + } | ||
38 | + } | ||
39 | +}) |
components/diy_floatingWindow/diy_floatingWindow.json
0 → 100644
components/diy_floatingWindow/diy_floatingWindow.wxml
0 → 100644
1 | +<wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs> | ||
2 | + | ||
3 | +<view class="big_rim"> | ||
4 | + <!-- <navigator url="{{object.wxapp_url}}" > | ||
5 | + <view class="custom-service" style="background-image: url({{object.img}});" > | ||
6 | + <view class="s_title">{{object.title}}</view> | ||
7 | + </view> | ||
8 | + </navigator> --> | ||
9 | + <navigator url="{{object.wxapp_url}}" wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}"> | ||
10 | + <view class="custom-service" style="background-image: url({{object.img}});{{object.loaction_index==1 ? 'right: 2rpx;' :'left: 2rpx;' }}" > | ||
11 | + <view class="s_title">{{object.title}}</view> | ||
12 | + </view> | ||
13 | + </navigator> | ||
14 | + <navigator wx:elif="{{object.AppId}}" style="width:{{100/nav_list.length}}%;" target="miniProgram" app-id="{{object.AppId}}" path="{{object.wxapp_url}}"> | ||
15 | + <view class="custom-service" style="background-image: url({{object.img}});{{object.loaction_index==1 ? 'right: 2rpx;' :'left: 2rpx;' }}" > | ||
16 | + <view class="s_title">{{object.title}}</view> | ||
17 | + </view> | ||
18 | + </navigator> | ||
19 | + <view wx:elif="{{object.finderUserName && object.video_type}}" data-url="{{object.wxapp_url}}" bindtap="nv_void" data-feedId="{{object.feedId}}" data-video_type="{{object.video_type}}" data-finderUserName="{{object.finderUserName}}" > | ||
20 | + <view class="custom-service" style="background-image: url({{object.img}});{{object.loaction_index==1 ? 'right: 2rpx;' :'left: 2rpx;' }}" > | ||
21 | + <view class="s_title">{{object.title}}</view> | ||
22 | + </view> | ||
23 | + </view> | ||
24 | + <view data-url="{{object.wxapp_url}}" bindtap="go_url" wx:else> | ||
25 | + <view class="custom-service" style="background-image: url({{object.img}});{{object.loaction_index==1 ? 'right: 2rpx;' :'left: 2rpx;' }}" > | ||
26 | + <view class="s_title">{{object.title}}</view> | ||
27 | + </view> | ||
28 | + </view> | ||
29 | +</view> |
components/diy_floatingWindow/diy_floatingWindow.wxss
0 → 100644
1 | +.custom-service { | ||
2 | + width: 100rpx; | ||
3 | + height: 100rpx; | ||
4 | + /* background-color: red; */ | ||
5 | + border-radius: 50%; | ||
6 | + z-index: 100; | ||
7 | + line-height: 28rpx; | ||
8 | + position: fixed; | ||
9 | + top: 50%; | ||
10 | + | ||
11 | + /* background-position: 50%; */ | ||
12 | + background-repeat: no-repeat; | ||
13 | + /* background-attachment: fixed; */ | ||
14 | + background-size: cover; | ||
15 | + | ||
16 | +} | ||
17 | +.s_title{ | ||
18 | + font-size: 20rpx; | ||
19 | + position: absolute; | ||
20 | + left: 0; | ||
21 | + right: 0; | ||
22 | + bottom: 5rpx; | ||
23 | + text-align: center; | ||
24 | + color: #fff; | ||
25 | +} |
components/diy_service/diy_service.wxss
1 | -.custom-service{ width: 116rpx; height: 116rpx; border-radius: 50%; background-color: #fff;z-index: 100; | 1 | +.custom-service{ width: 100rpx; height: 100rpx; border-radius: 50%; background-color: #fff;z-index: 100; |
2 | border: 1px solid #adadad; box-shadow: 0 0 10px 2px #adadad; line-height: 28rpx; | 2 | border: 1px solid #adadad; box-shadow: 0 0 10px 2px #adadad; line-height: 28rpx; |
3 | position: fixed; top: 40%; right: 2rpx; display: flex;align-items: center;justify-content: center;} | 3 | position: fixed; top: 40%; right: 2rpx; display: flex;align-items: center;justify-content: center;} |
4 | 4 | ||
5 | .cs-img{ width: 36rpx; height: 36rpx;} | 5 | .cs-img{ width: 36rpx; height: 36rpx;} |
6 | -.s_title{ font-size: 20rpx;} | ||
7 | \ No newline at end of file | 6 | \ No newline at end of file |
7 | +.s_title{ font-size: 14rpx;} | ||
8 | \ No newline at end of file | 8 | \ No newline at end of file |
packageG/pages/payment/pay_success/pay_success.wxml
@@ -147,5 +147,5 @@ | @@ -147,5 +147,5 @@ | ||
147 | 147 | ||
148 | 148 | ||
149 | <view class="shequn" style="margin-top:20rpx;" bindtap="gotoshequn" wx:if="{{banner}}" data-url="{{banner[0].ad_weapplink}}"> | 149 | <view class="shequn" style="margin-top:20rpx;" bindtap="gotoshequn" wx:if="{{banner}}" data-url="{{banner[0].ad_weapplink}}"> |
150 | - <image src="{{banner[0].ad_code}}" mode="scaleToFill" style="width: 100%;border-radius: 15rpx;" /> | 150 | + <image src="{{banner[0].ad_code}}" mode="widthFix" style="width: 100%;border-radius: 15rpx;" /> |
151 | </view> | 151 | </view> |
152 | \ No newline at end of file | 152 | \ No newline at end of file |
pages/index/index/index.json
@@ -25,7 +25,8 @@ | @@ -25,7 +25,8 @@ | ||
25 | "serviceCard": "/components/diy_serviceCard/diy_serviceCard", | 25 | "serviceCard": "/components/diy_serviceCard/diy_serviceCard", |
26 | "live": "/components/diy_live/diy_live", | 26 | "live": "/components/diy_live/diy_live", |
27 | "mp-dialog": "weui-miniprogram/dialog/dialog", | 27 | "mp-dialog": "weui-miniprogram/dialog/dialog", |
28 | - "mp-sticky": "/components/mp-sticky/mp-sticky", | 28 | + "mp-sticky": "/components/mp-sticky/mp-sticky", |
29 | + "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow", | ||
29 | "privacy_pop": "/components/privacy_pop/privacy_pop" | 30 | "privacy_pop": "/components/privacy_pop/privacy_pop" |
30 | }, | 31 | }, |
31 | "enablePullDownRefresh": false, | 32 | "enablePullDownRefresh": false, |
pages/index/index/index.wxml
@@ -495,6 +495,10 @@ | @@ -495,6 +495,10 @@ | ||
495 | <block wx:if="{{item.ename=='title'}}"> | 495 | <block wx:if="{{item.ename=='title'}}"> |
496 | <title object="{{item.content}}"></title> | 496 | <title object="{{item.content}}"></title> |
497 | </block> | 497 | </block> |
498 | + <!--悬浮窗口--> | ||
499 | + <block wx:if="{{item.ename=='floatingWindow'}}"> | ||
500 | + <floatingWindow object="{{item.content}}"></floatingWindow> | ||
501 | + </block> | ||
498 | <!--辅助空白--> | 502 | <!--辅助空白--> |
499 | <block wx:if="{{item.ename=='white'}}"> | 503 | <block wx:if="{{item.ename=='white'}}"> |
500 | <assist object="{{item.content}}"></assist> | 504 | <assist object="{{item.content}}"></assist> |
pages/template/index.json
@@ -21,7 +21,8 @@ | @@ -21,7 +21,8 @@ | ||
21 | "picMax": "/components/diy_picMax/diy_picMax", | 21 | "picMax": "/components/diy_picMax/diy_picMax", |
22 | "mvideo": "/components/diy_video/diy_video", | 22 | "mvideo": "/components/diy_video/diy_video", |
23 | "service": "/components/diy_service/diy_service", | 23 | "service": "/components/diy_service/diy_service", |
24 | - "scan": "/components/diy_scan/diy_scan", | 24 | + "scan": "/components/diy_scan/diy_scan", |
25 | + "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow", | ||
25 | "presell": "/components/diy_pregoods/diy_pregoods" | 26 | "presell": "/components/diy_pregoods/diy_pregoods" |
26 | }, | 27 | }, |
27 | "enablePullDownRefresh": false, | 28 | "enablePullDownRefresh": false, |
pages/template/index.wxml
@@ -58,6 +58,10 @@ | @@ -58,6 +58,10 @@ | ||
58 | <block wx:if="{{item.ename=='white'}}"> | 58 | <block wx:if="{{item.ename=='white'}}"> |
59 | <assist object="{{item.content}}"></assist> | 59 | <assist object="{{item.content}}"></assist> |
60 | </block> | 60 | </block> |
61 | + <!--悬浮窗口--> | ||
62 | + <block wx:if="{{item.ename=='floatingWindow'}}"> | ||
63 | + <floatingWindow object="{{item.content}}"></floatingWindow> | ||
64 | + </block> | ||
61 | <!--图片组合--> | 65 | <!--图片组合--> |
62 | <block wx:if="{{item.ename=='picMix'}}"> | 66 | <block wx:if="{{item.ename=='picMix'}}"> |
63 | <picMax object="{{item.content}}"></picMax> | 67 | <picMax object="{{item.content}}"></picMax> |