From f2e106294be34845b1f356fbe16665c9284b222d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 17:57:08 +0800
Subject: [PATCH] 提交
---
wechat_staff/pages/sets/protocol.wxml | 2 ++
wechat_staff/components/disRealpic/index.less | 6 +++---
wechat_staff/pages/userinfo/index.wxss | 3 ++-
wechat_jiaxuan/components/disRealpic/index.json | 4 +++-
wechat_jiaxuan/pages/sets/protocol.json | 4 +++-
wechat_staff/pages/userinfo/index.less | 1 +
wechat_staff/pages/work/index.wxss | 1 +
wechat_jiaxuan/pages/sets/protocol.wxml | 4 ++--
wechat_staff/components/disRealpic/index.wxml | 9 ++++-----
wechat_staff/pages/work/index.less | 1 +
wechat_staff/components/disRealpic/index.wxss | 6 +++---
11 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/wechat_jiaxuan/components/disRealpic/index.json b/wechat_jiaxuan/components/disRealpic/index.json
index e8cfaaf..b2baa38 100644
--- a/wechat_jiaxuan/components/disRealpic/index.json
+++ b/wechat_jiaxuan/components/disRealpic/index.json
@@ -1,4 +1,6 @@
{
"component": true,
- "usingComponents": {}
+ "usingComponents": {
+ "videoPlay": "/components/videoPlay/index"
+ }
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/protocol.json b/wechat_jiaxuan/pages/sets/protocol.json
index d8bbc60..0ec25df 100644
--- a/wechat_jiaxuan/pages/sets/protocol.json
+++ b/wechat_jiaxuan/pages/sets/protocol.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "mp-html": "mp-html"
+ },
"navigationBarTitleText": ""
}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/sets/protocol.wxml b/wechat_jiaxuan/pages/sets/protocol.wxml
index f288e0d..79fbe74 100644
--- a/wechat_jiaxuan/pages/sets/protocol.wxml
+++ b/wechat_jiaxuan/pages/sets/protocol.wxml
@@ -1,3 +1,3 @@
-<view class="container">
- <rich-text nodes="{{ activeHtml }}"></rich-text>
+<view style="width: 100%;height: auto;padding: 0px 40rpx;">
+<mp-html content="{{activeHtml}}"> </mp-html>
</view>
\ No newline at end of file
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index 2fea38a..be85a2f 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -174,10 +174,10 @@
right: 32rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width: 112rpx;
- height: 42rpx;
+ width:52rpx;
+ height: 46rpx;
background: rgba(0, 0, 0, 0.54);
- border-radius: 30rpx;
+ border-radius: 8rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index 87210e4..f4828b6 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -12,7 +12,7 @@
<scroll-view class="query_wrap_scroll" scroll-x>
<view class="query_wrap">
<view data-index="{{ index }}" wx:for="{{ cateList }}" class="item" bindtap="changeShowParams">
- <view class="name">{{ item.paramName || item.labelName }}</view>
+ <view class="name">{{ item.tempParamName || item.labelName }}</view>
<van-icon name="{{ activeIndex === index ? 'arrow-up' : 'arrow-down' }}" />
</view>
</view>
@@ -20,7 +20,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].paramIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ cateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
@@ -40,9 +40,8 @@
<view wx:for="{{ dataList }}" data-index="index" data-item="{{item}}" class="item {{(index%2 == 0 && index == dataList.length-1)?'lastitem':''}}" bindtap="handleDetail">
<view class="img_wrap">
<image src="{{ item.coverImage }}" class="img"></image>
- <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
- <image class="icon" src="../../static/icon/ic_720.png" mode="widthFix"></image>
- <text>鍏ㄦ櫙</text>
+ <view wx:if="{{ item.openType == 'link' }}" data-item="{{item}}" bindtap="priviewFull" class="full">
+ <text>VR</text>
</view>
<image wx:if="{{ item.openType == 'video' }}" bindtap="videoClick" data-videourl="{{ item.openContent }}" class="play" src="../../static/icon/ic_play.png" mode="widthFix"></image>
<image wx:if="{{ false }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index ce00af9..d7bf108 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -157,10 +157,10 @@
right: 32rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
- width: 112rpx;
- height: 42rpx;
+ width:52rpx;
+ height: 46rpx;
background: rgba(0, 0, 0, 0.54);
- border-radius: 30rpx;
+ border-radius: 8rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/wechat_staff/pages/sets/protocol.wxml b/wechat_staff/pages/sets/protocol.wxml
index e816cce..e36adf3 100644
--- a/wechat_staff/pages/sets/protocol.wxml
+++ b/wechat_staff/pages/sets/protocol.wxml
@@ -1,2 +1,4 @@
<!--pages/sets/protocol.wxml-->
+<view style="width: 100%;height: auto;padding: 0px 40rpx;">
<mp-html content="{{content}}"> </mp-html>
+</view>
diff --git a/wechat_staff/pages/userinfo/index.less b/wechat_staff/pages/userinfo/index.less
index 6de6e21..c55939e 100644
--- a/wechat_staff/pages/userinfo/index.less
+++ b/wechat_staff/pages/userinfo/index.less
@@ -73,5 +73,6 @@
font-weight: 500;
font-size: 32rpx;
margin-top: 20rpx;
+ margin-bottom: 10rpx;
}
}
\ No newline at end of file
diff --git a/wechat_staff/pages/userinfo/index.wxss b/wechat_staff/pages/userinfo/index.wxss
index 048cde9..57706ba 100644
--- a/wechat_staff/pages/userinfo/index.wxss
+++ b/wechat_staff/pages/userinfo/index.wxss
@@ -73,5 +73,6 @@
border-radius: 8rpx;
font-weight: 500;
font-size: 32rpx;
- margin-top: 20rpx;
+ margin-top: 20rpx;
+ margin-bottom: 10rpx;
}
diff --git a/wechat_staff/pages/work/index.less b/wechat_staff/pages/work/index.less
index fc3030b..4ee6943 100644
--- a/wechat_staff/pages/work/index.less
+++ b/wechat_staff/pages/work/index.less
@@ -45,6 +45,7 @@
}
}
.main_content{
+ margin-top: -16rpx;
background-color: #fff;
border-radius: 16rpx 16rpx 0rpx 0rpx;
padding: 40rpx;
diff --git a/wechat_staff/pages/work/index.wxss b/wechat_staff/pages/work/index.wxss
index 7d21c6a..71a87b2 100644
--- a/wechat_staff/pages/work/index.wxss
+++ b/wechat_staff/pages/work/index.wxss
@@ -41,6 +41,7 @@
margin-right: 30rpx;
}
.container .main_content {
+ margin-top: -16rpx;
background-color: #fff;
border-radius: 16rpx 16rpx 0rpx 0rpx;
padding: 40rpx;
--
Gitblit v1.9.3