From 08060f5ef73a178bc675cb5406d329eb3e13a276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 18:06:34 +0800
Subject: [PATCH] 提交
---
wechat_jiaxuan/components/disRealpic/index.js | 3 +--
wechat_staff/components/disCase/index.wxml | 2 +-
wechat_staff/components/disRealpic/index.js | 3 +--
wechat_staff/components/disProduct/index.wxml | 2 +-
wechat_jiaxuan/components/disRealpic/index.wxml | 5 ++---
wechat_staff/components/disRealpic/index.less | 4 ++--
wechat_jiaxuan/components/disRealpic/index.wxss | 4 ++--
wechat_jiaxuan/components/disRealpic/index.less | 4 ++--
wechat_staff/components/disRealpic/index.wxml | 2 +-
wechat_staff/components/disRealpic/index.wxss | 4 ++--
10 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/wechat_jiaxuan/components/disRealpic/index.js b/wechat_jiaxuan/components/disRealpic/index.js
index 66c005c..c96868b 100644
--- a/wechat_jiaxuan/components/disRealpic/index.js
+++ b/wechat_jiaxuan/components/disRealpic/index.js
@@ -149,8 +149,7 @@
const paramIndex = e.currentTarget.dataset.index
const { cateList, tagCodes, activeParam, activeIndex } = this.data
const index = tagCodes.indexOf(code)
- if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
-
+ if( cateList[activeIndex].tempParamIndex==null || cateList[activeIndex].tempParamIndex != paramIndex){
cateList[activeIndex].tempParamIndex = paramIndex
cateList[activeIndex].tempParamName = activeParam[paramIndex].labelValueName
cateList[activeIndex].tempParamCode = code
diff --git a/wechat_jiaxuan/components/disRealpic/index.less b/wechat_jiaxuan/components/disRealpic/index.less
index bff8c6f..7343f39 100644
--- a/wechat_jiaxuan/components/disRealpic/index.less
+++ b/wechat_jiaxuan/components/disRealpic/index.less
@@ -171,8 +171,8 @@
.full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
width:52rpx;
diff --git a/wechat_jiaxuan/components/disRealpic/index.wxml b/wechat_jiaxuan/components/disRealpic/index.wxml
index 88c3210..a42d9be 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxml
+++ b/wechat_jiaxuan/components/disRealpic/index.wxml
@@ -40,9 +40,8 @@
<view wx:for="{{ dataList }}" data-item="{{item}}" class="item" 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_jiaxuan/components/disRealpic/index.wxss b/wechat_jiaxuan/components/disRealpic/index.wxss
index 8907ea2..1e48bc7 100644
--- a/wechat_jiaxuan/components/disRealpic/index.wxss
+++ b/wechat_jiaxuan/components/disRealpic/index.wxss
@@ -156,8 +156,8 @@
}
.main_content .goods_list .item .img_wrap .full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
width:52rpx;
diff --git a/wechat_staff/components/disCase/index.wxml b/wechat_staff/components/disCase/index.wxml
index 740b6e1..5bbf5ff 100644
--- a/wechat_staff/components/disCase/index.wxml
+++ b/wechat_staff/components/disCase/index.wxml
@@ -19,7 +19,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <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 data-index="{{index}}" 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>
diff --git a/wechat_staff/components/disProduct/index.wxml b/wechat_staff/components/disProduct/index.wxml
index c5a8ecc..0d2634d 100644
--- a/wechat_staff/components/disProduct/index.wxml
+++ b/wechat_staff/components/disProduct/index.wxml
@@ -21,7 +21,7 @@
</view>
<view wx:if="{{ activeParam.length > 0 }}" class="query_form">
<view class="list">
- <view data-index="{{index}}" data-tempindex="{{item.tempParamIndex}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
+ <view data-index="{{index}}" data-code="{{ item.labelValueCode }}" bindtap="tagClick" wx:for="{{ activeParam }}" class="item {{ secondCateList[activeIndex].tempParamIndex === index ? 'active' : '' }}">{{ item.labelValueName }}</view>
</view>
<view class="btns">
<view class="btn" bindtap="cancelParam">鍙栨秷</view>
diff --git a/wechat_staff/components/disRealpic/index.js b/wechat_staff/components/disRealpic/index.js
index 96a0b65..aa2ca72 100644
--- a/wechat_staff/components/disRealpic/index.js
+++ b/wechat_staff/components/disRealpic/index.js
@@ -146,8 +146,7 @@
cateList[activeIndex].tempParamCode = null
console.log(1)
}
- this.setData({ cateList })
- console.log(cateList)
+ this.setData({ cateList })
},
cancelParam() {
const { cateList } = this.data
diff --git a/wechat_staff/components/disRealpic/index.less b/wechat_staff/components/disRealpic/index.less
index be85a2f..f50c0d6 100644
--- a/wechat_staff/components/disRealpic/index.less
+++ b/wechat_staff/components/disRealpic/index.less
@@ -170,8 +170,8 @@
.full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
width:52rpx;
diff --git a/wechat_staff/components/disRealpic/index.wxml b/wechat_staff/components/disRealpic/index.wxml
index f4828b6..1a43096 100644
--- a/wechat_staff/components/disRealpic/index.wxml
+++ b/wechat_staff/components/disRealpic/index.wxml
@@ -20,7 +20,7 @@
<!-- param -->
<view wx:if="{{ activeParam && activeParam.length > 0 }}" class="query_param">
<view class="list">
- <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 data-index="{{index}}" 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>
diff --git a/wechat_staff/components/disRealpic/index.wxss b/wechat_staff/components/disRealpic/index.wxss
index d7bf108..81aea67 100644
--- a/wechat_staff/components/disRealpic/index.wxss
+++ b/wechat_staff/components/disRealpic/index.wxss
@@ -153,8 +153,8 @@
}
.main_content .goods_list .item .img_wrap .full {
position: absolute;
- top: 32rpx;
- right: 32rpx;
+ top: 16rpx;
+ left: 16rpx;
font-size: 20rpx;
color: rgba(255, 255, 255, 0.8);
width:52rpx;
--
Gitblit v1.9.3