1.分享的会员的user_id,分销的上下级关系的bug优化。打开相册，分享，预览图片，照相扫描，聊天，打电话，获取微信地址的时候。

2.自定义模板时候，首页分享空白页的OA单优化 3. 测肤的分享和生成海报的bug优化

1.分享的会员的user_id,分销的上下级关系的bug优化。打开相册，分享，预览图片，照相扫描，聊天，打电话，获取微信地址的时候。
2.自定义模板时候，首页分享空白页的OA单优化 3. 测肤的分享和生成海报的bug优化
yvan.ni
1 parent d896e39f
Showing 116 changed files with 335 additions and 590 deletions
components/diy_scan/diy_scan.js
components/diy_service/diy_service.js
components/diy_service/diy_service.wxml
components/nav_b/nav_b.wxss
packageA/pages/activity_share/activity_share.js
packageA/pages/addCustomer/addCustomer.js
packageA/pages/cardDetails/cardDetails.js
packageA/pages/cardList/cardList.js
packageA/pages/chongzhi/chongzhi.js
packageA/pages/chongzhiDetails/chongzhiDetails.js
packageA/pages/choujiang/choujiang.js
packageA/pages/details_serviceCard/details_serviceCard.js
packageA/pages/details_serviceCard/details_serviceCard.wxml
packageA/pages/distribution/card/card.js
packageA/pages/distribution/commision/commision.js
packageA/pages/distribution/goods/goods.js
packageA/pages/distribution/myteam/myteam.js
packageA/pages/distribution/order/order.js
packageA/pages/distribution/rank/rank.js
packageA/pages/distribution/rookie/rookie.js
@@ -26,6 +26,7 @@ Component({
 	   //-- 扫描成功之后 --
 	   getScancode:function(){
 		   var _this = this;
+           getApp().globalData.no_clear=1;
 		   //-- 允许从相机和相册扫码 --
 		   wx.scanCode({
 		     success: (res) => {
@@ -38,35 +38,16 @@ Component({
 	 //---------联系客服------------
 	  contactService: function() {
-	  getApp().getConfig(function(t) {
-	    if (t.store_tel == undefined) {
-	      getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-	        isShowLoading: 1,
-	        data: {},
-	        success: function(rs) {
-	          getApp().globalData.config = rs.data.data;
-	          if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-	            getApp().my_warnning("商家未设置电话", 0, th);
-	            return false;
-	          }	       		  
-			  wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
-	        }
-	      })
-	    } else {
-	       wx.makePhoneCall({ phoneNumber: t.store_tel, })
-	    }
-	  });
-	},
+	     getApp().con_Service();
+	  },
       //---------联系微信客服------------
       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);
+      },
+
+      click_contact:function () {
+          getApp().globalData.no_clear=1;
       }
   }
 })
@@ -8,7 +8,7 @@
 		</view>
    </view>
-   <button wx:else  class="custom-service"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+   <button wx:else  class="custom-service" bindtap="click_contact"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 	   <view style="text-align: center;">
          <image class="cs-img" src="{{object.img}}"></image>
          <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
@@ -26,6 +26,9 @@
   color: #ffff;
   font-size: 50rpx;
   background: none;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .box_main .dian image {
@@ -141,9 +141,10 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-		console.log('abc');
-	  var th = this;	  
+   onShareAppMessage: function () {
+  	  getApp().globalData.no_clear=1;
+
+	  var th = this;
 	  //礼包的转发
 	  if(th.data.currentIndex==3) {
 		  var lbid=th.data.hui_active.lbId;
@@ -1054,10 +1055,8 @@ Page({
 	                  })
 	                  return false;
 	                }
-	                wx.previewImage({
-	                  //将图片预览出来
-	                  urls: [that.data.shareImgPath]
-	                });
+                    getApp().pre_img(that.data.shareImgPath);
+
 					//-- 将商品清空 --
 					th.setData({share_good:null});
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-
-  }
+   onShareAppMessage: function () {
+     getApp().globalData.no_clear=1
+   }
 })
 \ No newline at end of file
@@ -92,7 +92,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -134,7 +134,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -106,7 +106,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -125,7 +125,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -112,7 +112,7 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function() {
-
+        getApp().globalData.no_clear=1
 	},
