From b67f2c4fce992a818f287783ae7029a0b03509d3 Mon Sep 17 00:00:00 2001
From: 重庆迈尖科技有限公司
Date: 星期二, 16 六月 2020 16:21:25 +0800
Subject: [PATCH] ss
---
AppInside/tearcher/index.html | 4
AppInside/cloudPushOrder/img/icon_maxFan.png | 0
AppInside/activityDetailTempPage/index.html | 114 ++++++++++++++++++-------------------
AppInside/cloudPushOrder/cloudPushOrderManage.html | 12 +++-
AppInside/cloudPushOrder/css/base.css | 3
5 files changed, 68 insertions(+), 65 deletions(-)
diff --git a/AppInside/activityDetailTempPage/index.html b/AppInside/activityDetailTempPage/index.html
index 93d079c..083d427 100644
--- a/AppInside/activityDetailTempPage/index.html
+++ b/AppInside/activityDetailTempPage/index.html
@@ -144,7 +144,7 @@
<div class="imgshow" style="display: none; background-color: black;position: fixed;left: 0;top: 0;width: 100%;height: 100%;z-index: 2019521;overflow-y:scroll;">
<div class="swiper-container">
- <div class="swiper-wrapper" style="width: 100%;height: 100%;-webkit-flex;align-items: center;"></div>
+ <div class="swiper-wrapper"></div>
</div>
</div>
</body>
@@ -171,6 +171,7 @@
var layerIndex = null;
var isShowImg = false;
var initialslide = 0;
+ var swiper = null;
var app;
$(function() {
@@ -246,27 +247,7 @@
}
}
- var swiper = new Swiper('.swiper-container', {
- spaceBetween: 0,
- freeMode: false,
- initialSlide: initialslide,
- touchMoveStopPropagation: false,
- preventClicksPropagation: false,
- observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
- observeParents: true, //淇敼swiper鐨勭埗鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
- on: {
- click: function() { //鐐瑰嚮浜嬩欢
- app.openScroll();
- yesApp.toast('ss')
- $('.imgshow').css('display', 'none');
- $('.imgshow .swiper-wrapper').empty();
- setTimeout(function() {
- isShowImg = false;
- }, 300);
- // this = null;
- },
- },
- });
+
app.setImageContent();
} else {
@@ -289,7 +270,6 @@
var screenWidth = window.screen.width * 2;
var screenHeight = window.screen.height * 2;
-
// 璁剧疆澶у浘
for (i = 0; i < imageLarge.length; i++) {
var width = null;
@@ -298,13 +278,13 @@
bigImageBG.append('<div class="div_largel" style="position: relative; "></div>');
bigImageBG.find('.div_largel').eq(i).append(
- "<img style='margin-left: 0.75rem;' class='imgShow'>");
+ "<img style='margin-left: 0.75rem;' class='imgShowlargel'>");
bigImageBG.find('.div_largel').eq(i).append(
'<img src="img/icon_play.png" style="position: absolute;left: 50%;top: 50%;margin-left: -0.4rem;margin-top: -0.4rem; width: 0.8rem;height: 0.8rem;" class="imagePlay"/>'
);
- bigImageBG.find(".div_largel").eq(i).find('.imgShow').eq(0).attr("src", imageLarge[i].url);
+ bigImageBG.find(".div_largel").eq(i).find('.imgShowlargel').eq(0).attr("src", imageLarge[i].url);
var compare = parseFloat(imageLarge[i].h) / parseFloat(imageLarge[i].w);
@@ -318,7 +298,7 @@
height = parseFloat(imageLarge[i].h) / parseFloat(imageLarge[i].w) * width;
}
- bigImageBG.find(".div_largel").eq(i).find('.imgShow').eq(0).css({
+ bigImageBG.find(".div_largel").eq(i).find('.imgShowlargel').eq(0).css({
'width': width + 'rem',
'height': height + 'rem',
'border-radius': '0.1rem'
@@ -328,6 +308,11 @@
if (imageLarge[i].videoUrl != null && imageLarge[i].videoUrl != '') {
bigImageBG.find(".div_largel").eq(i).find('.imagePlay').eq(0).css('display', 'block');
}
+
+ bigImageBG.find(".div_largel").eq(i).find('.imgShowlargel').eq(0).click(function() {
+ var nowImgurl = $(this).attr('src');
+ app.viewPicture(imageLarge, nowImgurl);
+ });
};
// 璁剧疆灏忓浘
if (parseInt(app.dataInfo.detailInfo.lineNum) == 2) {
@@ -346,40 +331,10 @@
// 鐐瑰嚮鏌ョ湅鍥剧墖
smallImageBG.find('.imgSmall').eq(k).click(function() {
-
- if (isShowImg) return;
var nowImgurl = $(this).attr('src');
- for (var lll = 0; lll < imageSmall.length; lll++) { // 鑾峰彇index
- if (nowImgurl == imageSmall[lll].url) {
- initialslide = lll;
- break;
- }
- }
-
-
-
-
- isShowImg = true;
- app.stopScroll();
-
- $('.imgshow').css('display', 'block');
- for (var o = 0; o < imageSmall.length; o++) {
- var url = imageSmall[o].url
- $('.imgshow .swiper-wrapper').append(
- '<div class="swiper-slide" ><img class="smallImgs" style="width:100%;heught:2rem;background-color: #ffffff" src="' +
- url + '"></div>');
-
- $('.imgshow .swiper-wrapper').find('swiper-slide').eq(o).find('smallImgs').eq(0).css('height',
- parseFloat(imageSmall[o].h) / 100 + 'rem');
- }
-
-
+ app.viewPicture(imageSmall, nowImgurl);
});
}
-
-
-
- // yesApp.toast(JSON.stringify(arrayComments.length + ''))
// 璁剧疆灏鹃儴
for (var j = 0; j < arrayComments.length; j++) {
@@ -505,10 +460,51 @@
//鍙宠竟绠ご
// divitemBg.find('.div_top_tag').eq(j).find('div_top_right').eq(0).append('<img src=img/icon_arrowRight.png" style="width: 0.48rem;height: 0.48rem;background-color: yellow;">');
-
-
}
},
+ // 鏌ョ湅鍥剧墖
+ viewPicture: function(arrayImage, picture) {
+ if (isShowImg) return;
+ for (var lll = 0; lll < arrayImage.length; lll++) { // 鑾峰彇index
+ if (picture == arrayImage[lll].url) {
+ initialslide = lll;
+ break;
+ }
+ }
+ isShowImg = true;
+ app.stopScroll();
+ swiper = new Swiper('.swiper-container', {
+ spaceBetween: 0,
+ freeMode: false,
+ initialSlide: initialslide,
+ touchMoveStopPropagation: false,
+ preventClicksPropagation: false,
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ observeParents: true, //淇敼swiper鐨勭埗鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ on: {
+ click: function() { //鐐瑰嚮浜嬩欢
+ app.openScroll();
+ $('.imgshow').css('display', 'none');
+ // $('.imgshow .swiper-wrapper').empty();
+ this.destroy(false);
+ setTimeout(function() {
+ isShowImg = false;
+ }, 300);
+ },
+ },
+ });
+ $('.imgshow').css('display', 'block');
+ for (var o = 0; o < arrayImage.length; o++) {
+ var url = arrayImage[o].url;
+ $('.imgshow .swiper-wrapper').append(
+ '<div class="swiper-slide"><img class="smallImgs" style="width:100%;heught:2rem;background-color: #ffffff" src="' +
+ url + '"></div>');
+
+ $('.imgshow .swiper-wrapper').find('swiper-slide').eq(o).find('smallImgs').eq(0).css('height',
+ parseFloat(arrayImage[o].h) / 100 + 'rem');
+ }
+ },
+
// 绂佹搴曢儴婊戝姩
stopScroll: function() {
document.body.style.overflow = 'hidden'; //鍏抽棴婊氬姩鏉�
diff --git a/AppInside/cloudPushOrder/cloudPushOrderManage.html b/AppInside/cloudPushOrder/cloudPushOrderManage.html
index d6d8327..f34e38e 100644
--- a/AppInside/cloudPushOrder/cloudPushOrderManage.html
+++ b/AppInside/cloudPushOrder/cloudPushOrderManage.html
@@ -262,7 +262,13 @@
<div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" class="coupon_money"> 锟{item.goods.couponInfo.amount}}
</div>
- <div class="fanli_title"> 杩攞{item.goods.moneyInfo.fanliMoney}} </div>
+ <div class="fanli_title"> 杩� {{item.goods.moneyInfo.fanliMoney}} </div>
+
+ <img src="img/icon_maxFan.png" style="width: 0.10rem;height: 0.17rem; margin-left: -0.22rem;">
+
+ <div v-if="item.goods.moneyInfo.maxMoney" style="color: #E5005C;font-size: 0.24rem;margin-left: -0.05rem; height: 0.36rem; background-color: #FFBBCB;border-radius: 0.06rem;display: -webkit-flex;align-items: center;justify-content: center;">
+ {{item.goods.moneyInfo.maxMoney}}
+ </div>
</div>
<div class="div_payment_sales_bg">
@@ -339,8 +345,8 @@
<script src="js/load.js"></script>
<script>
- // "http://api.flqapp.com";
- var host = "http://api.flqapp.com";
+ // "http://api.flqapp.com"; http://192.168.1.253:8080
+ var host = "http://192.168.1.253:8080";
var check = null;
var wId = null;
diff --git a/AppInside/cloudPushOrder/css/base.css b/AppInside/cloudPushOrder/css/base.css
index e0c5191..179d244 100644
--- a/AppInside/cloudPushOrder/css/base.css
+++ b/AppInside/cloudPushOrder/css/base.css
@@ -252,7 +252,8 @@
.div_coupon_bg {
position: absolute;
display: flex;
- bottom: 0.17rem;
+ bottom: 0.17rem;
+ align-items: center;
}
.coupon_money {
diff --git a/AppInside/cloudPushOrder/img/icon_maxFan.png b/AppInside/cloudPushOrder/img/icon_maxFan.png
new file mode 100644
index 0000000..a1717da
--- /dev/null
+++ b/AppInside/cloudPushOrder/img/icon_maxFan.png
Binary files differ
diff --git a/AppInside/tearcher/index.html b/AppInside/tearcher/index.html
index a8f4791..13c4273 100644
--- a/AppInside/tearcher/index.html
+++ b/AppInside/tearcher/index.html
@@ -118,12 +118,12 @@
<div v-if="isTearcher" class="content">
1.娣诲姞瀵煎笀寰俊鍙锋椂闇�瑕佸娉ㄦ澘鏍楀揩鐪両D锛�<br>
2.瀵煎笀浼氭牴鎹琛屼笟绮惧噯鍒ゆ柇鍜屼互鍙婂鏈珹pp鐨勭啛鎮夛紝鍊惧姏杈呭浜庝綘锛屽瀵煎笀娑堟瀬瀵瑰緟锛岃鑱旂郴浜哄伐瀹㈡湇涓炬姤锛�<br>
- 3.瑕佹兂鎴愪负瀵煎笀,鑱旂郴<a href="javascript:void()" onclick="kefu()">浜哄伐瀹㈡湇</a>
+ 3.瑕佹兂鎴愪负瀵煎笀,鑱旂郴<a href="javascript:void()" onclick="kefu()">浜哄伐瀹㈡湇銆�</a>
</div>
<div v-else class="content">
灏婃暚鐨勭敤鎴凤紝浣犵殑閭�璇峰叧绯讳腑杩樻病鏈夊甯堬紝濡備綘鏈夊甯堢浉鍏抽棶棰樺挩璇紝璇疯仈绯�
- <a href="javascript:void()" onclick="kefu()">浜哄伐瀹㈡湇</a>
+ <a href="javascript:void()" onclick="kefu()">浜哄伐瀹㈡湇銆�</a>
</div>
</div>
--
Gitblit v1.8.0