diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index a9d8860..6777d3c 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -754,6 +754,9 @@ Page({
//---展示---
onShow: function () {
+
+
+
var goods_list = null, th = this, that = this;
var show_prew_img = this.data.show_prew_img
if (show_prew_img) {
@@ -761,6 +764,11 @@ Page({
return false;
}
+ if(this.data.show_video) {
+ this.data.show_video=0;
+ return false;
+ }
+
//优惠券要实时更新
getApp().getConfig2(function (e) {
var json_d = JSON.parse(e.switch_list);
@@ -2370,11 +2378,7 @@ Page({
b[i] = this.data.iurl + e[i];
}
this.data.show_prew_img = 1;
-
- wx.previewImage({
- current: b[t.currentTarget.dataset.id],
- urls: b
- });
+ getApp().pre_img2(b,t)
},
previewCommentImgs_w: function (t) {
@@ -2384,10 +2388,7 @@ Page({
b[i] = this.data.iurl + e[i];
}
this.data.show_prew_img = 1;
- wx.previewImage({
- current: b[t.currentTarget.dataset.id],
- urls: b
- });
+ getApp().pre_img2(b,t)
},
previewGoodsCommentImgs: function (t) {
@@ -2395,10 +2396,7 @@ Page({
a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
a = a.map(function (t) {
return e.data.url + t;
- }), wx.previewImage({
- current: a[t.currentTarget.dataset.id],
- urls: a
- });
+ }), getApp().pre_img2(a,t);
this.data.show_prew_img = 1;
},
closePromModal: function () {
@@ -2413,7 +2411,7 @@ Page({
},
//--点击分享事件---
- onShareAppMessage: function (t) {
+ onShareAppMessage: function (t) { getApp().globalData.no_clear=1;
var th = this;
var price = th.data.sele_g.shop_price;
@@ -5943,6 +5941,12 @@ Page({
wait_for_store_config: function () {
var th = this;
+ //----获取系统参数-----
+ getApp().getConfig2(function (e) {
+ th.setData({
+ bconfig: e,
+ });
+ })
var t_time = setInterval(function () {
if (th.data.bconfig == null) false;
var e = th.data.bconfig;
@@ -6278,10 +6282,7 @@ Page({
previewImage(e) {
this.data.show_prew_img = 1;
- wx.previewImage({
- //将图片预览出来
- urls: [this.data.sele_g.original_img]
- });
+ getApp().pre_img(this.data.sele_g.original_img);
},
is_show_more_buy: function () {
@@ -6531,14 +6532,7 @@ Page({
},
con_weixin: function () {
- var url = this.data.sys_switch.weapp_customertype_url;
- var id = this.data.sys_switch.weapp_customertype_appid;
- wx.openCustomerServiceChat({
- extInfo: {url: url},
- corpId: id,
- success(res) {
- }
- })
+ getApp().con_wx(this);
},
get_normal(gid){
this.setData({
@@ -6648,11 +6642,24 @@ Page({
// 预览海报
previewPoster() {
+ getApp().globalData.no_clear=1;
wx.previewImage({
current: this.data.shareImgPath, // 当前显示图片的http链接
urls: [this.data.shareImgPath] ,// 需要预览的图片http链接列表
});
},
+
+ screenChange:function (e) {
+ let fullScreen = e.detail.fullScreen //值true为进入全屏,false为退出全屏
+ if (fullScreen ){ //退出全屏
+ getApp().globalData.no_clear=1;
+ this.data.show_video=1;
+ }
+ },
+
+ click_contact:function () {
+ getApp().globalData.no_clear=1;
+ },
//打开客服操作菜单
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 28c0093..ffde1e6 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -42,7 +42,7 @@
-
+
@@ -1010,16 +1010,6 @@
-
-
-
-
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index bbfc3d7..1a2ffe7 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -706,6 +706,7 @@ view.cart-btn-lg {
color: #d60021;
font-size: 33rpx;
font-weight: bold;
+ display: flex;
}
.spec-goods-stock {
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index f3af9f4..a3d072f 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -504,7 +504,7 @@ Page({
/**
* 用户点击右上角分享
*/
- onShareAppMessage: function() {},
+ onShareAppMessage: function() { getApp().globalData.no_clear=1; },
//------卡片的显示和关闭--------
show_tc: function() {
@@ -895,13 +895,7 @@ Page({
},
con_weixin:function () {
- var url=this.data.sys_switch.weapp_customertype_url;
- var id=this.data.sys_switch.weapp_customertype_appid;
- wx.openCustomerServiceChat({
- extInfo: {url: url},
- corpId: id,
- success(res) {}
- })
+ getApp().con_wx(this);
},
//初始话按钮图标
@@ -939,6 +933,7 @@ Page({
})
this.setData({user_tool:d_list});
},
+
//打开客服操作菜单
@@ -967,12 +962,19 @@ Page({
this.setData({
hiddenCS: true,
});
- }
+ },
+ click_contact:function () {
+ getApp().globalData.no_clear=1;
+ }
+
+
+
+
})