@@ -163,6 +163,7 @@ Page({
 	// 联系微信客服
 	contact_wx() {
+        getApp().globalData.no_clear=1;
 		var url = this.data.sys_switch.weapp_customertype_url;
 		var id = this.data.sys_switch.weapp_customertype_appid;
 		wx.openCustomerServiceChat({
@@ -177,24 +178,7 @@ Page({
 	// 联系电话客服
 	contactService() {
-		app.getConfig(function(t) {
-			if (t.store_tel == undefined) {
-				app.request.get('/api/weshop/store/get/' + os.stoid, {
-					isShowLoading: 1,
-					data: {},
-					success: function(rs) {
-						app.globalData.config = rs.data.data;
-						if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-							app.my_warnning('商家未设置电话', 0, self);
-							return false;
-						}
-						app.confirmBox('请联系客服:' + rs.data.data.store_tel);
-					}
-				})
-			} else {
-				app.confirmBox('请联系客服:' + t.store_tel);
-			}
-		});
+        getApp().con_Service();
 	},
@@ -478,9 +462,9 @@ Page({
 		});
 	},
-
-
-
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
@@ -57,7 +57,7 @@
 		<view class="flex t-c bdt">
 			<!-- 客服 -->
 			<block>
-				<button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact"
+				<button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact" bindtap="click_contact"
 			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</button>
 				<view class="f1 pd20" wx:elif="{{sys_switch.weapp_customertype== 2}}" bindtap="contact_wx"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
 				<view class="f1 pd20" wx:else bindtap="contactService"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
@@ -92,7 +92,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -149,7 +149,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -264,7 +264,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -157,7 +157,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -141,7 +141,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -151,7 +151,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -112,7 +112,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -316,7 +316,7 @@ Page({
    * 用户点击右上角分享
    *--点击分享事件--分享我的小店
    *--*/
-  onShareAppMessage: function (t) {
+  onShareAppMessage: function (t) {         getApp().globalData.no_clear=1;
     var th = this;
     var title = "我的小店";
@@ -1049,24 +1049,7 @@ Page({
   //---------联系客服------------
   contactService: function() {
-    s.getConfig(function(t) {
-      if (t.store_tel == undefined) {
-        getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-          isShowLoading: 1,
-          data: {},
-          success: function(rs) {
-            getApp().globalData.config = rs.data.data;
-            if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-              getApp().my_warnning("商家未设置电话", 0, th);
-              return false;
-            }
-            s.confirmBox("请联系客服：" + rs.data.data.store_tel);
-          }
-        })
-      } else {
-        s.confirmBox("请联系客服：" + t.store_tel);
-      }
-    });
+      getApp().con_Service();
   },
   //-------获取购物车数量----------
   requestCardNum: function() {
@@ -1109,6 +1092,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+    getApp().globalData.no_clear=1;
     var th = this;
     var price = th.data.data.shop_price;
@@ -2562,10 +2546,7 @@ Page({
 	 },
 	 previewImage() {
-		 wx.previewImage({
-		   //将图片预览出来
-		   urls: [this.data.shareImgPath]
-		 });
+         getApp().pre_img(this.data.shareImgPath);
 	 },
 	onShareTimeline() {
@@ -2589,13 +2570,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)
     },
 	//评论的调用
@@ -2792,10 +2767,9 @@ 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);
+
 	},
@@ -2934,9 +2908,9 @@ Page({
 	    //     });
 	    //     return false;
 	    // }
-	
-	
+
+
 	   //  if (prom_type == 1 && prom_id == 0) {
 				// this.setData({
 				// 	prom_type: 0, isshow: 1,
@@ -2950,7 +2924,7 @@ Page({
 				// this.check_is_youhui(gid, 1);
 				// return false;
 	   //  }
-	
+
 	    //if (prom_type != 3 && prom_type!=0){
 	    //---判断秒杀----
 	    if (prom_type == 1 && prom_id > 0) {
@@ -3030,7 +3004,7 @@ Page({
 	//                             //-- 获取秒杀活动的多少规格 --
 	//                             ee.get_more_flahs(function (list) {
 	//                                 if (list && list.length > 1) {
-	
+
 	//                                     var n_item = list[0];
 	//                                     var ind = list.findIndex(function (ele) {
 	//                                         return ele.goods_id == ee.data.data.goods_id;
@@ -3041,10 +3015,10 @@ Page({
 	//                                         list.splice(ind, 1);
 	//                                         list.unshift(n_item);
 	//                                     }
-	
+
 	//                                     ee.data.sele_g.viplimited = n_item.viplimited;
 	//                                     ee.data.data.viplimited = n_item.viplimited;
-	
+
 	//                                     var gb = 1;
 	//                                     //-- 显示多规格 --
 	//                                     for (let i in list) {
@@ -3052,7 +3026,7 @@ Page({
 	//                                         var gg = "";
 	//                                         if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
 	//                                         if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
-	
+
 	//                                         if (item.goods_spec != "" && item.goods_color != "") {
 	//                                             gg = item.goods_spec + "/" + item.goods_color;
 	//                                         } else if (item.goods_spec != "" || item.goods_color != "") {
@@ -3065,11 +3039,11 @@ Page({
 	//                                         item.prom_id = item.prom_id;
 	//                                         item.prom_type = 1;
 	//                                     }
-	
+
 	//                                     ee.setData({
 	//                                         sku_g: list,
 	//                                     });
-	
+
 	//                                 }
 	//                             })
 	//                         }
@@ -3132,22 +3106,14 @@ Page({
 	        }
 	    });
 	},
-	
-	
-	
-	
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
-	
-	
-	
-	
-		
-	
-	  
 });
@@ -506,7 +506,7 @@
 	<view class="join-cart jc_sb ai_c">
 		<view class="flex">
-			<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact"
+			<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact"  bindtap="click_contact"
 			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 				<view>客服</view>
@@ -177,7 +177,8 @@ Page({
   /**e
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {
+   	  getApp().globalData.no_clear=1;
 	  var th = this;	 
 	  var item=this.data.share_good;
 	  var price = item.shop_price;		
@@ -732,10 +733,7 @@ Page({
 	                   })
 	                   return false;
 	                 }
-	                 wx.previewImage({
-	                   //将图片预览出来
-	                   urls: [that.data.shareImgPath]
-	                 });
+                     getApp().pre_img(that.data.shareImgPath);
 	                 wx.hideLoading();
 	               }
 	             })
@@ -113,7 +113,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -98,7 +98,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -187,8 +187,8 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-		
+   onShareAppMessage: function () {
+   	    getApp().globalData.no_clear=1;
 		var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
 		var pagePath = this.route; //当前页面url
@@ -348,7 +348,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
     if (res.from === 'button') {
       // 来自页面内转发按钮
       // console.log(res.target)
@@ -605,6 +605,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
    * 用户点击右上角分享
    */
   onShareAppMessage: function (res) {
+    getApp().globalData.clear=1;
     this.setData({
       showActionSheet: 'false'
     })
@@ -71,7 +71,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
 	  var th=this;
 	  var id=th.data.hui_active.id;
 	  var url='/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + id + '&live=ing';
@@ -147,7 +147,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -192,7 +192,7 @@ Page({
 	/**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -394,6 +394,7 @@ Page({
   previewImage: function(e) {
     var th = this;
     var current = e.currentTarget.dataset.src;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: current, // 当前显示图片的http链接  
       urls: [th.data.head_img] // 需要预览的图片http链接列表  
@@ -394,6 +394,7 @@ Page({
   previewImage: function(e) {
     var th = this;
     var current = e.currentTarget.dataset.src;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: current, // 当前显示图片的http链接  
       urls: [th.data.head_img] // 需要预览的图片http链接列表  
@@ -320,7 +320,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     },
@@ -875,6 +875,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+      getApp().globalData.no_clear=1
 	  return o.share;   
   },
@@ -711,6 +711,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+      getApp().globalData.no_clear=1
 	  var curPage=this;
 	  var pagePath = curPage.route; //当前页面url
 	  if (pagePath.indexOf('/') != 0) {
@@ -73,7 +73,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
         var th=this;
         var id=th.data.hui_active.id;
         var url="/packageA/pages/quan_pro/quan_pro?id="+id;
@@ -141,7 +141,7 @@ Page({
   /**e
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
 	  var th = this;	 
 	  var item=this.data.share_good;
 	  var price = item.money;		
@@ -709,10 +709,7 @@ Page({
 	                   })
 	                   return false;
 	                 }
-	                 wx.previewImage({
-	                   //将图片预览出来
-	                   urls: [that.data.shareImgPath]
-	                 });
+                     getApp().pre_img(that.data.shareImgPath);
 	                 wx.hideLoading();
 	               }
 	             })
-// packageA//pages/text/text.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})
 \ No newline at end of file
-{
-  "usingComponents": {}
-}
 \ No newline at end of file
-<!--packageA//pages/text/text.wxml-->
-<text>packageA//pages/text/text.wxml</text>
-/* packageA//pages/text/text.wxss */
 \ No newline at end of file
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -124,7 +124,7 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function() {
-
+        getApp().globalData.no_clear=1
 	},
@@ -166,7 +166,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -246,6 +246,6 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function() {
-
+      getApp().globalData.no_clear=1
   }
 })
@@ -220,6 +220,7 @@ Page({
     var imgs = this.data.imgs;
+    getApp().globalData.no_clear=1;
     wx.chooseImage({
        count: 1, // 默认9
       sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -259,6 +260,7 @@ Page({
     var index = e.currentTarget.dataset.index;
     //所有图片
     var imgs = this.data.imgs;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       //当前显示图片
       current: imgs[index],
@@ -60,7 +60,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -106,7 +106,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -26,6 +26,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+      getApp().globalData.no_clear=1
 	  return o.share;
   },
   get_list: function() {
@@ -161,6 +161,7 @@ Page({
     } else {
       image = imgArr[index].weapp_img[sindex];
     }
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: image,
       //当前图片地址
@@ -112,6 +112,7 @@ Page({
     var iurl = th.data.iurl;
     if (image != "") {
       image = imgArr[0].weapp_img[index];
+      getApp().globalData.no_clear=1;
       wx.previewImage({
         current: image,
         //当前图片地址
@@ -119,6 +120,7 @@ Page({
       })
     } else {
       image = imgArr[0].img[index];
+      getApp().globalData.no_clear=1;
       wx.previewImage({
         current: iurl + image,
         //当前图片地址
@@ -7,6 +7,7 @@ Page({
   },
   bindButtonTap: function() {
     var that = this
+     getApp().globalData.no_clear=1;
     wx.chooseVideo({
       sourceType: ['album', 'camera'],
       maxDuration: 60,
@@ -34,6 +35,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1
       return {
         title: "直播视频回放",
       }
@@ -446,7 +446,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
         var title = this.data.act.name;
         var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
         if (getApp().globalData.user_id) {
@@ -198,6 +198,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
         var curPage=this;
         var pagePath = curPage.route; //当前页面url
         if (pagePath.indexOf('/') != 0) {
@@ -447,7 +447,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1;
         var title = this.data.act.name;
         var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
         if (getApp().globalData.user_id) {
@@ -404,6 +404,7 @@ Page({
   },
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1
     var url = "pages/goods/categoryList/categoryList";
     var userInfo = getApp().globalData.userInfo;
@@ -639,9 +640,9 @@ Page({
   //扫一扫
   getScancode: function () {
     // 允许从相机和相册扫码
+      getApp().globalData.no_clear=1;
     wx.scanCode({
       success: (res) => {
-        console.log(res);
         var key_word = res.result;
         wx.navigateBack({
           delta: 1
@@ -240,6 +240,7 @@ Page({
   },
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -235,6 +235,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
         var curPage = this;
         var pagePath = curPage.route; //当前页面url
         if (pagePath.indexOf('/') != 0) {
@@ -147,7 +147,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -191,6 +191,7 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
 	    var pagePath = this.route; //当前页面url
 	    if (pagePath.indexOf('/') != 0) {
 	        pagePath = '/' + pagePath;
@@ -972,6 +972,7 @@ Page({
     //------ 分享配置 --------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1
         var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url
 				// console.log('pagePath=====xxxxxx>', pagePath);
 				var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img;
@@ -2248,24 +2248,7 @@ Page({
   //---------联系客服------------
   contactService: function () {
-    s.getConfig(function (t) {
-      if (t.store_tel == undefined) {
-        getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-          isShowLoading: 1,
-          data: {},
-          success: function (rs) {
-            getApp().globalData.config = rs.data.data;
-            if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-              getApp().my_warnning("商家未设置电话", 0, th);
-              return false;
-            }
-            s.confirmBox("请联系客服：" + rs.data.data.store_tel);
-          }
-        })
-      } else {
-        s.confirmBox("请联系客服：" + t.store_tel);
-      }
-    });
+      getApp().con_Service();
   },
   //-------获取购物车数量----------
   requestCardNum: function () {
@@ -2306,11 +2289,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) {
@@ -2320,21 +2299,16 @@ 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) {
     var e = this,
       a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
+    getApp().globalData.no_clear=1;
     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 () {
@@ -2349,7 +2323,7 @@ Page({
   },
   //--点击分享事件---
-  onShareAppMessage: function (t) {
+  onShareAppMessage: function (t) {         getApp().globalData.no_clear=1;
     // var th = this;
     // var price = th.data.sele_g.shop_price;
@@ -6095,11 +6069,8 @@ Page({
   },
   previewImage() {
-    this.data.show_prew_img = 1;
-    wx.previewImage({
-      //将图片预览出来
-      urls: [this.data.sele_g.original_img]
-    });
+      this.data.show_prew_img = 1;
+      getApp().pre_img(this.data.sele_g.original_img);
   },
   is_show_more_buy: function () {
@@ -6327,13 +6298,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);
   },
@@ -6486,6 +6451,7 @@ Page({
   // 预览海报
   previewPoster() {
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: this.data.shareImgPath, // 当前显示图片的http链接
       urls: [this.data.shareImgPath],// 需要预览的图片http链接列表
@@ -6493,4 +6459,9 @@ Page({
   },
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
+
+
 });
@@ -871,7 +871,7 @@
   <!-- -----------------底部按钮------------------ -->
   <view class="join-cart">
     <!-- bindtap="contactService" -->
-    <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+    <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
     </button>
@@ -92,7 +92,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -237,24 +237,7 @@ Page({
     },
     /*-----联系客户------*/
     contactService: function() {
-        e.getConfig(function(t) {
-          if (t.store_tel == undefined) {
-            getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-              isShowLoading: 1,
-              data: {},
-              success: function (rs) {
-                getApp().globalData.config = rs.data.data;
-                if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-                  getApp().showWarning("商家未设置电话");
-                  return false;
-                }
-                e.confirmBox("请联系客服：" + rs.data.data.store_tel);
-              }
-            })
-          } else {
-            e.confirmBox("请联系客服：" + t.store_tel);
-          }
-        });
+        getApp().con_Service();
     },
     //--------取消订单---------
@@ -1074,13 +1057,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);
     },
     //跳转到商品
@@ -1115,6 +1092,11 @@ Page({
         //     }
         // })
     },
+
+
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
@@ -61,7 +61,7 @@
             <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
 						<view>
-							<button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
+							<button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn" bindtap="click_contact"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
                             <view wx:elif="{{sys_switch.weapp_customertype==2}}" bindtap="con_weixin" class="contact-us goods-btn">联系客服</view>
 							<view wx:else bindtap="contactService" class="contact-us goods-btn">联系客服</view>
@@ -114,7 +114,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -2601,35 +2601,12 @@ Page({
     //---------联系客服------------
     contactService: function () {
-        getApp().getConfig(function (t) {
-            if (t.store_tel == undefined) {
-                getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-                    isShowLoading: 1,
-                    data: {},
-                    success: function (rs) {
-                        getApp().globalData.config = rs.data.data;
-                        if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-                            getApp().my_warnning("商家未设置电话", 0, th);
-                            return false;
-                        }
-                        wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
-                    }
-                })
-            } else {
-                wx.makePhoneCall({ phoneNumber: t.store_tel, })
-            }
-        });
+        getApp().con_Service();
     },
     //---------联系微信客服------------
     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);
     }
@@ -1430,24 +1430,7 @@ Page({
   //---------联系客服------------
   contactService: function () {
-    s.getConfig(function (t) {
-      if (t.store_tel == undefined) {
-        getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-          isShowLoading: 1,
-          data: {},
-          success: function (rs) {
-            getApp().globalData.config = rs.data.data;
-            if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-              getApp().my_warnning("商家未设置电话", 0, th);
-              return false;
-            }
-            s.confirmBox("请联系客服：" + rs.data.data.store_tel);
-          }
-        })
-      } else {
-        s.confirmBox("请联系客服：" + t.store_tel);
-      }
-    });
+      getApp().con_Service();
   },
   //-------获取购物车数量----------
   requestCardNum: function () {
@@ -1488,11 +1471,8 @@ Page({
       b[i] = this.data.iurl + e[i];
     }
     this.data.show_prew_img = 1;
+    getApp().pre_img2(b,t)
-    wx.previewImage({
-      current: b[t.currentTarget.dataset.id],
-      urls: b
-    });
   },
   previewCommentImgs_w: function (t) {
@@ -1502,21 +1482,16 @@ 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) {
     var e = this,
       a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
+    getApp().globalData.no_clear=1;
     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 () {
@@ -1531,7 +1506,7 @@ Page({
   },
   //--点击分享事件---
-  onShareAppMessage: function (t) {
+  onShareAppMessage: function (t) {         getApp().globalData.no_clear=1;
     var th = this;
     var price = th.data.pre_arr.presell_price;   
@@ -3813,10 +3788,7 @@ Page({
   previewImage() {
     this.data.show_prew_img = 1;
-    wx.previewImage({
-      //将图片预览出来
-      urls: [this.data.shareImgPath]
-    });
+    getApp().pre_img(this.data.shareImgPath);
   },
@@ -4012,21 +3984,21 @@ 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);
     },
 		// 预览海报
 		previewPoster() {
+            getApp().globalData.no_clear=1;
 			wx.previewImage({
 			  current: this.data.shareImgPath, // 当前显示图片的http链接
 			  urls: [this.data.shareImgPath] ,// 需要预览的图片http链接列表
 			});
 		},
+
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
+    }
+
 });
@@ -495,7 +495,7 @@
 <!-- -----------------底部按钮------------------ -->
 <view class="join-cart">
   <!-- bindtap="contactService" -->
-  <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+  <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
     <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
     <view>客服</view>
   </button>
@@ -1431,24 +1431,7 @@ Page({
   //---------联系客服------------
   contactService: function () {
-    s.getConfig(function (t) {
-      if (t.store_tel == undefined) {
-        getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-          isShowLoading: 1,
-          data: {},
-          success: function (rs) {
-            getApp().globalData.config = rs.data.data;
-            if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-              getApp().my_warnning("商家未设置电话", 0, th);
-              return false;
-            }
-            s.confirmBox("请联系客服：" + rs.data.data.store_tel);
-          }
-        })
-      } else {
-        s.confirmBox("请联系客服：" + t.store_tel);
-      }
-    });
+      getApp().con_Service();
   },
   //-------获取购物车数量----------
   requestCardNum: function () {
@@ -1489,11 +1472,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) {
@@ -1503,21 +1482,16 @@ 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) {
     var e = this,
       a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
+    getApp().globalData.no_clear=1;
     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 () {
@@ -1532,7 +1506,7 @@ Page({
   },
   //--点击分享事件---
-  onShareAppMessage: function (t) {
+  onShareAppMessage: function (t) {         getApp().globalData.no_clear=1;
     var th = this;
     var price = th.data.pre_arr.presell_price;   
@@ -3814,10 +3788,7 @@ Page({
   previewImage() {
     this.data.show_prew_img = 1;
-    wx.previewImage({
-      //将图片预览出来
-      urls: [this.data.shareImgPath]
-    });
+    getApp().pre_img(this.data.shareImgPath);
   },
@@ -4014,13 +3985,12 @@ 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);
+    },
+
+
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
     }
 });
@@ -495,7 +495,7 @@
 <!-- -----------------底部按钮------------------ -->
 <view class="join-cart">
   <!-- bindtap="contactService" -->
-  <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+  <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
     <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
     <view>客服</view>
   </button>
@@ -344,7 +344,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     }
 })
 \ No newline at end of file
@@ -101,7 +101,7 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     },
@@ -52,6 +52,7 @@ Page({
     //-- 重新从相册中选择图片 --
     show_pai_pop: function () {
         var th = this;
+        getApp().globalData.no_clear=1;
         //选择和拍照一张图片
         wx.chooseImage({
             count: 1,
@@ -70,6 +71,7 @@ Page({
     //选择图片
     takePhoto() {
         var that = this;
+        getApp().globalData.no_clear=1;
         wx.chooseImage({
             count: 1,
             sizeType: ['compressed'],
@@ -68,13 +68,14 @@ Page({
     /**
      * 用户点击右上角分享
      */
-    onShareAppMessage: function () {
+     onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
     },
     //从相册中选择图片
     show_pai_pop: function () {
         let th = this;
+        getApp().globalData.no_clear=1;
         //选择和拍照一张图片
         wx.chooseImage({
             count: 1,
@@ -98,7 +99,7 @@ Page({
     //选择图片
     takePhoto() {
         var that = this;
-
+        getApp().globalData.no_clear=1;
         wx.chooseImage({
             count: 1,
             sizeType: ['compressed'],
@@ -83,7 +83,29 @@ Page({
         this.init();
         //var face_result=getApp().globalData.face_result;
         //var face_data=face_result.face_list[0];
-        this.data.id = options.id;
+        var id=options.id;
+        var first_leader = options.first_leader;
+
+        if (id == undefined || id == null || id == "") {
+            var gid_str = decodeURIComponent(options.scene);
+            gid_str = gid_str.split("_");
+            id=gid_str[0];
+            if (gid_str.length > 1) {
+                first_leader = gid_str[1];
+            }
+        }
+
+        this.data.id=id;
+        if (first_leader) {
+            console.log("log---".first_leader);
+            getApp().globalData.first_leader = first_leader;
+            //调用接口判断是不是会员
+            getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+                if (res.data.code == 0) {
+                    getApp().globalData.guide_id = res.data.data.id;
+                }
+            })
+        }
         //用异步的获取比较准一点
         wx.getSystemInfo({
@@ -590,7 +612,15 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage: function () {
+        getApp().globalData.no_clear=1;
+        var url="packageD/pages/AI-test-skin/success_result/success_result?id="+this.data.id+"&first_leader="+getApp().globalData.user_id;
+
+        var ob = {
+            title: "测肤报告",
+            path: url,
+        };
+        return ob;
     },
     //商品页面跳转
@@ -748,7 +778,7 @@ Page({
         }
         ///二微码
         var path3 = setting.url + "/api/wx/open/app/user/getWeAppEwm/" +
-            setting.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+            setting.stoid + "?sceneValue=" + scene + "&pageValue=packageD/pages/AI-test-skin/success_result/success_result";
         // 读取文件成功则OK--
         wx.getImageInfo({
@@ -195,6 +195,7 @@ Page({
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -233,6 +233,7 @@ Page({
   //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -94,7 +94,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () { },
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1 },
   //---------------获取物流---------------
   get_wuliu(func) {
     var th = this,
@@ -233,7 +233,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -163,6 +163,7 @@ Page({
   //--- 分享设置 --
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage = this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -627,7 +627,7 @@ Page({
   //---------分享配置--------
   onShareAppMessage: function (e) {
-	  
+      getApp().globalData.no_clear=1;
 	var url="pages/goods/categoryList/categoryList";  
 	var userInfo=getApp().globalData.userInfo;
 	//是分销商才带
@@ -799,6 +799,7 @@ Page({
 //扫一扫
   getScancode:function(){
       var _this = this;
+      getApp().globalData.no_clear=1;
     // 允许从相机和相册扫码
     wx.scanCode({
       success: (res) => {
@@ -752,6 +752,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) {
@@ -759,6 +762,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);
@@ -2280,24 +2288,7 @@ Page({
     //---------联系客服------------
     contactService: function () {
-        s.getConfig(function (t) {
-            if (t.store_tel == undefined) {
-                getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-                    isShowLoading: 1,
-                    data: {},
-                    success: function (rs) {
-                        getApp().globalData.config = rs.data.data;
-                        if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-                            getApp().my_warnning("商家未设置电话", 0, th);
-                            return false;
-                        }
-                        s.confirmBox("请联系客服：" + rs.data.data.store_tel);
-                    }
-                })
-            } else {
-                s.confirmBox("请联系客服：" + t.store_tel);
-            }
-        });
+        getApp().con_Service();
     },
     //-------获取购物车数量----------
     requestCardNum: function () {
@@ -2338,11 +2329,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) {
@@ -2352,10 +2339,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) {
@@ -2363,10 +2347,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 () {
@@ -2381,7 +2362,7 @@ Page({
     },
     //--点击分享事件---
-    onShareAppMessage: function (t) {
+    onShareAppMessage: function (t) {         getApp().globalData.no_clear=1;
         var th = this;
         var price = th.data.sele_g.shop_price;
@@ -5911,6 +5892,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;
@@ -6246,10 +6233,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 () {
@@ -6499,14 +6483,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({
@@ -6616,11 +6593,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;
+    }
@@ -42,7 +42,7 @@
                   </image>
                 </view>
                 <view wx:else>
-                  <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video>
+                  <video bindfullscreenchange="screenChange" class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video>
                 </view>
               </swiper-item>
               <swiper-item wx:for="{{gallery}}" wx:key="gallery">
@@ -1011,7 +1011,7 @@
   <!-- -----------------底部按钮------------------ -->
   <view class="join-cart">
     <!-- bindtap="contactService" -->
-    <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+    <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact"  open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
     </button>
@@ -706,6 +706,7 @@ view.cart-btn-lg {
 	color: #d60021;
 	font-size: 33rpx;
 	font-weight: bold;
+	display: flex;
 }
 .spec-goods-stock {
@@ -380,6 +380,7 @@ Page({
     },
 //---------分享配置--------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
       var curPage=this;
       var pagePath = curPage.route; //当前页面url
       if (pagePath.indexOf('/') != 0) {
@@ -389,6 +389,7 @@ Page({
     //---------分享配置--------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1;
         var curPage=this;
         var pagePath = curPage.route; //当前页面url
         if (pagePath.indexOf('/') != 0) {
@@ -84,7 +84,6 @@ Page({
     full_ad: null,  //全屏广告
     full_screen: 0, //全屏广告
     is_ok_h5:0,  //判断要不要显示关注二维码
-
   },
   onLoad: async function (tt) {
@@ -223,18 +222,20 @@ Page({
     //如果是自定义模板
     if (this.data.isTemplate) {
       //---先获取会员---
-      t.getUserFir(function () {
-        th.is_festival();
-        var new_nav = th.data.new_nav;
-        if (new_nav == "") {
-          th.is_new();
-        }
-				// sty
-        setTimeout(function () {
-          if (getApp().globalData.user_id) getApp().requestCardNum(th);
-        }, 500)
+      //t.getUserFir(function () {
+      if(getApp().globalData.user_id) {
+          th.is_festival();
+          var new_nav = th.data.new_nav;
+          if (new_nav == "") {
+              th.is_new();
+          }
+          // sty
+          setTimeout(function () {
+              if (getApp().globalData.user_id) getApp().requestCardNum(th);
+          }, 500)
+      }
-      });
+      //});
     } else {
       await this.init_fir();
       wx.setNavigationBarColor({
@@ -428,29 +429,18 @@ Page({
     var th = this;
     var show = getApp().globalData.isLoad_ad;
-    setTimeout(function () {
-      //user没有及时更新
-      var userInfo = getApp().globalData.userInfo;
-      if (!userInfo || !userInfo.user_id) userInfo = null;
-      //有加载过一次首页，就显示
-      if (show || userInfo || getApp().globalData.user_id) {
+    if(!show){
         setTimeout(function () {
-          full_screen.get_the_full_screen(th);
-        }, 800)
-        //动画效果
+            full_screen.get_the_full_screen(th);
+        }, 800);
+        getApp().globalData.isLoad_ad=1;
         if (!th.data.f_hidden) {
-          wx.showLoading({
-            title: '加载中..'
-          });
-          setTimeout(function () {
-            th.setData({ f_hidden: 1 })
-            wx.hideLoading();
-          }, 960)
+            setTimeout(function () {
+                th.setData({ f_hidden: 1 })
+                wx.hideLoading();
+            }, 960)
         }
-      } else {
-        getApp().globalData.isLoad_ad = 1;
-      }
-    }, 1500)
+    }
       setTimeout(function () {
           const query = wx.createSelectorQuery();
@@ -649,19 +639,20 @@ Page({
     });
     //---先获取会员---
-    t.getUserFir(function () {
-      th.is_festival();
-      var new_nav = th.data.new_nav;
-      if (new_nav == "") {
-        th.is_new();
-      }
-
-			// sty
-      setTimeout(function () {
-        if (getApp().globalData.user_id) getApp().requestCardNum(th);
-      }, 500)
+    //t.getUserFir(function () {
+    if(getApp().globalData.user_id) {
+        th.is_festival();
+        var new_nav = th.data.new_nav;
+        if (new_nav == "") {
+            th.is_new();
+        }
-    });
+        // sty
+        setTimeout(function () {
+            if (getApp().globalData.user_id) getApp().requestCardNum(th);
+        }, 500)
+    }
+    //});
     setTimeout(function () {
       var goods_list = th.selectComponent("#goods_list"); //组件的id
@@ -743,6 +734,7 @@ Page({
     });
   },
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var url = "/pages/index/index/index";
     var userInfo = getApp().globalData.userInfo;
     //是分销商才带
@@ -938,6 +930,7 @@ Page({
   //---扫一扫的函数---
   getScancode: function () {
     var _this = this;
+      getApp().globalData.no_clear=1;
     // 允许从相机和相册扫码
     wx.scanCode({
       success: (res) => {
@@ -959,6 +959,7 @@ Page({
   //------ 分享配置 --------
   onShareAppMessage: function (e) {
+      getApp().globalData.no_clear=1;
     var curPage=this;
     var pagePath = curPage.route; //当前页面url
     if (pagePath.indexOf('/') != 0) {
@@ -817,6 +817,7 @@ Page({
     //------ 分享配置 --------
     onShareAppMessage: function (e) {
+        getApp().globalData.no_clear=1;
         var th=this;
         var scene=this.data.teamgroup.id;
         var goods_id=this.data.teamlist.goods_id;
@@ -94,7 +94,7 @@ Page({
   },
   onShareAppMessage: function(e) {
-   
+      getApp().globalData.no_clear=1;
   },
   /**
@@ -184,7 +184,7 @@ Page({
   saveImageToPhotosAlbum: function () {
     if (this.data.imagePath != "") {
-      wx.previewImage({ urls: [this.data.imagePath], })
+	  getApp().pre_img(this.data.imagePath);
       return;
     }
@@ -372,9 +372,8 @@ Page({
 			      		   maskHidden: false,
 			      		   canvasHidden: true
 			      		 });
-			      		 wx.previewImage({
-			      		   urls: [res.tempFilePath],
-			      		 })
+
+			      		 getApp().pre_img(res.tempFilePath);
 			      		 if (!res.tempFilePath) {
 			      		   wx.showModal({
 			      			 title: '提示',
@@ -229,6 +229,7 @@ Page({
   },
   onShareAppMessage(res) {
+      getApp().globalData.no_clear=1;
     if (res.from === 'button') {
       // 来自页面内转发按钮
       console.log(res.target)
@@ -171,7 +171,7 @@ Page({
 	 * 用户点击右上角分享
 	 */
 	onShareAppMessage: function() {
-
+        getApp().globalData.no_clear=1;
 	},
 })
@@ -671,13 +671,14 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
   preview: function () {
     var th = this;
     var shareImgPath = th.data.shareImgPath;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       url: shareImgPath[0],
       urls: shareImgPath
@@ -920,6 +921,7 @@ Page({
   preview: function () {
     var th = this;
     var shareImgPath = th.data.shareImgPath;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       url: shareImgPath[0],
       urls: shareImgPath
@@ -324,12 +324,11 @@ Page({
    */
   saveImageToPhotosAlbum: function () {
     if (this.data.imagePath != "") {
-      wx.previewImage({
-        urls: [this.data.imagePath],
-      })
+      getApp().pre_img(this.data.imagePath);
       return;
     }
-  //   if(this.data.is_loading) return false ;
+
+    //if(this.data.is_loading) return false ;
     this.data.is_loading=1;
     wx.showLoading({
@@ -607,9 +606,7 @@ Page({
                maskHidden: false,
                canvasHidden: true
              });
-             wx.previewImage({
-               urls: [res.tempFilePath],
-             })
+             getApp().pre_img(res.tempFilePath);
              if (!res.tempFilePath) {
                wx.showModal({
                  title: '提示',
@@ -105,7 +105,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -502,7 +502,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {},
+  onShareAppMessage: function() {   getApp().globalData.no_clear=1; },
   //------卡片的显示和关闭--------
   show_tc: function() {
@@ -703,25 +703,7 @@ Page({
   //---------联系客服------------
   contactService: function() {
-    var s = getApp();
-    s.getConfig(function(t) {
-      if (t.store_tel == undefined) {
-        getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-          isShowLoading: 1,
-          data: {},
-          success: function(rs) {
-            getApp().globalData.config = rs.data.data;
-            if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-              getApp().showWarning("商家未设置电话");
-              return false;
-            }
-            s.confirmBox("请联系客服：" + rs.data.data.store_tel);
-          }
-        })
-      } else {
-        s.confirmBox("请联系客服：" + t.store_tel);
-      }
-    });
+      getApp().con_Service();
   },
   go_info: function() {
@@ -859,13 +841,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);
     },
     //初始话按钮图标
@@ -902,6 +878,11 @@ Page({
             }
         })
         this.setData({user_tool:d_list});
+    },
+
+
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
     }
@@ -261,7 +261,7 @@
             <!-- 没有链接地址的时候 -->
             <block wx:else>
               <block wx:if="{{item.name=='联系客服'}}">
-                <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+                <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
                   <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
                   <view class="fs26">联系客服</view>
                 </button>
@@ -350,7 +350,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -104,7 +104,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -407,6 +407,6 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function() {
-
+      getApp().globalData.no_clear=1;
   }
 })
 \ No newline at end of file
@@ -99,7 +99,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -154,7 +154,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   }
 })
 \ No newline at end of file
@@ -393,6 +393,7 @@ Page({
   previewImage: function (e) {
     var th = this;
     var current = e.currentTarget.dataset.src;
+    getApp().globalData.no_clear=1;
     wx.previewImage({
       current: current, // 当前显示图片的http链接  
       urls: [th.data.head_img] // 需要预览的图片http链接列表  
@@ -253,24 +253,7 @@ Page({
     },
     /*-----联系客户------*/
     contactService: function() {
-        e.getConfig(function(t) {
-          if (t.store_tel == undefined) {
-            getApp().request.get("/api/weshop/store/get/" + os.stoid, {
-              isShowLoading: 1,
-              data: {},
-              success: function (rs) {
-                getApp().globalData.config = rs.data.data;
-                if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
-                  getApp().showWarning("商家未设置电话");
-                  return false;
-                }
-                e.confirmBox("请联系客服：" + rs.data.data.store_tel);
-              }
-            })
-          } else {
-            e.confirmBox("请联系客服：" + t.store_tel);
-          }
-        });
+        getApp().con_Service();
     },
     //--------取消订单---------
@@ -1632,13 +1615,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);
     },
     //跳转到商品
@@ -1675,6 +1652,12 @@ Page({
                 getApp().goto(good_url);
             }
         })
+    },
+
+
+
+    click_contact:function () {
+        getApp().globalData.no_clear=1;
     }
@@ -54,7 +54,7 @@
             <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
 						<view>
-							<button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
+							<button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn" bindtap="click_contact" open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
                             <view wx:elif="{{sys_switch.weapp_customertype==2}}" bindtap="con_weixin" class="contact-us goods-btn">联系客服</view>
 							<view wx:else bindtap="contactService" class="contact-us goods-btn">联系客服</view>
@@ -77,7 +77,10 @@
         <view class="item" wx:if="{{order.order_prom_type!=5}}">
             <view>配送方式</view>
-            <view>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}}</view>
+            <view wx:if="{{order.pt_status<4 && order.is_zsorder==4}}">
+                --
+            </view>
+            <view wx:else>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'自提'}}</view>
         </view>
         <view class="item">
             <view>买家留言</view>
@@ -158,6 +158,7 @@ Page({
     },
     previewImgs: function(e) {
         var t = this, r = this.data.return_goods.imgs;
+        getApp().globalData.no_clear=1;
         r = r.map(function(e) {
             return t.data.url + e;
         }), wx.previewImage({
@@ -116,7 +116,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
@@ -834,6 +834,7 @@ Page({
   changeAvatar: function() {
     return false;
     var r = this;
+      getApp().globalData.no_clear=1;
     wx.chooseImage({
       count: 1,
       sizeType: ["compressed", "original"],
@@ -996,6 +997,7 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
+      getApp().globalData.no_clear=1;
 	  return o.share;   
   },
@@ -158,7 +158,7 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+   onShareAppMessage: function () {   	  getApp().globalData.no_clear=1
   },
   //--新品使用--
 module.exports = {
     selectPhotos: function(e, s, o) {
+        getApp().globalData.no_clear=1;
         if (void 0 === e[s]) {
             var c = 5 - e.length;
             c > 0 && wx.chooseImage({
@@ -16,6 +16,7 @@ function t(e, t, a) {
 function a(e) {
     var t = this, a = e.target.dataset.src, i = e.target.dataset.from;
     t.data.show_prew_img=1;
+    getApp().globalData.no_clear=1;
     void 0 !== i && i.length > 0 && wx.previewImage({
         current: a,
         urls: t.data[i].imageUrls,