Merge branch 'dev' into 'test'

Dev See merge request !639

Merge branch 'dev' into 'test'
Dev See merge request !639
后端研发-苏明海
2 parents b47ca3e7 9e8d61f1
Showing 74 changed files with 3853 additions and 5381 deletions
app.js
app.json
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxss
components/diy_nav/diy_nav.js
components/diy_searchbox/diy_searchbox.wxml
components/full_screen/filter.wxs
components/full_screen/full_screen.js
components/full_screen/full_screen.json
components/full_screen/full_screen.wxml
components/full_screen/full_screen.wxss
components/share/share.wxss
packageA/pages/cardDetails/cardDetails.wxml
packageA/pages/cardList/cardList.js
packageA/pages/cardList/cardList.json
packageA/pages/cardList/cardList.wxml
packageA/pages/cardList/cardList.wxss
packageA/pages/cart2_ser/cart2_ser.js
packageA/pages/cart2_ser/cart2_ser.json
packageA/pages/cart2_ser/cart2_ser.wxml
@@ -113,9 +113,9 @@ App({
         wx.getSystemInfo({
           success: (res) => {
             // console.log(res)
-            let modelmes = res.model; //手机品牌
+            let modelmes = res?res.model:null; //手机品牌
             console.log('手机品牌', modelmes)
-            if (modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
+            if (modelmes && modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
               this.globalData.isIpx = true
             }
           },
@@ -129,27 +129,36 @@ App({
 		th.promiseGet(turl,{}).then(res=>{
 			var o=res;
 			if(o.data.code==0){
-			      th.globalData.config2 = o.data.data;
+			                       th.globalData.config2 = o.data.data;
 									//有配置成要验证过期，因为过期的小程序没有办法审核
-									if(th.globalData.config2.is_overdue){
-									
+									if(th.globalData.config2 && th.globalData.config2.is_overdue){
+																				
 										 //要开始验证，小程序有没有购买和过期 
-										 if(!currentPage || currentPage.route.indexOf('error/error')==-1){
+										 if(!currentPage || currentPage.route.indexOf('error/error')==-1 || currentPage.route.indexOf('index/index')==-1){
 										     var tt=this.globalData.wxapp_buy_obj;
 										     if (!tt){
 										         this.get_isbuy(function (){
 										             tt=th.globalData.wxapp_buy_obj;
 										             if (tt.isout == 1){
 										                 th.promiseGet('/api/weshop/store/get/'+t.stoid,{}).then(res=>{
-										                     wx.reLaunch({
-										                         url: "/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:"+res.data.data.store_tel,
-										                     });
+															 
+															 if(!th.err_going){
+																 wx.reLaunch({
+																	 url: "/pages/error/error?msg=该商城已到期，暂停浏览1！\r\n可联系:"+res.data.data.store_tel,
+																 });
+															 }
 										                 })
 										             }
-										             else if (tt.isbuy == 0)
-										                 wx.reLaunch({
-										                     url: "/pages/error/error?msg=还未购买小程序",
-										                 });
+										             else if (tt.isbuy == 0){
+														 
+														  if(!th.err_going){
+															  wx.reLaunch({
+															      url: "/pages/error/error?msg=还未购买小程序",
+															  });
+														  }
+														 
+													 }
+										                
 										         })
 										     }
 										 }
@@ -200,8 +209,13 @@ App({
         }
     },
     //----------------获取配置参数--------------------
-    getConfig: function(t, o) {
-      var e = this; if(this.globalData.config==undefined) this.globalData.config=null;
+    getConfig: function(t, o) {  	
+      var e = this; 
+	  if(!e.globalData.setting.stoid){
+		  t(null);
+		  return false; 
+	  } 
+	  if(this.globalData.config==undefined) this.globalData.config=null;
       this.globalData.config ? "function" == typeof t && t(this.globalData.config) : e.request.get("/api/weshop/store/get/" + e.globalData.setting.stoid, {
             success: function(o) {
                 console.log('getConfig');
@@ -211,10 +225,13 @@ App({
             }
         });
     },
-
     //----------------获取配置参数--------------------
-    getConfig2: function (t, o) {
+    getConfig2: function (t, o) {	 
       var e = this;
+	   if(!e.globalData.setting.stoid) {
+		  t(null); 
+		  return false;
+	   }
       this.globalData.config2 && !o ?
         "function" == typeof t && t(this.globalData.config2) : a.get("/api/weshop/storeconfig/get/" + e.globalData.setting.stoid, {
         success: function (o) {
@@ -139,7 +139,9 @@
 				 "pages/my_service/tment_details",
 				 "pages/my_service/tment_eval",
 				 "pages/my_service/tment_order_list",
-				 "pages/my_service/beauty_deta"
+				 "pages/my_service/beauty_deta",
+				 "pages/profile/profile",
+				 "pages/parseHtml/parseHtml"
       ]
   }],
@@ -75,9 +75,13 @@ Component({
 	  }
       // 在组件实例进入页面节点树时执行
-      this.data.classstyle_id = nav_item.classstyle;
+	  if(nav_item) {
+		   this.data.classstyle_id = nav_item.classstyle;  
+		   this.data.wgroup =nav_item.wgroup;
+	  } 
+        
       this.data.goodscount = this.data.object.goodscount;
-      this.data.wgroup =nav_item.wgroup;
+    
 	  var hei=280;
 	  if(this.data.object.goodstit) hei+=80;
@@ -86,13 +90,13 @@ Component({
 	  this.setData({swiper_hei:hei});
-      if (nav_item.goodsclass == 1) {
+      if (nav_item && nav_item.goodsclass == 1) {
         this.data.is_recommend = 1
       }
-      if (nav_item.goodsclass == 2) {
+      if (nav_item && nav_item.goodsclass == 2) {
         this.data.is_hot = 1
       }
-      if (nav_item.goodsclass == 3) {
+      if (nav_item && nav_item.goodsclass == 3) {
         this.data.is_new = 1
       }
@@ -353,8 +357,9 @@ Component({
 		wx.showLoading();
 		var nav_item=this.data.object.nav_list[title_idx];	
-		
-		this.data.g_id = this.data.object.nav_list[title_idx].data;
+		this.data.g_id =[];
+		if(this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)
+		     this.data.g_id=this.data.object.nav_list[title_idx].data;
 		var arr = [];		
 		for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
 		  arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
@@ -364,18 +369,21 @@ Component({
 		this.data.requestData=[];
 		// 在组件实例进入页面节点树时执行
-		this.data.classstyle_id = nav_item.classstyle;
-		this.data.wgroup =nav_item.wgroup;		
+		if(nav_item){
+			this.data.classstyle_id = nav_item.classstyle;
+			this.data.wgroup =nav_item.wgroup;	
+		}
+		
 		this.data.is_recommend = this.data.is_hot=this.data.is_new=0;		
 		//推荐，热卖，新品			
-		if (nav_item.goodsclass == 1) {
+		if (nav_item && nav_item.goodsclass == 1) {
 		  this.data.is_recommend = 1
 		}
-		if (nav_item.goodsclass == 2) {
+		if (nav_item && nav_item.goodsclass == 2) {
 		  this.data.is_hot = 1
 		}
-		if (nav_item.goodsclass == 3) {
+		if (nav_item && nav_item.goodsclass == 3) {
 		  this.data.is_new = 1
 		}		
@@ -304,9 +304,10 @@
 .zs_wz1_2l {
   overflow: hidden;
   text-overflow: ellipsis;
-  margin-bottom: 10rpx;
   font-size: 30rpx;
   white-space: nowrap;
+  height: 40rpx;
+  line-height: 40rpx;
   margin-top: 10rpx;
 }
@@ -45,9 +45,9 @@ Component({
     customMethod: function () { },
     //智能跳转
     go_url:function (e) {
-       var url=e.currentTarget.dataset.url;
-			 console.log('url==>', url);
-       // getApp().goto(url);
+        var url=e.currentTarget.dataset.url;
+		console.log('url==>', url);
+        getApp().goto(url);
     }
   }
 })
 \ No newline at end of file
@@ -22,7 +22,7 @@
 <view style='background-color:{{object.top_bgcolor}}; display: flex; align-items: center; justify-content: space-around; height: 100rpx;' >
     <view class='s2_left'>
         <navigator open-type="switchTab" url="/pages/goods/categoryList/categoryList" class="s1_gk_a1">
-        <image src='/public/static/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
+        <image src='{{imghost}}/miniapp/images/model/nav.png' style="margin:0;position: relative;left: 6rpx"></image>
         </navigator>
     </view>
     <view class='s2_cen' style='background-color:{{object.inner_bgcolor}}'>
@@ -38,7 +38,7 @@
     </view>
     <view class='s2_right'>
         <navigator open-type="switchTab"  url="/pages/cart/cart/cart" class="s1_gk_a1">
-        <image src='/public/static/images/model/car.png' style="margin:0;;"></image>
+        <image src='{{imghost}}/miniapp/images/model/car.png' style="margin:0;;"></image>
         </navigator>
     </view>
 </view>
-var format = function (text) {
-
-  if (!text) {
-    return
-  }
-  var reg = getRegExp('\\\\n', 'g')
-  return text.replace(reg, '\n')
-}
-
-module.exports = {
-  format: format
-}
-// components/userqy_pop_up/userqy_pop_up.js
-var  o = getApp().globalData.setting
-Component({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    control: 1,
-	is_full_screen_show:0,  //全屏显示
-	sec_show:3,    //倒计时的秒数
-	full_ad:null,  //全屏广告
-	url:o.imghost,
-	full_screen:0,
-	is_full_screen_men:1,
-	hidden:0,
-  },
-  
-  pageLifetimes:{
-	hide: function() {
-        // 页面被隐藏
-		clearInterval(this.data.full_screen);
-	},
-  },
-
-  ready: function () {},
-  properties: {},
-  methods: {
-    close_full_screen(){
-    	this.setData({is_full_screen_show:0,sec_show:0});
-    },
-    //-- 跳转到满屏广告的链接 --
-    go_full_ad(){
-    	if(!this.data.full_ad) return false;
-    	if(!this.data.full_ad.ad_weapplink) return false;
-    	getApp().goto(this.data.full_ad.ad_weapplink);
-    },   
-    get_the_full_screen(){		
-		if(this.data.full_ad) {			
-			return false;		
-		}
-    	var th=this;
-    	//获取全屏的广告
-    	getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
-    		data: { enabled: 1 }
-    	}).then(res=>{
-             //判断是不是有全屏广告 	
-    		 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
-    			 th.setData({
-    				 is_full_screen_show:1,
-    				 full_ad:res.data.data.pageData[0],		 
-    			 })				 
-				 //--定时关闭--
-				 th.data.full_screen=setInterval(function(){
-				 	 if(!th.data.sec_show) {
-				 		  clearInterval(th.data.full_screen);
-				 		  th.close_full_screen();
-				 		  return false;
-				 	 }
-				 	 th.data.sec_show--;
-				 	 th.setData({sec_show:th.data.sec_show});		 
-				 },1000)
-							
-    		 }	
-    	})
-    }
-  },
- 
-})
 \ No newline at end of file
-{
-	"component": true,
-    "usingComponents": {}
-}
 \ No newline at end of file
-<!-- 全屏控制 -->
-<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
-	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
-</view>
-
-
-
-.full_screen{
-	position: fixed;left: 0;top: 0;
-	z-index: 1000000000000;
-	background-color: rgba(0,0,0,0.4);
-	width: 100%;
-	height: 100%;
-	background-position: center;
-	background-size: 100% 100%;
-	background-repeat: no-repeat;
-}
-.skip_box{
-        float: right;  margin-top: 10rpx;  margin-right: 10rpx;
-        background-color: gainsboro;  width: 120rpx;
-        height: 48rpx;  font-size: 28rpx;  line-height: 48rpx;
-        text-align: center;  border-radius: 20rpx;
- }
 \ No newline at end of file
@@ -51,6 +51,7 @@
 	width: 50%;
 	padding: 30rpx;
 	text-align: center;
+	line-height: 1;
 }
 .icon-container {
@@ -78,7 +79,7 @@
 .title {
 	font-size: 28rpx;
 	color: #7b7b7b;
-	padding-top: 10rpx;
+	padding-top: 20rpx;
 }
 .btn-cancel {
@@ -17,3 +17,5 @@
 		<view class="pd20">{{details.serviceContent}}</view>
 	</view>
 </view>
+
+<nav_box object="{{item.content}}"></nav_box>
@@ -11,13 +11,12 @@ Page({
 		list: null,
 		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
-		pageNum: 1, // 当前页数
-		
+		pageNum: 1, // 当前页数	
 		currentQuery: {
 			store_id: app.globalData.setting.stoid,
-		},
-		
+		},	
 		default_img: '/miniapp/images/default_g_img.gif',
+		object:null,
   },
   /**
@@ -30,7 +29,15 @@ Page({
 				userInfo: data,
 				imghost: app.globalData.setting.imghost,
 			});
-		});
+		});		
+	    var url="/api/weshop/store_module/gets/"+app.globalData.setting.stoid+"/0/5";
+		getApp().promiseGet(url,{}).then(res=>{
+			if(res.data.code==0 && res.data.data && res.data.data.length>0){
+				var json=JSON.parse(res.data.data[0].json_str);
+				var content=json[0].content;			
+				self.setData({object:content});
+			}
+		})
   },
   /**
@@ -54,8 +61,8 @@ Page({
 					isLogin: true,
 				});
-				this.getData(true, url, currentQuery);
-				
+				currentQuery.page=1;			
+				this.getData(true, url, currentQuery);			
 				// app.request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + app.globalData.setting.stoid, {
 				//   data: {
 				//     enabled: 1
@@ -64,7 +71,6 @@ Page({
 				// 	console.log('res==>1', res);
 				// });
-				
 				app.request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + app.globalData.setting.stoid, {
 				  data: {
 				    enabled: 1
@@ -132,9 +138,7 @@ Page({
 	/**
 	 * promiseGet请求数据
 	 */
-	getData: function(isInit, url, data) {
-		return new Promise(function(resolve, reject) {
-			
+	getData: function(isInit, url, data,callback) {	
 			app.request.promiseGet(url, {
 				data: data,
 				isShowLoading: true,
@@ -167,18 +171,18 @@ Page({
 					self.setData({
 						'list.pageData': []
 					});
-				};
-				resolve();
+				};				
+				if(callback) callback();
+				
 			})
 			.catch(function(err) {
 				console.log('出错拉！！！！',err);
 				self.setData({
 					'list.pageData': []
 				});
+				
+				if(callback) callback();
 			});
-			
-		});
-		
 	},
@@ -202,12 +206,9 @@ Page({
 				isLoading: true,
 				pageNum: this.data.pageNum + 1
 			});
-			requestData.page = this.data.pageNum;
+			requestData.page = this.data.pageNum;		
+			this.getData(false, url, requestData,callback)
-			this.getData(false, url, requestData)
-			.then(function() {
-				callback();
-			});
 		};
 	},
@@ -216,4 +217,12 @@ Page({
 	  var url = "/packageA/pages/goodsInfo/goodsInfo?goods_id=" + gid;
 	  app.goto(url);
 	},
+	
+	//图片失败，默认图片
+	bind_bnerr: function(e) {
+	  var _errImg = e.target.dataset.errorimg;
+	  var _errObj = {};
+	  _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+	  this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+	},
 })
 \ No newline at end of file
@@ -2,6 +2,8 @@
   "navigationBarTitleText": "卡项列表",
 	"enablePullDownRefresh": false,
 	"usingComponents": {
-		"nodata": "/components/nodata/nodata"
+		 "nodata": "/components/nodata/nodata",
+		 "advertising":"/components/diy_advertising/diy_advertising",		
+		 "nav_box":"/components/nav_box/nav_box"		
 	}
 }
 \ No newline at end of file
+<block wx:if="{{object}}">
+	<view class="bg_view" style="background-color:{{object.bg_color}};">
+	<advertising object="{{object}}"></advertising>	
+		<!-- 列表 -->
+		<block wx:if="{{object.column=='4'}}">
+			
+	    	<view class="{{object.noboder!=1?'b-bottom':''}}" wx:for="{{list.pageData}}"  style="padding: 10rpx 20rpx;"
+			    bindtap="go_goods" data-gid="{{item.id}}">	
+				
+				<view class="flex  bg-white ">		
+				<view>
+					<image class="image" src="{{imghost}}{{item.imgUrl && item.imgUrl!=''?item.imgUrl:'/miniapp/images/default_g_img.gif'}}"
+					   lazy-load="true" binderror="bind_bnerr" data-errorimg="list.pageData[{{index}}].imgUrl"  
+					   />
+				</view>
+				<view class="flex fdc space-bt f1 pdl20">
+					<view>
+						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
+						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
+					</view>
+					<view class="flex space-bt ali-c">
+						<view class="price">{{item.money}}</view>
+					</view>
+					<view style="height: 10rpx;"></view>
+				</view>
+				</view>	
+			</view>
+			
+		</block>		
+		<!-- 一列和俩列 -->	
+		<block wx:else>	
+		    <view class="pd20 flex-set" style="background-color: #{{object.bg_color}};">
+				<!-- 1列 2列 -->
+				<view wx:for="{{list.pageData}}" class="{{object.column=='1'?'w100':'w50'}} {{index%2==1?'ml':''}} bg-white" 
+				    bindtap="go_goods" data-gid="{{item.id}}"
+				    style="margin-bottom: 20rpx;">
+					<view style="width: 100%;">
+						<image style="width: 100%;"  lazy-load="true" binderror="bind_bnerr" data-errorimg="list.pageData[{{index}}].imgUrl"  
+					     src="{{imghost}}{{item.imgUrl && item.imgUrl!=''?item.imgUrl:'/miniapp/images/default_g_img.gif'}}" mode="aspectFill"/></view>
+					<view class="flex fdc space-bt f1 pdl20">
+						<view>
+							<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
+							<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:'不限'}}</view>
+						</view>
+						<view class="flex space-bt ali-c">
+							<view class="price">{{item.money}}</view>
+						</view>
+						<view style="height: 10rpx;"></view>
+					</view>
+				</view>	
+			</view>
+		</block>				
+	
+	<nodata class="t-c" wx:if="{{list.pageData.length == 0  && list.pageData}}"></nodata>
+	<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
+	</view>
+</block>
+
+<block wx:else>
 <view class="page">
 	<swiper class="swiper" autoplay indicator-dots circular easing-function="easeOutCubic">
 		<swiper-item wx:for="{{banner}}"><image src="{{item.ad_code ? item.ad_code : (imghost + default_img)}}" class="swiper-img"/></swiper-item>
-		<!-- <swiper-item>234</swiper-item>
-		<swiper-item>345</swiper-item> -->
-	</swiper>
-	
+	</swiper>	
 	<scroll-view class="scroll-view" scroll-y>
 		<view class="bg-white">
-			<view class="flex pd20" wx:for="{{list.pageData}}">
+			<view class="flex pd20" wx:for="{{list.pageData}}" bindtap="go_goods" data-gid="{{item.id}}">
 				<view>
-					<image class="image" src="{{imghost + item.imgUrl}}"/>
+					<image class="image" 
+					 lazy-load="true" binderror="bind_bnerr" data-errorimg="list.pageData[{{index}}].imgUrl"  
+					 src="{{imghost}}{{item.imgUrl && item.imgUrl!=''?item.imgUrl:'/miniapp/images/default_g_img.gif'}}"
+					/>
 				</view>
 				<view class="flex fdc space-bt f1 pdl20">
 					<view>
 						<view class="pdv20 fs28"><text class="ellipsis-2">{{item.serviceName}}</text></view>
-						<view class="fs24 c7b">有效天数：{{item.validDays}}</view>
+						<view class="fs24 c7b">有效天数：{{item.validDays?item.validDays:0}}</view>
 					</view>
 					<view class="flex space-bt ali-c">
 						<view class="price">{{item.money}}</view>
-						<view class="btn-details" bindtap="go_goods" data-gid="{{item.id}}">卡项详情</view>
+						<view class="btn-details" >卡项详情</view>
 					</view>
 				</view>
 			</view>
 			<nodata class="t-c" wx:if="{{list.pageData.length == 0 || list == null}}"></nodata>
 		</view>
-		<!-- <nodata class="t-c" wx:if="{{list.pageData.length == 0  && list.pageData}}"></nodata> -->
-		<view class="noMore">- 已经到底了 -</view>
+
+		<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
 	</scroll-view>
 </view>
+</block>
+<nav_box id="nav_box"></nav_box>
 \ No newline at end of file
 /* pages/i_service/cardList/cardList.wxss */
-page,
+page{ background-color: #f2f2f2;}
+
+
 .page {
 	height: 100%;
 }
-
-page {
-	background-color: #f2f2f2;
-}
-
 .scroll-view {
 	height: calc(100% - 300rpx);
 }
@@ -64,4 +61,21 @@ page {
 .swiper-img {
 	display: block;
 	margin: auto;
+}
+
+.list_item{ display: inline-block;}
+.w100{ width: 100%;} 
+.w50{ width: 49%; } 
+.w50.ml{margin-left: 12rpx;}
+
+.w50 image{ width: 100%; height: 340rpx; } 
+.flex-set{display: flex;flex-wrap: wrap;}
+
+.b-bottom{ border-bottom:1rpx solid #fff}
+.bg_view{
+	display: block;
+	min-height: 100%;
+	width: 100%;
+	position: absolute;
+	left: 0;top: 0;z-index: 1;
 }
 \ No newline at end of file
+var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"),
+  s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp();
+var oo=t.globalData.setting,os=oo;
+var regeneratorRuntime = require('../../../utils/runtime.js');
+var util_pay = require("../../../utils/pay.js");
+
+Page({
+    data: {
+        url: t.globalData.setting.url,
+        resourceUrl: t.globalData.setting.resourceUrl,
+        imgUrl: t.globalData.setting.imghost,
+       
+        invoiceToggle: !0,
+        payWithUserMoney: !0,
+        payWithPoints: !0,
+        maxWord: 0,
+        enterAddressPage: !1,
+     
+        //页面获取的参数
+        param:null,
+        postdata:null,
+        //提交订单的格式
+        formData: {
+            order_amount:0,//支付金额
+            total_amount:0,//总价
+            all_price:0,//商品卖的总价
+            pay_points: 0,//使用积分
+            user_money: 0,//使用余额
+            couponCode: "",//使用优惠券(多单就用逗号隔开)
+            shipping_price:0,//物流费用
+        },
+
+        /*----------------立即购买---------------------*/
+        is_b_now:0,    //0是购物车结算  1立即购买
+        bn_goods:null, //立即购买时候的调用商品
+        bn_use_money:0,//是否使用余额     
+        bn_pick:0,     //选择的门店
+        bn_pickname: "", //选择的门店名称
+      
+        /*------------------------*/
+        //判断页面是返回回来的还是 首次进入的
+        yuer:0,
+    },
+    onLoad: function(t) {	
+		wx.setNavigationBarTitle({
+		  title: "填写订单",
+		});
+		
+        var appD=getApp().globalData.service_now;
+        this.data.postdata=appD;
+        this.data.param=t;  
+		var th=this;  
+		
+		getApp().promiseGet("/api/wx/weappSendlist/page", {
+		  data: {
+		    store_id: os.stoid,
+		    typeid: "1001"
+		  }}).then(res=>{
+			  if (res.data.code == 0 && res.data.data.pageData.length > 0) {
+			    var template_id = res.data.data.pageData[0].template_id;
+			    th.setData({template_id:template_id});
+			  }  
+		  })
+		
+    },
+    onUnload: function () { this.setData({ isclose: 1 })},
+
+    //------获取会员信息-----先获取用户信息，在进行下一步---
+    get_info:function(func){
+       var user_id = t.globalData.user_id;
+       to.auth.get_u(func);
+    },
+
+   
+    //----------------展示页面,是再获取用户信息之后--------------
+    show_page:function(){
+          var th=this;
+          //th.setData({ userinfo: to.globalData.userInfo});  会员信息要时时获取		  
+		  var user=getApp().globalData.userInfo;
+		  getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, {
+		  		data:{r:Math.random()},	
+		    success: function (e) {	
+				
+				      getApp().globalData.userInfo = e.data.data;
+				      th.setData({userinfo:e.data.data});
+					  //获取立即购买的商品信息
+					  th.get_buy_goods();
+
+					  //获取提现金额
+					  getApp().request.get("/api/weshop/withdrawals/summoney", {
+						data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 },
+						success: function (su) {
+							if (su.data.code == 0) {
+								var yuer = parseFloat(th.data.userinfo.user_money -
+									(th.data.userinfo.frozen_money>0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2);
+								th.setData({ txmon: su.data.data.summoney, yuer: yuer });
+							}
+						}
+					});
+			}
+		});			
+    },
+
+    //-----获取立即购买的商品信息----
+    get_buy_goods: function (){
+          var th=this,a=getApp().request;
+          var gg =  th.data.postdata;	  
+		  var url="/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id  
+          //调用商品
+          a.get(url, {
+             success: function (t) {
+                     var gd = t.data.data;
+                     t.data.data.original_img = oo.imghost + t.data.data.imgUrl;
+                     t.data.data['buynum'] = gg.goods_num;    			   
+			         t.data.data.shop_price=gd.money;
+			 					 
+                     th.setData({
+                        bn_goods: t.data.data, bn_pickname: gg.pick_name,
+                        bn_pick: gg.pick_id
+                     });										 			 					 
+                     th.calculatePrice2();
+               
+             }
+         });
+    },
+
+    //----------子页返回父页触发----------
+    onShow: function() {
+       var th=this;
+       if (th.data.isclose==0){
+         wx.navigateTo({
+           url: "/pages/index/index/index"
+         })
+       }   	  	   
+	   //先获取是否有关闭使用优惠券
+	   getApp().getConfig2(function (ee) {
+	        //var json_d = JSON.parse(ee.switch_list);
+	        //th.data.ispt_goods=json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
+	        //th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch});
+	        th.show_page();				  	   		    		 	       
+	    })	  	   
+    },
+    
+	
+    showInvoice: function() {
+        this.setData({
+            invoiceToggle: !this.data.invoiceToggle
+        });
+    },
+	
+
+    //---------计算立即购买----------
+    calculatePrice2: function () {
+		  console.log('calculatePrice2');
+		  var th = this, good = this.data.bn_goods;
+		  //-----------计算商品总价--------------
+		  var allpice = good.shop_price * good.buynum;
+		  allpice=parseFloat(allpice).toFixed(2);
+		  var txt = "formData.all_price";
+		  th.setData({ [txt]: allpice, });
+  
+		  var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;	  
+		  //-----------------总价-----------------
+		  var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price);
+		  total_m = parseFloat(total_m).toFixed(2);
+
+		  var atxt= "formData.total_amount";
+		  th.setData({ [atxt]: total_m, })
+		  var order_m = total_m;
+		  var txt = "formData.user_money";
+		  var txt2 = "formData.order_amount";
+		 
+		  th.setData({ [txt]: 0, [txt2]: order_m })
+		    
+    },
+	
+	submitForm:function(){
+		var th=this;
+		this.sendsm(function(){
+			th.submit_func();
+		})
+	},
+	
+    //--------------------提交订单-----------------------
+    submit_func: async function(){
+        if(this.data.is_summit_ing==1) return false; //--提交中退出--
+        this.data.is_summit_ing=1;
+        var th=this,pdata=new Array();
+        var ff=true;  				
+        var item={
+          'user_id': to.globalData.user_id,
+          'account': th.data.formData.order_amount,          //使用余额   
+          'store_id':oo.stoid,                               //商家       
+		  'list':new Array(),
+       }; 
+       var gg = getApp().globalData.service_now;
+       var goods={
+          'card_id': th.data.bn_goods.id,
+          'itemid': th.data.bn_goods.erpItemID,      
+          'qty': gg.goods_num,
+          'price': th.data.formData.order_amount,
+		  'pickup_id':gg.pick_id,
+		  'pickup_keyid':gg.keyid,
+       };
+
+       //--导购分享过来的id--
+       if(gg.guide_id){
+            goods.guide_id=gg.guide_id;
+            goods.guide_type=gg.guide_type;
+            //调用接口判断是不是会员
+            await  getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{
+               if(res.data.code==0){
+                   goods.guide_name=res.data.data.salesman;
+                   goods.guide_sn=res.data.data.salesman_no;
+               }
+           })
+      }
+      item.list.push(goods);
+      pdata=item;
+    
+      var str = JSON.stringify(pdata);
+      console.log("支付数据");
+      console.log(str);
+      //return false;
+      wx.showLoading({title: "加载中"});
+      wx.request({
+        url: oo.url + '/api/weshop/recharge/saveRecharge',
+        data: str,
+        method: 'POST',
+        header: {
+          'content-type': 'application/json'
+        },// 设置请求的 header
+        success: function (res) {
+       
+          wx.hideLoading();
+          if (res.statusCode == 200) {
+              var data=res.data;
+              if(data.code==0){
+              
+                var order_amount = pdata.account;        
+                //要进行判断，如果是用微信支付，就要跳转到支付界面
+                if (order_amount > 0) {
+                    th.setData({ isclose: 0 });
+                    		
+					getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
+					  data: {
+					    parentSn: data.data.order_sn,
+					    store_id: oo.stoid
+					  },
+					  success: function (su) {					    
+					    var n=su.data.data;					  
+					    th.weixinPay(n,
+					      function () {
+					         getApp().showWarning("购买成功");			         
+					         setTimeout(function () {
+					             wx.reLaunch({
+					         	   url: "/packageA/pages/cardList/cardList",
+					             })
+					         },1000)
+					      }, function () {
+					         getApp().showWarning("支付失败");
+							 setTimeout(function () {
+							    wx.reLaunch({
+								   url: "/packageA/pages/cardList/cardList",
+							    })
+							 },1000)
+					      })
+					  }
+					})			
+                } 
+              }
+              else{
+				 th.data.is_summit_ing=0;  //是否提交中
+                 getApp().confirmBox(data.msg);
+              }
+          } else {
+			th.data.is_summit_ing=0;  //是否提交中
+            console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+          }
+        },
+        fail: function () {
+		  th.data.is_summit_ing=0;  //是否提交中	
+          wx.hideLoading();
+          console.log("index.js wx.request CheckCallUser fail");
+        },
+        complete: function () {}
+      })
+    },
+
+	cart_set_err: function (e) {
+		var txt = e.currentTarget.dataset.err;
+		var ob = {};
+		ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif";
+		this.setData(ob);
+	},
+	
+	//------调起支付框--------
+	weixinPay: function (n, success, fail) {
+	  if(!n) return false;	
+	  wx.requestPayment({
+	    timeStamp: String(n.timeStamp),
+	    nonceStr: n.nonceStr,
+	    package: n.packageValue,
+	    signType: n.signType,
+	    paySign: n.paySign,
+	    success: function (n) {
+	      console.log(n), getApp().showSuccess("支付成功！");
+	      "function" == typeof success && success();
+	      wx.redirectTo({
+	        url: "../deposit/deposit"
+	      });
+	    },
+	    fail: function (n) {
+	      console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)),
+	        "function" == typeof fail && fail();
+	    }
+	  });
+	},
+	
+	//订阅消息提醒
+	sendsm:function(func)
+	  {  
+	         var template_id = this.data.template_id;    
+	          // //授权订阅
+	          wx.requestSubscribeMessage({
+	            tmplIds: [template_id],
+	            success(res) {
+	                func();
+	            },
+	            fail(res) {
+	                func();
+	            }
+	          })
+	        
+	  },
+
+   
+});
+{
+    "navigationBarTitleText": "填写订单",
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "warn": "/components/long_warn/long_warn"
+    }	
+}
 \ No newline at end of file
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+<form bindsubmit="submitForm">
+    <view class="container">
+      
+        <!------立即购买-------->
+        <block>
+                <view class="use-item bfff bdr_t-14 mgt20">
+                      <image class="dp" src='{{imgUrl}}/miniapp/images/goodscategory/new_store.png'> </image> <view>{{bn_pickname}}</view></view>
+                <view class="order-detail">
+                      <view class="goods-img">
+                          <image class="wh100 bdr14" src="{{bn_goods.original_img}}" 
+                            binderror='cart_set_err' data-err="bn_goods.original_img"></image>
+                      </view>
+                      <navigator class="order-cont" url="/packageA/goodsInfo/goodsInfo?goods_id={{bn_goods.id}}">
+                          <view class="goods-name ellipsis-2">{{bn_goods.serviceName}}</view>
+                             <!-- 商品属性 -->
+                             <!-- <view class="flex-vertical fs28 color-gray n_guige"> -->
+                                 <!-- <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text></view> -->
+							 <!-- </view> -->
+                             <!-----商品名称规格------>
+							 <view class="order-num flex-space-between">
+								<view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
+								<view class="goods-num">x{{bn_goods.buynum}}</view>
+							 </view>
+                      </navigator>                 
+                </view>					
+	 </block>	
+	<!-- 							
+	 <view class="coupon-mes flex-vertical">
+		<view>留言</view>
+		<view class="leave-word">
+			<input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>	 
+		</view>
+	 </view>-->	
+     
+	 <view class="information bdr14">				
+		<view class="item">
+			<view>服务卡金额</view>
+			<view class="co-red">￥ {{formData.all_price}}元</view>
+		</view>
+	</view>
+    </view>
+     <view class="btn-wrap">
+			<view class="pay-amount">
+				<view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view>		
+			</view>
+			<button class="tips-btn" formType="submit" id="submitOrder">提交订单</button>
+     </view>
+</form>
+<warn id="warn"></warn>
+@import '../../../app.wxss';
+
+.bdr_t-14 {
+	border-top-left-radius: 14rpx;
+	border-top-right-radius: 14rpx;
+}
+.bdr_b-14 {
+	border-bottom-left-radius: 14rpx;
+	border-bottom-right-radius: 14rpx;
+}
+.bdr14 {
+	border-radius: 14rpx;
+}
+.mgt20 {
+	margin-top: 20rpx;
+}
+.shadow {
+	box-shadow: 0 4rpx 12px #e7e9eb;
+}
+.shadow-1 {
+	box-shadow: 16rpx 0px 12px #e7e9eb;
+}
+
+
+page {
+	/* background-color: #FAFAFA; */
+	background-color: #F0F0F0;
+	padding: 0 22rpx;
+	box-sizing: border-box;
+}
+.container {
+	background-color: #F0F0F0;
+	/* padding-top: 28rpx; */
+	padding-bottom: 120rpx;
+}
+.user-mes {
+    position: relative;
+    background-color: #fff;
+    font-size: 32rpx;
+    color: #444;
+		/* margin-top: 28rpx; */
+		border-radius: 14rpx;
+}
+.user-contact {
+    padding: 24rpx 26rpx;
+    font-weight: 600; 
+}
+ 
+.location {
+    position: relative;
+    padding: 0 70rpx 24rpx;
+}
+
+.pos-icon {
+    position: absolute;
+    left: 28rpx;
+    top: 6rpx;
+    width: 30rpx;
+    height: 36rpx;
+}
+
+.border-img {
+    width: 100%;
+    height: 12rpx;
+}
+
+.update-logistics {
+    position: absolute;
+    right: 0;
+    top: 0;
+    width: 80rpx;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.arrow-rigth {
+    width: 32rpx;
+    height: 32rpx;
+}
+
+.order-meg {
+    margin-bottom: 20rpx;
+    font-size: 28rpx;
+    
+}
+
+.order-detail {
+    padding: 30rpx 0;
+    border-bottom: 2rpx solid #eee;
+    color: #777;
+    min-height: 190rpx;
+    background-color: #fff;
+  
+}
+
+.goods-img {
+    float: left;
+    width: 200rpx;
+    height: 200rpx;
+    margin: 0 20rpx;
+}
+
+.order-cont {
+    float: left;
+    width: 438rpx;
+}
+
+.goods-name {
+    height: 74rpx;
+    line-height: 40rpx;
+    overflow: hidden;
+    margin-bottom: 16rpx;
+    font-size: 28rpx;
+    color: #333;
+}
+
+.goods-color {
+    font-size: 24rpx;
+}
+
+.order-num {
+    margin-top: 25rpx;
+    font-size: 24rpx;
+    line-height: 42rpx;
+}
+
+.set-mes{
+	background-color: #fff;
+	/* margin-top: 20rpx; */
+}
+.use-item{
+    display: flex;
+    align-items: center;
+    height: 80rpx;
+    /* border-bottom: 1px solid #ddd; */
+    font-size: 30rpx;
+  /* width:95%;
+margin:auto; */
+	padding: 0 26rpx;
+}
+.use-item>view{
+   display: flex;
+	 /* margin-right: 12rpx; */
+}
+.use-item.bfff{
+	background-color: #fff;
+}
+.use-item .dp{
+	display: block;
+	width: 50rpx;
+	height: 50rpx; 
+	margin-left: -6rpx;
+}
+
+.set-item {
+    justify-content: space-between;
+    background-color: #fff;
+}
+
+.set-btn {
+    display: flex;
+    font-size: 24rpx;
+}
+
+.set-mes input {
+    width: 380rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    border: 1px solid #ddd;
+}
+
+.use-btn {
+    width: 100rpx;
+    height: 50rpx;
+    margin-left: 20rpx;
+    line-height: 50rpx;
+    text-align: center;
+    background-color: #f23030;
+    color: #fff;
+}
+
+.coupon-mes {
+	/* box-sizing: border-box; */
+    height:95rpx;
+    padding: 0 26rpx;
+    background-color: #fff;
+    font-size: 30rpx;
+    color: #444;
+    /* width: 100%; */
+		border-radius: 14rpx;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+}
+
+.coupon-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 92rpx;
+}
+
+.coupon-title>view {
+    display: flex;
+}
+
+.coupon-num {
+    height: 36rpx;
+    margin-left: 20rpx;
+    padding: 0 16rpx;
+    line-height: 36rpx;
+    text-align: center;
+    background-color: #f23030;
+    color: #fff;
+    font-size: 24rpx;
+}
+
+.leave-word {
+    position: relative;
+    font-size: 24rpx;
+    margin-left: 20rpx;
+		flex-grow: 1;
+}
+
+.word-box {
+    font-size: 26rpx;
+    /* width: 600rpx; */
+    padding: 10rpx;
+    height: 28rpx;
+    line-height: 40rpx;
+}
+
+.max-word {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+}
+
+.information {
+    padding: 0 26rpx;
+    background-color: #fff;
+    /* margin-bottom: 120rpx; */
+}
+
+.information .item {
+    display: flex;
+    justify-content: space-between;
+    height: 60rpx;
+    line-height: 60rpx;
+    font-size: 26rpx;
+    color: #777;
+}
+
+.btn-wrap {
+	height: 94rpx;
+	box-sizing: border-box;
+	display: flex;
+	justify-content: space-between;
+	background-color: white;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	padding: 0 30rpx;
+}
+
+.tips-btn {
+		color: white;
+		background-color: #FE4445;
+		height: 72rpx;
+		line-height: 72rpx;
+		padding: 0 42rpx;
+		border-radius: 36rpx;
+		margin-left: 0;
+		margin-right: 0;
+}
+
+.payable {
+    color: #444;  
+}
+
+.shipping-modal {
+    z-index: 20;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    overflow-y: hidden;
+    color: #666666;
+    background-color: white;
+}
+
+.shipping-nav {
+    text-align: center;
+    font-size: 35rpx;
+    padding-top: 30rpx;
+}
+
+.shipping-list {
+    padding: 20rpx 30rpx 40rpx;
+    font-size: 28rpx;
+}
+
+.shipping-item {
+    display: block;
+    padding: 20rpx 0;
+}
+
+.shipping-btn {
+    width: 100%;
+    color: white;
+    background-color: #f23030;
+    line-height: 90rpx;
+    text-align: center;
+    font-size: 40rpx;
+}
+
+/*----------nyf新增，地址---------*/
+.add_new{
+	height: 90rpx;
+	display: flex;
+	align-items: center;
+	padding: 0 26rpx;
+}
+.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; 
+   margin-right: 15rpx;vertical-align: middle;}
+.yu_er{
+	margin-left: 10rpx;
+	/* margin-right: 60rpx; */
+}
+.wuliu{margin-left: 20rpx;}
+
+
+/*---- 优惠券列表 -----*/
+.xc-coupon-frame{
+    width: 100%;
+    height: 92rpx;
+  
+}
+.xc-coupon-frame .work-frame{
+    width: 100%;
+    height: 100%;
+    border-bottom:3rpx solid #eee;
+		padding: 0 26rpx;
+		background-color: white;
+}
+.xc-right{
+    width:20rpx;
+    height:20rpx;
+    border-top:2rpx solid #000;
+    border-right:2rpx solid #000;
+    transform:rotate(45deg);
+    display:inline-block;
+}
+
+.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; }
+.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx }
+
+/* 自定义弹出窗口 */
+.cx-popup{
+    width:100%;
+    height:880rpx;
+    background: #fff;
+    z-index: 35;
+    border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx;
+    position:fixed;
+    bottom:0;
+		left: 0;
+    /* padding-bottom: 25rpx; */
+}
+
+.cx-popup .top{
+    width:95%;
+    height:100rpx;
+    border-bottom:3rpx solid #ddd;
+    margin: auto;
+ margin-top: 30rpx;
+
+}
+.xc-top-content{
+    width: 93%;
+    height:85rpx;
+    padding-top: 30rpx;
+    font-size: 34rpx;
+    font-weight: 600;
+
+}
+
+
+.xc-valid-coupon{
+    width: 90%;
+    height:40rpx;
+    padding-top: 24rpx;
+    overflow: hidden;
+}
+.xc-frame{
+    width: 100%;
+    height:60%;
+}
+
+.xc-frame .list-frame{
+    width: 95%;
+    height: 100%;
+    overflow-y:scroll;
+
+}
+.xc-close-frame{
+    margin-top:-10rpx;
+ 
+}
+
+.xc-close{
+   width: 37rpx;
+height: 37rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+line-height: 34rpx;
+font-size: 29rpx;
+color: #333;
+
+}
+.xc-money{
+    color: #af2346;
+    font-size: 35rpx;
+}
+
+.xc-money-frame{
+    margin-left:35rpx;
+
+}
+.xc-coupon-effect{
+    width: 99%;
+    min-height: 100rpx;
+    border-bottom:3rpx solid #ddd;
+
+
+}
+.xc-goods-coupon{
+    width: 85%;
+    height:100%;
+
+}
+.xc-title{
+    width:50%;
+    margin-left:222rpx;
+
+}
+.xc-coupon-money0{
+    color: #c91e31;
+    font-size: 35rpx;
+    line-height: 40rpx;
+
+}
+.xc-coupon-money{
+    color: #c91e31;
+    font-size: 35rpx;
+    line-height: 40rpx;
+    padding-top: 10px;
+
+}
+.xc-coupon-money1{
+    color: #444;
+    font-size: 28rpx;
+  line-height: 60rpx;
+
+
+}
+.xc-coupon-time{
+    height: 50rpx;
+    font-size: 27rpx;
+    color: #a4a4a4;
+}
+.xc-coupon-time .time{
+    margin-left: 15rpx;
+    font-size: 27rpx;
+}
+.xc-coupon-selection{
+    height:100%;
+}
+
+.xc-confirm {
+   width: 50%;
+   border-radius: 50rpx;
+   height: 80rpx;
+    margin:0 auto;
+    background:#d60021;
+    color:#fff;
+    font-size:28rpx;
+    margin-top: 28rpx;
+}
+
+.up{ animation: up .7s; }
+.down{ animation: down 1s; }
+@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } }
+@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } }
+
+.xc-not-Selection{
+   width: 40rpx;
+height: 40rpx;
+    background: #eeeeee;
+}
+
+
+.xc-close-express{
+   width: 40rpx;
+height: 40rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+font-size:32rpx;
+line-height: 38rpx;
+color: #333;
+margin-top: 5rpx;
+}
+.cx-popup .tops{
+  width: 100%;
+height: 145rpx;
+border-bottom: 3rpx solid #eee;
+
+}
+.top-content {
+  width: 82%;
+padding-top: 33px;
+height: 100%;
+padding-left: 40rpx;
+}
+.close-frame{
+  margin-top: 30rpx;
+
+}
+
+.xc-hook {
+width: 33rpx;
+height: 33rpx;
+transform: rotate(-135deg);
+line-height: 35rpx;
+text-align: center;
+margin-right: 20rpx
+
+
+}
+.xc-hooks {
+width: 30rpx;
+height: 30rpx;
+border: 1rpx solid #999;
+margin-right: 20rpx;
+}
+.express_list_frame{
+  display: flex;
+height: 80rpx;
+align-items: center;
+padding-left: 40rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.express_list{
+  width: 100%;
+  height: 65%;
+  overflow-y: auto;
+  margin-bottom: 40rpx;
+  
+}
+.xc-confirms {
+	box-sizing: border-box;
+  width: 40%;
+  border-radius: 50rpx;
+  height: 80rpx;
+  margin:0 auto;
+  font-size:28rpx;
+  background: #fff;
+  color: #333;
+  border: 2rpx solid #333;
+}
+
+
+/* 优惠券的改版样式 */
+.xc-coupon-frame{
+  /* width: 710rpx; */
+	width: 100%;
+  height:auto; 
+  margin: 0 auto;
+
+}
+.xc-coupon-frame .coupon-frame{
+  width: 100%;
+  height: 200rpx;
+  margin-top:10rpx;
+  border-bottom: 1rpx solid #eee;
+
+}
+.xc-coupon-frame .coupon-frame .coupon-left{
+  width: 215rpx;
+  height:100%;
+  overflow: hidden;
+}
+.xc-money-frames{
+    width:96%;
+    margin-top: -10px;
+}
+
+.xc-rmb-symbol{
+  font-size:40rpx;
+
+}
+
+.xc-rmb-val{
+ font-size:60rpx;
+ 
+}
+.coupon-explain{
+ font-size:25rpx;
+width:100%;
+
+
+}
+.xc-valuer{
+    margin-top:39rpx;
+    margin-left:28rpx;
+   font-size:25rpx;
+}
+.coupon-frame .oval{
+   width:155rpx;
+   height:83rpx;
+   border-radius: 50%;
+   right:-78rpx;
+   top:-37rpx;
+} 
+.coupon-right{
+  height: 99%;
+  border-top: 1rpx solid #eaeaea;
+  border-right: 1rpx solid #eaeaea;
+	flex-grow: 1;
+}
+.coupon-annotation{
+  width: 95%;
+  height: 100%;
+  
+}
+.xc-brand{
+  width:100rpx;
+  height:35rpx; 
+  line-height: 35rpx;
+  font-size:21rpx;
+  border-radius:10rpx; position: relative; top:-1px;
+  margin-right: 8rpx
+}
+.top-frame{
+  width:82%;
+  height: 75rpx;
+  margin-top:10rpx;
+}
+.top-frame .coupon-wode{
+  font-size: 25rpx;
+  margin-left:10rpx;
+  width:340rpx;
+  height:88rpx;  
+}
+.coupon-code{
+ width:60rpx;
+ height:60rpx;
+ margin-top:5rpx;
+
+}
+.frame{
+  width: 100%
+}
+.coupon-time{
+  font-size: 23rpx;
+  line-height:33rpx;
+  color: #333;
+}
+
+.clik-get{
+ width:125rpx;
+ height:45rpx;
+  border-radius: 25rpx;
+  line-height: 45rpx;
+  font-size:25rpx;
+  bottom:67rpx;
+  right:6px;
+}
+
+.code-img{
+  margin-left:20rpx;
+}
+.bottmo-explain{
+top:145rpx;
+width:94%;
+border-top:1rpx dashed #eee;
+padding-top:8rpx;
+height:38rpx;
+line-height: 51rpx;
+
+}
+.font-word{
+  font-size: 22rpx;
+}
+.circle-size{
+  background: #a0a0a0;
+  width: 27rpx;
+  height: 27rpx;
+  margin-top:13rpx;
+  margin-left:8rpx;
+  display: flex;
+  align-items: center;
+}
+.xc-jiantou{ 
+      transform: rotate(-90deg);
+      color: #fff;
+      font-size: 15rpx;
+      text-align: center;
+      width: 24rpx;
+}
+.xc-buttom{
+	box-sizing: border-box;
+	width:100%;
+	min-height:76rpx;
+	height:auto;
+	line-height:40rpx;
+	border-left:1rpx solid #eee;
+	border-right:1rpx solid #eee;
+	border-bottom:1rpx solid #eee;
+}
+
+.goods-num{
+  font-size: 28rpx;
+  color: #333;
+}
+
+.explain-coupon{
+  font-size:25rpx;
+  padding: 10rpx 10rpx
+}
+.circle-frame{ 
+  width: 20rpx;
+  height: auto;
+  z-index:1;
+  left:210rpx;
+  
+}
+.circle-sawtooth{
+  width: 11rpx;
+  height: 11rpx;
+  background: #fff;
+}
+
+.red{background-color: #fe7496;}
+.green{ background-color: #22c7c1;}
+.blue{background-color:#5e82e3;}
+.g_gray{background-color: #aaaaaa}
+
+.f_text{text-align: center; height:96rpx; }
+.xc-hook.sn {
+  margin-top:12%;
+width:45rpx;
+height:45rpx;
+font-size:28rpx;
+line-height:44rpx;
+
+
+}
+.xc-hooks.on{
+  margin-top:12%;
+width:42rpx;
+height:42rpx;
+}
+.may_use_coupon{
+  /* width: 95%; */
+  /* height: 68rpx; */
+  line-height:78rpx;
+	padding: 0 26rpx;
+	justify-content: space-between;
+	align-items: center;
+}
+.determine-frame{
+  width: 100%;
+  height: 130rpx;
+  
+}
+.xc-determine{
+  height: 80rpx;
+  width: 40%;
+  border-radius: 50rpx;
+background: #d60021;
+color: #fff;
+font-size: 28rpx;
+margin: 0 auto;
+
+}
+.click-buttem{
+width: 90%;
+margin: auto;
+}
+.logistics-name{
+  margin-right:20rpx;
+}
+.xc-border{
+  border-top:8rpx solid #eee;
+width: 100%
+}
+.main-top{
+margin-top: 20rpx;
+
+}
+.xc-hookts{
+border: 1rpx solid #999;
+
+}
+.xc-hookts.on{
+  width:30rpx;
+height:30rpx;
+
+}
+.xc-hookt.sn{
+  width: 32rpx;
+height: 32rpx;
+font-size: 28rpx;
+line-height: 34rpx;
+}
+.xc-hookt{
+  transform: rotate(-135deg);
+text-align: center;
+
+}
+.main-bottom{
+  margin-bottom: 20rpx;
+
+}
+.xc-hookst{
+  border: 1rpx solid #999;
+
+}
+.xc-hookst.ons{
+  width: 42rpx;
+height: 42rpx;
+margin-left: 20rpx;
+
+}
+.is_use_coupon{
+  width: 65%;
+justify-content: flex-end;
+padding-top: 10rpx;
+
+
+}
+.xc-hooka{
+  transform: rotate(-135deg);
+text-align: center;
+
+} 
+.xc-hooka.sn{
+  width: 45rpx;
+height: 45rpx;
+font-size: 28rpx;
+line-height: 44rpx;
+margin-left: 20rpx;
+
+}
+.color-gray{
+  color: #808080;
+}
+.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
+.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0}
+
+.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;}
+
+.navigator-hover {
+	background: none;
+	opacity: 1;
+}
+
+.plus_buy{
+	background-color: #fff;
+	margin:15rpx 0;
+	padding: 20rpx 10rpx;
+	position: relative;
+}
+
+.card_bg {
+  box-sizing: border-box;
+  padding: 2rpx 10rpx;
+  height: 28rpx;
+  border-radius: 26rpx;
+  font-size: 18rpx;
+  line-height: 28rpx;
+	max-width: 210rpx;
+  background: #333;
+  color: #fff;
+  margin-left: 8rpx;
+  position:relative;
+  top:7rpx;
+}
+
+.card_bg image {
+  width: 19rpx;
+  height: 19rpx;
+  margin-right: 8rpx;
+}
+
+.card_name {
+	position: relative;
+	top: -4rpx;
+	margin-left: 6px;
+}
+
+.car_tri_up {
+    width: 0;height: 0;
+    border-left: 20rpx solid transparent;
+    border-right: 20rpx solid transparent;
+    border-bottom: 20rpx solid #fff;
+    position: absolute;
+    right: 20rpx;
+    top:-10rpx
+}
+.card_op{
+  position: absolute;
+  right: 20rpx;
+  top:36rpx
+}
+
@@ -217,6 +217,7 @@ Page({
 	//------调起支付框--------
 	weixinPay: function (n, success, fail) {
+	  if(!n) return false;	
 	  wx.requestPayment({
 	    timeStamp: String(n.timeStamp),
 	    nonceStr: n.nonceStr,
@@ -49,7 +49,7 @@ Page({
 				var user_id=app.globalData.userInfo.user_id;				
 				// 请求数据
 				wx.getImageInfo({
-				  src: os.url+'/api/wx/open/app/user/getWeAppEwm/1?sceneValue='+user_id+'&pageValue=packageA/pages/distribution/shop/shop',
+				  src: os.url+'/api/wx/open/app/user/getWeAppEwm/'+os.stoid+'?sceneValue='+user_id+'&pageValue=packageA/pages/distribution/shop/shop',
 				  success (res) {
 						self.setData({
 							img: res.path,
@@ -34,9 +34,7 @@ Page({
     data: null,
     content: "", //商品详情
-    comments: null, //商品评论
-    c_curr_p: 1, //评论分页
-    com_num: 0, //评论人数
+
     gallery: null, //图片滚动
     is_collect: 0,
     collect_id: 0,
@@ -45,8 +43,7 @@ Page({
     optionItemId: 0,
     goodsInputNum: 1,
     openSpecModal: !1,
-    openSpecModal_pt: !1, //拼单的弹起，
-    openPromModal: !1,
+ 
     activeCategoryId: 0,
     supportPageScroll: !1,
     address: {
@@ -108,15 +105,13 @@ Page({
       activity: null
     },
-    //已选的商品（属性）
-    sele_g_spec_name: '',
-    sele_g_id: '',
-    sele_g: null,
+  
     //门店相关
     ismend: 0,
     is_sec_mend: 0,
     sto_sele_name: "", //选中的门店名称
     sto_sele_id: "", //选中的门店id
+	sto_sele_keyid:'', //选中的门店线下
     sto_sele_distr: "", //选择的门店的配送方式
     is_show_sto_cat: 1, //是否显示门店分类
     only_pk: null,
@@ -127,44 +122,17 @@ Page({
     sec_pick_index: 0, //第二级门店选择ID
     fir_pick_index: 0, //第一级门店选择ID
     all_pick_list:null,//所有的门店先记录起来
-    //同一条形码的所有商品
-    sku_g: null,
-    sku_g_pt: null, //---拼单的普通购买---
+
     //联系电话
     mobile: '',
-    //分类，品牌，国别名称
-    cat_name: '',
-    brand_name: '',
-    nation_name: '',
-
     //商品的活动类型 0普通  1秒杀 2团购 3优惠  4 积分购  6拼单
-    prom_type: 0,
-    prom_time_text: "",
-    prom_price: null,
-    prom_buy_limit: 0,
-    djs: null,
-    prom_st: 0,
-    prom_r_null: 0,
-    prom_end_time: null,
-    prom_start_time: null,
-    prom_act: null,
-    pd_xx: 0,
-    is_normal: 0, //是否普通购买
-    teamgroup: null, //有多少人开团
-    grounp_tatal: 0, //有几个人开团
     timer: [],
     //商品的购买次数
     prom_buy_num: -1,
     g_buy_num: null,
-    prom_goods_num: 0, //活动商品数量
-    prom_buy_num: 0, //活动商品购买数量
-    prom_redis_num: 0, //活动商品redis数量
-
-    //拼单的规则显示
-    is_show_gz: 0,
+  
     //会员自己的购买的拼单商品的情况
-    user_order_pt_state: 0,
     //购买的订单
     buy_order: null,
     //1加入购物车  2立即购买
@@ -175,11 +143,6 @@ Page({
     isshow: 0,
     bconfig: null, //基础配置
-    fir_comments: null, //详情页上的评价
-    fir_quan: null, //详情页上的券
-    quan_list: null, //券列表
-
-    coupon: 0,
     //会员分享的头像
     share_head: "",
     share_goods_img: "",
@@ -189,15 +152,6 @@ Page({
     swiperCurrent: 0, //轮播的下标
     hiddenn: 0, //控制轮播计数显示
-    currentTab: 0, // 选择器控制参数
-    mapurl: "",
-    mapurl_f_img: "",
-    videopicture: 0, //视频图片的控制
-
-    video: 0, //视频图片切换器
-    index: 0,
-    noon: 0, //开始视频的隐藏
-
     screenWidth: 0,
     canvasHidden: 1,
@@ -208,8 +162,6 @@ Page({
     is_show_gb: 0, //是否国别
     is_closecoupon: 0,
-    //是否点赞中
-    iszaning: 0,
     select_store: 0, //选择更多
     index: 1,
@@ -230,51 +182,42 @@ Page({
     default_store: {}, //创建添加默认门店地址的对象
     comments_no_more:0,
-    get_c:0,               //获取评价是不是成
+  
     is_collect_load:0,     //是不是处理
     is_newsales_rules:0,   //是否开启最新的门店规则,此时会新读门店,当点击选择门店时会触发读取线下库存
     sales_rules:1,	       //默认是线上销售
     wait_for_user_store:null,
-    prom_goods:null,       //商品优惠列表
-    order_prom:null,       //订单优惠
-    collocationGoods:null, //搭配购
-    
 	poster:null,      //自定义海报
-	share_b_img:'',   //自定义分享的背景
-	
+	share_b_img:'',   //自定义分享的背景	
 	showPoster: false,	
 	hui_condition:null,
 	sto_sele_name_1:'',//分享的门店名称
-
+	
   },
   //------初始化加载----------
   onLoad: function(t) {
-    // wx.setNavigationBarTitle({
-    //   title: "商品详情",
-    // })
+	 
+	console.log("--服务卡项--");  
+	console.log(t);  
+   
     var ee = this,
         that = ee,
         th = ee,
         gid = t.goods_id,
-        first_leader=t.first_leader,
-        room_id=t.room_id,
-		room_user_share=t.room_user_share; //如果是会员分享带有room_id的话，那么接下来会员分享就不传room_id
-		
+        first_leader=t.first_leader;
+	
 	//-- 自定义海报 --
 	getApp().request.promiseGet("/api/weshop/goods/poster/page", {	
 		data:{store_id:os.stoid, type:1, is_use:1}
 	}).then(res=>{
-		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){
-			
+		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){			
 			var poster_data=res.data.data.pageData[0];
-			var json_str=poster_data.jsonStr;
-			
+			var json_str=poster_data.jsonStr;			
 			if(json_str){
 				var json_data=JSON.parse(json_str);		
-				if(json_data.bg_img){
-					
+				if(json_data.bg_img){				
 					//-- 把图片那到本地 --
 					wx.getImageInfo({
 					  src:json_data.bg_img,
@@ -285,8 +228,7 @@ Page({
 					  fail: function(res) {}
 					});
 				}								
-				th.setData({poster:json_data})				
-								
+				th.setData({poster:json_data})												
 			}			
 		}
 	})	
@@ -308,9 +250,7 @@ Page({
     }
     ee.setData({ gid: gid});
-    if(first_leader){
-      console.log("log---".first_leader);		
-		
+    if(first_leader){ 	
       getApp().globalData.first_leader=first_leader;
       //调用接口判断是不是会员
       getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
@@ -319,16 +259,6 @@ Page({
         }
       })
     }
-
-    //-- 如果有房间号 --
-    if(room_id){
-      getApp().globalData.room_id=room_id;
-      getApp().globalData.room_goods_id=gid;
-	  //如果是会员分享过来的要记录
-	  if(room_user_share)
-	     getApp().globalData.room_user_share=room_user_share;
-    }
-
     var c_guide_id=t.c_guide_id;
     if(c_guide_id){
       th.data.c_guide_id=c_guide_id;
@@ -340,75 +270,19 @@ Page({
     //----获取系统参数-----
     getApp().getConfig2(function(e) {
-      ee.setData({
-        bconfig: e,
-        sales_rules:e.sales_rules,
-      });
-
-      if (e.categoryset.indexOf("," + 1 + ",") != -1) {
-        ee.setData({
-          is_show_pl: 1
-        });
-      }
-      if (e.categoryset.indexOf("," + 3 + ",") != -1) {
-        ee.setData({
-          is_show_pp: 1
-        });
-      }
-      if (e.categoryset.indexOf("," + 2 + ",") != -1) {
-        ee.setData({
-          is_show_gb: 1
-        });
-      }
-
+     
       var json_d = JSON.parse(e.switch_list);
       ee.setData({
         store_config: e,
         sys_switch:json_d,
-        is_closecoupon: json_d.is_closecoupon,
-        is_newsales_rules:json_d.is_newsales_rules
       });
-      ee.init(gid);
-      //------几人评价-------
-      //n.init(th, "", "comments");
-
+     
+      
       th.requestCardNum(), wx.pageScrollTo && th.setData({
         supportPageScroll: !0
       });
-      //计算等级价相关
-      var swithc_list=e.switch_list;
-      var sw_arr=JSON.parse(swithc_list);
-      //---如果后台又开等级卡的开关---
-      if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){
-        th.setData({rank_switch:true});
-        //---回调卡的列表---
-        th.getPlusCardType(function(ob){
-          th.setData({card_list:ob.card_list});
-          var ti = setInterval(function () {
-            var user = getApp().globalData.userInfo;
-            if (!user) return false;
-            clearInterval(ti);
-
-            if(user.card_field && user['card_expiredate']){
-              var str = user['card_expiredate'].replace(/-/g, '/');
-              var end = new Date(str);
-              end = Date.parse(end) / 1000;
-              var now = ut.gettimestamp();
-              //--- 判断是等级会员，且在有效期范围内 ---
-              if(user.card_field && now<end){
-                var card_name=ob.name_map.get(user.card_field);
-                if(card_name.length>6) card_name=card_name.substring(0,6);
-
-                var is_near_date=0;
-                if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
-                th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list,is_near_date:is_near_date});
-              }
-            }
-          }, 500)
-        })
-      }
-
+     
     },1);
     //获取用户设备信息，屏幕宽度
@@ -429,13 +303,11 @@ Page({
       var ee=JSON.parse(JSON.stringify(e));
       //--定时器推迟一下--
       setTimeout(function () {
-        if(th.data.data)  var g_distr_type=th.data.data.distr_type;
-        //--如果默认门店的配送方式不对，就不能被选择，这里不控制，如果不一样，就说明配送方式不对--
-        if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
-          //th.data.fir_def_store={}; //赋值空对象
-          //return false;
-		  //th.data.fir_def_store.is_no_dis=1;
-		  ee.is_no_dis=1;
+        if(!th.data.data) return false;
+        var ser_card=th.data.data;
+        //--如果默认门店不在等级卡的默认们店以内
+        if(ser_card.storageId!=null && ser_card.storageId!=""  &&  ser_card.storageId.indexOf(ee.keyid)==-1){
+		   ee.is_no_dis=1;
         }
         var appd=getApp().globalData;
@@ -454,7 +326,8 @@ Page({
                 def_pick_store: e,
                 sto_sele_name: e.pickup_name,
                 sto_sele_id: e.pickup_id,
-                sto_sele_distr: e.distr_type
+                sto_sele_distr: e.distr_type,
+				sto_sele_keyid:e.keyid,
               })
             }else{
               //要用接口是获取距离，js的计算不准
@@ -471,7 +344,8 @@ Page({
                       def_pick_store: e,
                       sto_sele_name: e.pickup_name,
                       sto_sele_id: e.pickup_id,
-                      sto_sele_distr: e.distr_type
+                      sto_sele_distr: e.distr_type,
+					  sto_sele_keyid:e.keyid,
                     })
                   }
@@ -491,7 +365,8 @@ Page({
                 def_pick_store: e,
                 sto_sele_name: e.pickup_name,
                 sto_sele_id: e.pickup_id,
-                sto_sele_distr: e.distr_type
+                sto_sele_distr: e.distr_type,
+				sto_sele_keyid:e.keyid,
               })
             }
           }
@@ -501,186 +376,21 @@ Page({
     });
   },
-
   //------------程序初始化入口-------------
-  async init(gid) {
-    var ee = this,
-        th = ee,
-        gallery = null,
-        is_collect = 0,
-        collect_id = 0,
-        categories3 = ee.data.categories3,
-        fir_com = null,
-        fir_quan = null,
-        mapurl = null,
-        mapurl_f_img = null;
-
-
-    //------图片滚动----------
-    await getApp().request.promiseGet("/api/weshop/goodsimages/page", {
-      data: {
-        store_id: os.stoid,
-        goods_id: gid,
-      },
-    }).then(res => {
-
-      var t = res;
-      var g = t.data.data.pageData;
-      if (g.length == 0) {
-        var ie = {
-          "image_url": o.imghost + "/public/images/default_goods_image_240.gif"
-        };
-        g.push(ie);
-        gallery = g;
-        return;
-      }
-      for (var i = 0; i < g.length; i++) {
-        if (g[i].image_url.indexOf(o.imghost) == -1)
-          g[i].image_url = o.imghost + g[i].image_url;
-      }
-      gallery = g;
-    })
-    //------是否收藏----------
-    await getApp().request.promiseGet("/api/weshop/goodscollect/page", {
-      data: {
-        store_id: os.stoid,
-        goods_id: gid,
-        user_id: oo.user_id,
-      }
-    }).then(res => {
-      var t = res;
-      var data = t.data.data.pageData;
-      if (data.length > 0) {
-        //ee.setData({ is_collect: 1, collect_id: data[0].collect_id, });
-        is_collect = 1;
-        collect_id = data[0].collect_id;
-      }
-    })
-
-    //------获取评价的统计数量----
-    await getApp().request.promiseGet("/api/weshop/comment/countlist/", {
-      data: {
-        store_id: os.stoid,
-        goods_id: gid
-      },
-      //failRollback: !0,
-
-    }).then(res => {
-      var t = res;
-      var g = t.data.data[0];
-      if (g != null && g != undefined) {
-        var allnum = g.c0 + g.c1 + g.c2 + g.c3 + g.c4 + g.c5;
-        var num2 = g.c4 + g.c5;
-        var num3 = g.c3;
-        var num4 = g.c0 + g.c1 + g.c2;
-
-        var dd = ee.data.categories3;
-        dd[0].num = allnum;
-        dd[1].num = g.cimg;
-        dd[2].num = num2;
-        dd[3].num = num3;
-        dd[4].num = num4;
-
-        categories3 = dd;
-      }
-    })
-
-    //----获取详情页的评价----
-    await getApp().request.promiseGet("/api/weshop/comment/pageComment", {
-      data: {
-        store_id: os.stoid,
-        goods_id: gid,
-        pageSize: 3,
-        parent_id: 0,
-        page:1,
-        is_show:1,
-      },
-    }).then(res => {
-      fir_com = res.data.data.pageData;
-    })
-
-    if (fir_com) {
-      for (var ind in fir_com) {
-        if (fir_com[ind].head_pic == "") fir_com[ind].head_pic = ee.data.iurl + "/miniapp/images/hui_hear_pic.png";
-        if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img);
-        if (fir_com[ind].weapp_img) fir_com[ind].weapp_img = JSON.parse(fir_com[ind].weapp_img);
-      }
-    }
-
-    if (th.data.is_closecoupon != 1) {
-      //----获取详情页的券的数量----
-      await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
-        data: {
-          store_id: os.stoid,
-          type: 1,
-          pageSize: 3,
-          page: 1,
-		  is_share:0,
-        },
-      }).then(res1 => {
-        fir_quan = res1.data.data.pageData;
-      })
-    }
-
-    //--------获取视频图片---------
-    // await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, {
-    //   1: 1
-    // }).then(res1 => {
-    //   if (res1.data.code == 0) {
-    //     mapurl = res1.data.data.video_url;
-    //     mapurl_f_img = res1.data.data.video_img;
-    //   }
-    // })
-
-    ee.setData({
-      gallery: gallery,
-      is_collect: is_collect,
-      collect_id: collect_id,
-      categories3: categories3,
-      fir_quan: fir_quan,
-      fir_comments: fir_com,
-      mapurl_f_img: mapurl_f_img,
-      mapurl: mapurl,
-    });
-
-  },
+  async init(gid) {},
   //---展示---
   onShow: function() {
-    var goods_list = null,th = this,that=this;
-
-    //优惠券要实时更新
-    getApp().getConfig2(function(e) {
-      var json_d = JSON.parse(e.switch_list);
-      th.setData({is_closecoupon: json_d.is_closecoupon})
-      th.setData({is_open_offline: json_d.is_pricing_open})
-    },1)
-
-
-    var ui = setInterval(function () {
-      goods_list = th.selectComponent("#goods_list");
-      if (goods_list) {
-        clearInterval(ui);
-        goods_list.init();
-        return false
-      }
-    }, 300)
-
+    var that=this;
     this.data.is_timer = 1;
-    var ee = this,
-        gid = this.data.gid,
-        i = getApp().request;
-
-    this.wait_for_store_config();
+    var ee = this,gid = this.data.gid, i = getApp().request;
+	this.wait_for_store_config();
     i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, {
       failRollback: !0,
       success: function(t) {
         if (t.data.code == 0) {
-					console.log('xx==><==', t.data.data);
-					// let data = {
-					// 	goods_name: t.data.data.serviceName,
-					// };
+								
 					that.setData({
 						'data.goods_name': t.data.data.serviceName,
 						'data.shop_price': t.data.data.money,
@@ -688,188 +398,28 @@ Page({
 						'data.serviceContent': t.data.data.serviceContent,
 						'data.image_url': t.data.data.imgUrl,
 						'data.goods_id': t.data.data.id,
-					});
-					// self.setData({
-					// 	details: t.data.data,
-					// 	data,
-					// });
-     //      if (t.data.data.is_on_sale != 1) {
-     //        wx.showModal({
-     //          title: '商品已经下架',
-     //          showCancel: !1,
-     //          complete: function() {
-     //            wx.navigateBack();
-     //          }
-     //        });
-     //      }
-
-     //      var timestamp = Date.parse(new Date());
-     //      timestamp = timestamp / 1000;
-     //      if (t.data.data.on_time > timestamp) {
-     //        wx.showModal({
-     //          title: '商品还未上架',
-     //          showCancel: !1,
-     //          complete: function() {
-     //            wx.navigateBack();
-     //          }
-     //        });
-     //      }
-
-     //      if (t.data.data.down_time > 0) {
-     //        if (t.data.data.down_time < timestamp) {
-     //          wx.showModal({
-     //            title: '商品已经到期下架',
-     //            showCancel: !1,
-     //            complete: function() {
-     //              wx.navigateBack();
-     //            }
-     //          });
-     //        }
-     //      }
-
-     //      ee.check_is_youhui(ee.data.gid);
-
-     //      t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
-     //      var txt = (t.data.data.shop_price / t.data.data.market_price * 10).toFixed(2).toString();
-
-
-					// if(txt != 0) {
-					// 	if(txt.indexOf('.') != -1) {
-					// 		var arrtxt = txt.split('.');
-					// 		if(arrtxt[1].length == 1 && arrtxt[1][0] == 0) {
-					// 			txt = txt.slice(0,-2);
-					// 		};
-
-					// 		if(arrtxt[1].length == 2 && arrtxt[1][1] == 0) {
-					// 			txt = txt.slice(0,-1);
-					// 		};
-					// 	};
-					// } else {
-					// 	txt = 0;
-					// }
+						'data.id': t.data.data.id,
+						'data.sales_sum': t.data.data.sales_sum,
+						'data.storageId':t.data.data.storageId
+					});		
+								
+					//-----商品详情---
+					if(!t.data.data.serviceContent) t.data.data.serviceContent="  ";
+					a.wxParse("content", "html", t.data.data.serviceContent, ee, 6);
+					e.wxParseAddFullImageUrl(ee, "content");
+														
+					//获取重表
+				    getApp().promiseGet("/api/weshop/serviceItem/list",{
+						data:{store_id:o.stoid,service_id:t.data.data.id}
+					}).then(res=>{
+						if(res.data.code==0){
+							var list=res.data.data;
+							that.setData({service_list:list})
+						}				
+					})	
-     //      t.data.data['disc'] = txt;
-
-     //      if (t.data.data.original_img.indexOf(o.imghost) == -1)
-     //        t.data.data.original_img = o.imghost + t.data.data.original_img;
-
-     //      if (t.data.data.goods_content == null) t.data.data.goods_content = "";
-
-     //      //-----商品详情---
-     //      if(!t.data.data.goods_content) t.data.data.goods_content="  ";
-     //      a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
-     //      e.wxParseAddFullImageUrl(ee, "content");
-
-     //      ee.setData({
-     //        data: t.data.data,
-     //        sele_g: t.data.data,
-     //        userInfo:getApp().globalData.userInfo
-     //      });
-
-
-     //      //获取统一条形码,普通商品和优惠促销的商品
-     //      if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2  || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5){
-     //        //默认门店要拿下门店库存
-     //        if(that.data.sales_rules==2 && that.data.is_newsales_rules){
-     //          //获取门店
-     //          ee.get_sto();
-     //          //--等待某个值只运行---,这里有可能因为导航的时间太久，而不能计算门店库存
-     //          getApp().waitfor2(that,"wait_for_user_store","fir_def_store",function(){
-     //            if(th.data.fir_def_store && th.data.fir_def_store.pickup_id ){
-     //              var lock=0,plist=null;
-     //              //先读取门店的lock,采用链式写法，少用await
-     //              getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-     //                data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000}
-     //              }).then(res=>{
-     //                if(res.data.code==0 && res.data.data.total>0){
-     //                  for(var i in res.data.data.pageData)
-     //                    lock+=res.data.data.pageData[i].outQty
-     //                }
-     //                //---通过接口获取门店的线下库存信息--
-     //                return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-     //                  data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}
-     //                })
-     //              }).then(res=>{
-     //                if(res.data.code==0 && res.data.data.total>0){
-     //                  plist=res.data.data.pageData[0];
-     //                }
-     //                if(plist && plist.CanOutQty-lock>0){
-     //                  that.data.fir_def_store.CanOutQty=plist.CanOutQty-lock;
-     //                }else{
-     //                  that.data.fir_def_store.CanOutQty=0;
-     //                }
-     //                //--给门店赋值线下库存--
-     //                th.setData({def_pick_store:that.data.fir_def_store});
-     //              })
-     //            }
-     //          })
-     //        }else{
-     //          //获取门店
-     //          ee.get_sto();
-     //        }
-
-     //        ee.get_sku(o.stoid, t.data.data.sku, gid);
-     //      }
-     //      else {
-     //        var gg = "", item = t.data.data;
-
-     //        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 != "") {
-     //          gg = item.goods_spec + item.goods_color;
-     //        } else {
-     //          gg = "规格1";
-     //        }
-     //        t.data.data.gg = gg;
-     //        var uu = [];
-     //        uu.push(t.data.data);
-     //        ee.setData({
-     //          sku_g: uu,
-     //        });
-     //      }
-     //      ee.data.g_buy_num = new Map();
-     //      ee.check_prom(gid, ee.data.data.prom_type, ee.data.data.prom_id);
-
-     //      var th = ee;
-     //      if (ee.data.cat_name == '') {
-     //        //过去国别，分类，品牌的名称
-     //        i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
-     //          success: function(t) {
-     //            var dd = t.data.data;
-     //            if (t.data.code == 0) {
-     //              th.setData({
-     //                cat_name: dd.name
-     //              });
-     //            }
-     //          }
-     //        });
-     //        //过去国别，分类，品牌的名称
-     //        i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
-     //          success: function(t) {
-     //            var dd = t.data.data;
-     //            if (t.data.code == 0) {
-     //              th.setData({
-     //                brand_name: dd.name
-     //              });
-     //            }
-     //          }
-     //        });
-     //        //过去国别，分类，品牌的名称
-     //        i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
-     //          success: function(t) {
-     //            var dd = t.data.data;
-     //            if (t.data.code == 0) {
-     //              th.setData({
-     //                nation_name: dd.name
-     //              });
-     //            }
-     //          }
-     //        });
-     //      }
+									
         } else {
 					wx.showModal({
@@ -883,6 +433,7 @@ Page({
 			}
     });
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
+	this.get_sto();
   },
   enterAddress: function() {
@@ -890,6 +441,7 @@ Page({
       url: "/pages/user/address_list/address_list?operate=selectAddress"
     });
   },
+  
   onUnload: function() {
 	  for(var i = 1; i < 100; i++) {
 	    clearInterval(i);
@@ -945,811 +497,102 @@ Page({
     this.setData({
       activeCategoryId: 1
     });
-
-    if (th.data.cat_name == '') {
-      //过去国别，分类，品牌的名称
-      i.get("/api/weshop/goodscategory/get/" + o.stoid + "/" + th.data.data.cat_id, {
-        success: function(t) {
-          var dd = t.data.data;
-          if (t.data.code == 0) {
-            th.setData({
-              cat_name: dd.name
-            });
-          }
-        }
-      });
-      //过去国别，分类，品牌的名称
-      i.get("/api/weshop/brand/get/" + o.stoid + "/" + th.data.data.brand_id, {
-        success: function(t) {
-          var dd = t.data.data;
-          if (t.data.code == 0) {
-            th.setData({
-              brand_name: dd.name
-            });
-          }
-        }
-      });
-      //过去国别，分类，品牌的名称
-      i.get("/api/weshop/nation/get/" + o.stoid + "/" + th.data.data.nation_id, {
-        success: function(t) {
-          var dd = t.data.data;
-          if (t.data.code == 0) {
-            th.setData({
-              nation_name: dd.name
-            });
-          }
-        }
-      });
-    }
-  },
-
-  //获取redis中的数量
-  async getactLen(func) {
-    var r_num = 0,
-        prom_type = this.data.prom_type,
-        prom_id = this.data.prom_id;
-    await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
-      1: 1
-    }).then(res => {
-      var em = res;
-      if (em.data.code == 0) {
-        r_num = em.data.data;
-      }
-    })
-    func(r_num);
   },
+ 
   //------------加入购物车--------------
   addCart: function(t) {
     var th = this;
     var ind = t.currentTarget.dataset.openSpecModal_ind;
+    var action= t.currentTarget.dataset.action;
     if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
-    th.setData({
+    
+	th.setData({
       open_ind_store: ind
     });
-    //如果是秒杀的话，要看redis够不够
-    if (this.data.prom_type == 1) {
-      this.getactLen(function(num) {
-        if (num < th.data.goodsInputNum) {
-          getApp().my_warnning("秒杀库存不足!", 0, th);
-          return false;
-        } else {
-          th.add_cart_func(t);
-        }
-      });
-    } else {
-      th.add_cart_func(t);
-    }
-  },
-  
-  
-  
-  //-- 加入购物的函数 --
-  add_cart_func_inte: function(t) {
-    var i = getApp().request;
-    if (oo.user_id == null) {
-      return s.my_warnning("还未登录！", 0, this);
-    }
-	if(!getApp().globalData.userInfo){
-		 return s.my_warnning("还未登录！", 0, this);
-	}
-		
-    var e = this,
-        th = e,
-        a = 0,
-        o = this.data.data;
-    a = o.goods_id;
-  
-    //----------添加到购物车时，要判断限购数量，--------
-    e.get_buy_num(o, function(ee) {
-      //---判断商品是否超出限购---
-      if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-        if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品限购'
-          });
-          return false;
-        }
-      }
-      //---判断商品是否超出活动限购---
-      if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
-        if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品活动限购'
-          });
-          return false;
-        }
-      }
-  
-      if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
-        this.setData({
-          sto_sele_name: ""
-        });
-      if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
-	    
-      //--------------此时操作的数据------------
-      var newd = {
-        goods_id: o.goods_id,
-        goods_num: th.data.goodsInputNum,
-        pick_id: th.data.sto_sele_id,
-        user_id: oo.user_id,
-        store_id: th.data.stoid,
-        goods_price: th.data.prom_price,
-		integral:th.data.prom_integral,
-        member_goods_price: o.shop_price,
-        goods_name: o.goods_name,
-        goods_sn: o.goods_sn,
-        sku: o.sku,
-      };	  
-  	
-      //---是不是从收藏夹出来的---
-      if(th.data.c_guide_id){
-        newd['guide_id'] = th.data.c_guide_id;
-        newd['guide_type']=2;
-        if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=3;
-      }else{
-        if(getApp().globalData.guide_id){
-          newd['guide_id'] = getApp().globalData.guide_id;
-          newd['guide_type']=0;
-          if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=1;
-        }
-      }
-  
-      //让商品带上房间号
-      //让商品带上房间号
-      if(th.data.sys_switch.is_skuroom_id==1){
-        if(th.data.data.goods_id==getApp().globalData.room_goods_id){
-          newd.room_id=getApp().globalData.room_id;
-        }
-      }else{
-        if(newd.goods_id==getApp().globalData.room_goods_id)  newd.room_id=getApp().globalData.room_id;
-      }
-  
-      //如果是积分够，is_integral_normal就要有积分购普通购买字段
-      if(o.prom_type==4){
-        newd.is_integral_normal=1;
-      }
-  
-        //-----如果是秒杀，团购，积分购,拼团-----
-        newd.prom_type = th.data.prom_type;
-        newd.prom_id = th.data.prom_id;  
-        if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-        if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-		
-  
-        th.add_cart_next(e,t,a,o,newd);  //立即购买下一步
-   
-	})
-  },
-  
-  //-- 加入购物的函数 --
-  add_cart_func: function(t) {
-    var i = getApp().request;
-    if (oo.user_id == null) {
-      return s.my_warnning("还未登录！", 0, this);
-    }
-	if(!getApp().globalData.userInfo){
-		 return s.my_warnning("还未登录！", 0, this);
+	if(action=="buy"){
+		//--------------此时操作的数据------------
+		var newd = {
+		  id: th.data.data.id,
+		  goods_num: th.data.goodsInputNum,
+		  pick_id: th.data.sto_sele_id,		
+		  keyid: th.data.sto_sele_keyid,		
+		};	  
+		newd['pick_name'] = th.data.sto_sele_name;		
+		newd['guide_id'] = getApp().globalData.guide_id;
+		newd['guide_type']=0;
+		
+		th.buyNow(newd);
 	}
-    var e = this,
-        th = e,
-        a = 0,
-        o = this.data.sele_g;
-    a = o.goods_id;
-
-    //----------添加到购物车时，要判断限购数量，--------
-    e.get_buy_num(o, function(ee) {
-      //---判断商品是否超出限购---
-      if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-        if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品限购'
-          });
-          return false;
-        }
-      }
-      //---判断商品是否超出活动限购---
-      if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
-        if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品活动限购'
-          });
-          return false;
-        }
-      }
-
-      if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
-        this.setData({
-          sto_sele_name: ""
-        });
-      if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
-
-      //--------------此时操作的数据------------
-      var newd = {
-        goods_id: o.goods_id,
-        goods_num: th.data.goodsInputNum,
-        pick_id: th.data.sto_sele_id,
-        user_id: oo.user_id,
-        store_id: th.data.stoid,
-        goods_price: o.shop_price,
-        member_goods_price: o.shop_price,
-        goods_name: o.goods_name,
-        goods_sn: o.goods_sn,
-        sku: o.sku,
-      };	  
-      //---是不是从收藏夹出来的---
-      if(th.data.c_guide_id){
-        newd['guide_id'] = th.data.c_guide_id;
-        newd['guide_type']=2;
-        if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=3;
-      }else{
-        if(getApp().globalData.guide_id){
-          newd['guide_id'] = getApp().globalData.guide_id;
-          newd['guide_type']=0;
-          if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=1;
-        }
-      }
-
-      //让商品带上房间号
-      //让商品带上房间号
-      if(th.data.sys_switch.is_skuroom_id==1){
-        if(th.data.data.goods_id==getApp().globalData.room_goods_id){
-          newd.room_id=getApp().globalData.room_id;
-        }
-      }else{
-        if(newd.goods_id==getApp().globalData.room_goods_id)  newd.room_id=getApp().globalData.room_id;
-      }
-
-      //如果是积分够，is_integral_normal就要有积分购普通购买字段
-      if(o.prom_type==4){
-        newd.is_integral_normal=1;
-      }
-	  
-	  //如果有线下取价
-	  if(o.offline_price){
-		  newd.offline_price=o.offline_price;
-		  newd.pricing_type=o.pricing_type;
-	  }
-	  
-      //-----如果是秒杀，团购，积分购,拼团-----
-      if (th.data.prom_type == 1) {
-        newd.goods_price = th.data.prom_price;
-        newd.member_goods_price = th.data.prom_price,
-            newd.prom_type = th.data.prom_type;
-        newd.prom_id = th.data.prom_id;
-
-        if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-        if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
+  },
+ 
+  //----------立即购买-----------
+  buyNow: function(e) {   
+	getApp().globalData.service_now=e;	
+	wx.redirectTo({
+	   url: "/packageA/pages/cart2_ser/cart2_ser",
+	});	
+  },
+  //----------增加购买数量-----------
+  addCartNum: function(t) {
+    this.checkCartNum(this.data.goodsInputNum + 1);
+  },
+  //----------减少购买数量-----------
+  subCartNum: function(t) {
+    this.checkCartNum(this.data.goodsInputNum - 1);
+  },
+  //----------输入框输入购买数量-----------
+  inputCartNum: function(t) {
+    this.checkCartNum(Number(t.detail.value));
+  },
-        th.add_cart_next(e,t,a,o,newd);  //加入购物车下一步
+  //------检查数量是不是超出限购------
+  checkCartNum: function(t) {
+	  if(t<=0) return false;
+      var th = this;
+	  th.setData({goodsInputNum:t})
+  },
-      }
-      else if ( th.data.prom_type == 0 || th.data.prom_type == 3 || th.data.prom_type == 2 || th.data.prom_type == 4 || th.data.prom_type == 5) {
-        newd.prom_type = 0;
-        newd.prom_id = 0;
-        //---如果是线下门店销售的时候---
-        if(th.data.sales_rules==2){
-          var pick=th.get_pick_from_list(th.data.sto_sele_id)
-          //---通过接口获取门店的线下库存信息--
-          getApp().request.get("/api/weshop/goods/getWareStorages",{
-            data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid},
-            success:function(res){
-              if(res.data.code==0){
-                if(res.data.data.pageData.length>0){
-                  var CanOutQty=res.data.data.pageData[0].CanOutQty;
-                  if(CanOutQty<e.data.goodsInputNum){
-                    return s.my_warnning("库存不足！", 0, th);
-                  }
-                  //在调一次接口,读取商品的预出库的数量，lock
-                  getApp().request.get("/api/weshop/order/ware/lock/page",{
-                    data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id,pageSize:1000},
-                    success:function(res_data){
-                      if(res_data.data.code==0 &&  res_data.data.data.total>0){
+  closeSpecModal: function() {	  
+    this.setData({
+      openSpecModal: !1,
+      openSpecModal_pt: !1
+    });
+  },
+  
+  openSpecModel: function(t) {
+	var th=this;
+    var open_store = t.currentTarget.dataset.ind;
+    this.setData({
+      store: 0,
+      choice_sort_store: 0,
+      sort_store: 0,
+      open_ind_store: open_store,
+    })
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/togoin/togoin',
+      })
+      return false;
+    }
-                        var lock=0;
-                        for(var i in res_data.data.data.pageData){
-                          lock+=res_data.data.data.pageData[i].outQty;
-                        }
+    var ind = t.currentTarget.dataset.ind;
+    this.setData({
+      openSpecModal: !0,
+      openSpecModal_ind: ind,
+    });
-                        if(CanOutQty<=lock){
-                          return s.my_warnning("库存不足！", 0, th);
-                        }
-                        th.add_cart_next(e,t,a,o,newd,CanOutQty-lock);
-                      }else{
-                        th.add_cart_next(e,t,a,o,newd,CanOutQty);
-                      }
-                    }
-                  })
-                }else{
-                  return s.my_warnning("库存不足！", 0, th);
-                }
-
-              }
-            }
-          })
-        }else{
-          if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-          if (o.store_count <e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
-          th.add_cart_next(e,t,a,o,newd);  //加入购物车下一步
-        }
-      }
-    })
-  },
-
-  //---加入购物车的最后一步---
-  add_cart_next(e,t,a,o,newd,CanOutQty){
-    var th=this,i=getApp().request;
-    //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
-    if(o.prom_type!=1 && ((o.prom_type!=6  && o.prom_type!=4) || th.data.is_normal)){
-      var conf=th.data.bconfig;
-      if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']){
-        var s_list=JSON.parse(conf.switch_list);
-        var now=ut.gettimestamp();
-		
-
-        var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
-        var end = new Date(str);
-        end = Date.parse(end) / 1000;
-
-        //--如果后台有开启等级价的功能，而且会员的等级没有过期的情况下--
-        if(parseInt(s_list.rank_switch)==2 && end>now){
-          var card_price=o[getApp().globalData.userInfo['card_field']];
-          //如果会员有等级价
-          if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
-              && getApp().globalData.userInfo['card_field']!="" && card_price>0){
-            newd.goods_price=card_price;
-            newd.member_goods_price=card_price;
-          }
-        }
-      }
-    }
-
-    //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
-    if ("add" == t.currentTarget.dataset.action) {
-
-      if(th.data.prom_goods){
-        newd.prom_type = 3;
-        newd.prom_id = th.data.prom_goods[0].prom_id;
-      }
-
-      //----先看会员在购物车中是否加入了该商品-----
-      i.get("/api/weshop/cart/page", {
-        data: {
-          store_id: e.data.stoid,
-          user_id: oo.user_id,
-          goods_id: a,
-          pick_id: e.data.sto_sele_id,
-        },
-        success: function(re) {
-
-          //-------如果购物车中有相关的数据---------
-          if (re.data.data.total > 0) {
-
-            var item = re.data.data.pageData[0];
-
-            //判断数量，要看下购物车中有没有该商品
-            if(CanOutQty){
-              if(item.goods_num+ th.data.goodsInputNum>CanOutQty){
-                return s.my_warnning("库存不足！", 0, th);
-              }
-            }else{
-              if(item.goods_num+ th.data.goodsInputNum>o.store_count){
-                return s.my_warnning("库存不足！", 0, th);
-              }
-            }
-
-            var updata = {
-              id: item.id,
-              goods_num: e.data.goodsInputNum + item.goods_num,
-              goods_price: newd.goods_price,
-              member_goods_price:newd.goods_price,
-              store_id: th.data.stoid,
-            };
-
-            //---是不是从收藏夹出来的---
-            if(th.data.c_guide_id){
-              updata['guide_id'] = th.data.c_guide_id;
-              updata['guide_type']=3;   //加入购物车之后就变成了3
-            }else {
-              if (getApp().globalData.guide_id) {
-                updata['guide_id'] = getApp().globalData.guide_id;
-                updata['guide_type'] = 0;
-              }
-            }
-
-            i.put("/api/weshop/cart/update", {
-              data: updata,
-              success: function(t) {
-                getApp().my_warnning('加入购物车成功', 1, th, 450);
-                var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
-                th.setData({
-                  cartGoodsNum: c_num
-                });
-                th.closeSpecModal();
-              }
-            });
-          } else {
-
-
-            i.post("/api/weshop/cart/save", {
-              data: newd,
-              success: function(t) {
-                getApp().my_warnning('加入购物车成功', 1, th, 450);
-                var c_num = th.data.cartGoodsNum + e.data.goodsInputNum;
-                th.setData({
-                  cartGoodsNum: c_num
-                });
-                th.closeSpecModal();
-              }
-            });
-          }
-        }
-      });
-    }
-    //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d);
-    else {
-
-      if(th.data.prom_goods){
-        var prom_d=th.data.prom_goods;
-        for(var  i in prom_d){
-          //判断活动有俩种条件，0元 1件
-          var condition_t=prom_d[i].prom_type;
-          switch(condition_t) {
-            case 0: //按钱
-              if(newd.goods_price>=condition_t){
-                newd.prom_type = 3;
-                newd.prom_id = prom_d[i].prom_id;
-              }
-              break
-            case 1://按购买数量
-              if(newd.goods_num>=condition_t){
-                newd.prom_type = 3;
-                newd.prom_id = prom_d[i].prom_id;
-              }
-              break;
-          }
-        }
-
-      }
-
-      newd['pick_name'] = th.data.sto_sele_name;
-      newd['pick_dis'] = th.data.sto_sele_distr;
-      th.buyNow(newd);
-    }
-  },
-
-
-  //----------购买虚拟商品------
-  buyVirtualGoods: function(e) {
-    Object.assign(e, {
-      goods_name: this.data.data.goods.goods_name,
-      spec_name: this.data.select.specName,
-      price: this.data.select.price
-    }), wx.navigateTo({
-      url: "/pages/virtual/buy_step/buy_step?" + t.Obj2Str(e)
-    });
-  },
-  //----------积分兑换---------
-  exchange: function(e) {
-    this.data.shippingCost < 0 || this.data.select.stock <= 0 || wx.navigateTo({
-      url: "/pages/cart/integral/integral?" + t.Obj2Str(e)
-    });
-  },
-  
- 
-  //----------立即购买-----------
-  buyNow: function(e) {
-    // this.data.shippingCost < 0 || this.data.select.stock <= 0 || (Object.assign(e, {
-    //     action: "buy_now"
-    // }),
-    s.set_b_now(e);	
-	if(e.prom_type==4){
-		var url="/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id;
-		getApp().goto(url);   
-	}else{
-		wx.redirectTo({
-		  url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
-		});
-	}  
-  },
-
-  //----------增加购买数量-----------
-  addCartNum: function(t) {
-    this.checkCartNum(this.data.goodsInputNum + 1);
-  },
-  //----------减少购买数量-----------
-  subCartNum: function(t) {
-    this.checkCartNum(this.data.goodsInputNum - 1);
-  },
-  //----------输入框输入购买数量-----------
-  inputCartNum: function(t) {
-    this.checkCartNum(Number(t.detail.value));
-  },
-  
-  //----------增加购买数量-----------
-  addCartNum_inte: function(t) {
-    this.checkCartNum_inte(this.data.goodsInputNum + 1);
-  },
-  //----------减少购买数量-----------
-  subCartNum_inte: function(t) {
-    this.checkCartNum_inte(this.data.goodsInputNum - 1);
-  },
-  //----------输入框输入购买数量-----------
-  inputCartNum_inte: function(t) {
-    this.checkCartNum_inte(Number(t.detail.value));
-  },
-  
-
-  //------检查数量是不是超出限购------
-  checkCartNum: function(t) {
-    var th = this;
-		this.data.sele_g = this.data.data;
-		this.get_buy_num(this.data.sele_g, async function() {
-    // this.get_buy_num(this.data.sele_g, async function() {
-
-      //--判断商品是否超出限购--
-      if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-
-        var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);
-
-        if (t + gd_buy_num > th.data.sele_g.viplimited) {
-          wx.showModal({
-            title: '超出商品限购',
-          });
-
-          var num= th.data.sele_g.viplimited-gd_buy_num;
-          if(num<0) num=0;
-          th.setData({goodsInputNum:num})
-          return false;
-        }
-      }
-
-      //--判断商品是否超出活动限购--
-      if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && !th.data.is_normal) {
-        if (t + th.data.prom_buy_num > th.data.prom_buy_limit) {
-          wx.showModal({
-            title: '超出商品活动限购',
-          });
-
-          var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
-          if(num<0) num=0;
-          th.setData({goodsInputNum:num})
-          return false;
-        }
-      }
-
-      if (th.data.sele_g.prom_type == 1 || th.data.sele_g.prom_type == 6) {
-        var redis_num = 0;
-        //------判断活动是否抢光-----
-        await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-            os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
-          1: 1
-        }).then(res => {
-          redis_num = res.data.data;
-        });
-
-        if (t > redis_num) {
-          wx.showModal({
-            title: '超出商品活动库存',
-          });
-          th.setData({goodsInputNum:redis_num})
-          return false;
-        }
-
-      }
-
-      var e = th.data.sele_g.store_count;
-      if(th.data.sales_rules==2){
-        if(!th.data.def_pick_store){
-          wx.showModal({ title: '请选择门店', });
-          return false;
-        }else{
-          e=th.data.def_pick_store.CanOutQty;
-        }
-      }
-
-      //库存不足，不增加
-      if(e<t){ wx.showModal({ title: '库存不足', });
-        if(e<0) e=0;
-        th.setData({ goodsInputNum: e });   return false;
-      }
-      t > e || 0 == e ? t = e : t < 1 && (t = 1);
-      th.setData({ goodsInputNum: t });
-	  th.is_show_more_buy();
-
-    })
-  },
-
-  //----- 检查一下积分购的限购之类的问题 -----
-  checkCartNum_inte: function(t) {
-    var th = this;
-    this.get_buy_num(this.data.data, async function() {
-  
-      //--判断商品是否超出限购--
-      if (th.data.g_buy_num != null && th.data.data.viplimited > 0) {
-  
-        var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);
-  
-        if (t + gd_buy_num > th.data.sele_g.viplimited) {
-          wx.showModal({
-            title: '超出商品限购',
-          });
-  
-          var num= th.data.sele_g.viplimited-gd_buy_num;
-          if(num<0) num=0;
-          th.setData({goodsInputNum:num})
-          return false;
-        }
-      }
-  
-      //--判断商品是否超出活动限购--
-      if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) {
-        if (t + th.data.prom_buy_num > th.data.prom_buy_limit) {
-          wx.showModal({
-            title: '超出商品活动限购',
-          });
-  
-          var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
-          if(num<0) num=0;
-          th.setData({goodsInputNum:num})
-          return false;
-        }
-      }
-  
-      if (th.data.sele_g.prom_type == 1 || th.data.sele_g.prom_type == 6) {
-        var redis_num = 0;
-        //------判断活动是否抢光-----
-        await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-            os.stoid + "/" + th.data.sele_g.prom_type + "/" + th.data.sele_g.prom_id, {
-          1: 1
-        }).then(res => {
-          redis_num = res.data.data;
-        });
-  
-        if (t > redis_num) {
-          wx.showModal({
-            title: '超出商品活动库存',
-          });
-          th.setData({goodsInputNum:redis_num})
-          return false;
-        }
-  
-      }
-  
-      var e = th.data.sele_g.store_count;
-      if(th.data.sales_rules==2){
-        if(!th.data.def_pick_store){
-          wx.showModal({ title: '请选择门店', });
-          return false;
-        }else{
-          e=th.data.def_pick_store.CanOutQty;
-        }
-      }
-  
-      //库存不足，不增加
-      if(e<t){ wx.showModal({ title: '库存不足', });
-        if(e<0) e=0;
-        th.setData({ goodsInputNum: e });   return false;
-      }
-      t > e || 0 == e ? t = e : t < 1 && (t = 1);
-      th.setData({ goodsInputNum: t }); 
-    })
-  },
-
-
-  closeSpecModal: function() {	  
-	if(this.data.openSpecModal_pt && this.data.is_normal){
-		this.get_sto();
-	}  
-	  
-    this.setData({
-      openSpecModal: !1,
-      openSpecModal_pt: !1
-    });
-  },
-  
-  openSpecModel: function(t) {
-		var th=this;
-    var open_store = t.currentTarget.dataset.ind;
-    this.setData({
-      store: 0,
-      choice_sort_store: 0,
-      sort_store: 0,
-      open_ind_store: open_store,
-    })
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/togoin/togoin',
-      })
-      return false;
-    }
-
-    var ind = t.currentTarget.dataset.ind;
-    this.setData({
-      openSpecModal: !0,
-      openSpecModal_ind: ind,
-    });
-	
-	var is_open=th.data.config
-	
-	
-	this.get_off_price();
-
-  },
-  
-  //----获取线下价格-------
-  get_off_price(){
-	  var th=this;
-	  //没有开启就返回
-	  if(!th.data.is_open_offline) return false;
-	  //先看下购买的功能有没有到期
-	  getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=6",{}).then(res=>{
-		  //未购买
-		  if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){
-			 return false;  
-		  }else{
-			  //已经过期
-			  var item=res.data.data.pageData[0];
-			  if(item.end_time<ut.gettimestamp()){
-			  			   return false;  
-			  }
-		  }
-		  
-		  	  
-		  var cur_goods=this.data.sele_g;
-		  var cur_price=cur_goods.shop_price;
-		  if(th.data.card_field && cur_goods[th.data.card_field]>0){
-			  cur_price=cur_goods[th.data.card_field];
-		  }
-		  
-		  var user_info = getApp().globalData.userInfo;
-		  //获取一下接口，判断是不是有线下接口,必须是普通商品，全局优惠活动也是不行
-		  if(cur_goods.prom_type==0 && !this.data.prom_goods){
-		  		 cur_goods.offline_price=null;
-		  	 //如果没有门店，不用计算线下价格
-		  	 var def_pick_store=this.data.def_pick_store;		
-		  	 if(!def_pick_store) return false;	
-		  	 getApp().request.get("/api/weshop/goods/listWarePrice", {
-		            data:{VIPId:encodeURIComponent(user_info.erpvipid),
-		  		        store_id:os.stoid,
-		                PickupId:def_pick_store.pickup_id,
-		  				WareIds:encodeURIComponent(cur_goods.erpwareid)},
-		  		  success:function(res){
-		  			  if(res.data.code==0 && res.data.data && res.data.data.length>0){
-		  				  var datalist=res.data.data;
-		  				  if(datalist[0].WarePrice<cur_price){
-		  					   cur_goods.offline_price=datalist[0].WarePrice;  //存储线下活动的价格
-		  					   cur_goods.pricing_type=datalist[0].PriceType;   //存储线下活动的类型
-		  					  }
-		  			  }
-		  				  th.setData({sele_g:cur_goods});	
-		  		  }
-		  		 
-		  	 })
-		  }
-		   
-	  })
-	  
-		 
   },
- 
   //---------点击收藏和不收藏------------
   collectGoods: function() {
-    var t = this,
-        i = getApp().request;
+    var t = this,i = getApp().request;
     var user_id = s.globalData.user_id;
     if (user_id == '') {
       getApp().getUserFir(function() {});
@@ -1845,56 +688,10 @@ Page({
       }
     });
   },
-
-  previewCommentImgs: function(t) {
-    var e = this.data.comments[t.currentTarget.dataset.cidx].img;
-    var b = e.slice()
-    for(var i in b){
-      b[i] = this.data.iurl + e[i];
-    }
-
-    wx.previewImage({
-      current: b[t.currentTarget.dataset.id],
-      urls: b
-    });
-  },
-
-  previewCommentImgs_w: function(t) {
-    var e = this.data.comments[t.currentTarget.dataset.cidx].weapp_img;
-    var b = e.slice()
-    for (var i in b) {
-      b[i] = this.data.iurl + e[i];
-    }
-    wx.previewImage({
-      current: b[t.currentTarget.dataset.id],
-      urls: b
-    });
-  },
-
-  previewGoodsCommentImgs: function(t) {
-    var e = this,
-        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
-    });
-  },
-  closePromModal: function() {
-    this.setData({
-      openPromModal: !1
-    });
-  },
-  openPromModal: function() {
-    this.setData({
-      openPromModal: !0
-    });
-  },
-
+  
   //--点击分享事件---
   onShareAppMessage: function(t) {
-		
+	
     var th = this;
     var price = th.data.data.shop_price;
     if (th.data.prom_act) {
@@ -1968,308 +765,90 @@ Page({
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
   },
-  //----------装载同一条形码的商品----------
-  async get_sku(stoid, sku, g_id, is_normal, func) {
-    var tt = this,arrdata=null;
-    var now=ut.gettimestamp();
-
-    await getApp().request.promiseGet("/api/weshop/goods/page", {
-      data: {
-        store_id: o.stoid,
-        sku: sku,
-        isonsale: 1,
-        is_on_sale: 1,
-		pageSize:500
+ 
+  //---------拿出门店分类和门店------------
+  get_sto(e) {
+    var th = this,that=this;
+    var timer_get = setInterval(function() {
+      if (th.data.is_get_local_ok == 0) return false;
+      var i = getApp().request;
+	  if (!th.data.data) return false;	      
+      var dd= {
+          store_id: o.stoid,
+          isstop: 0,
+          pageSize: 2000
+      }  
+      //如果有距离的话
+      if (th.data.lat != null) {
+        dd.lat = th.data.lat;
+        dd.lon = th.data.lon;
       }
-    }).then(res => {
-      var e = res;
-      if (e.data.code == 0) arrdata = e.data.data.pageData;
-    })
-    if(!arrdata) return fasle;
+      clearInterval(timer_get);
+	  
+	  //如果会员是有默认的门店话
+	  if(!th.data.def_pick_store && th.data.fir_def_store){
+		  th.setData({def_pick_store:th.data.fir_def_store});
+	  }
+	  
+	  wx.showLoading({
+		  title:'加载中.'
+	  });
+      //----------获取门店----------------
+      getApp().request.promiseGet("/api/weshop/pickup/list", {
+        data: dd,
+      }).then(res => {
+        var e = res;	 
+        if (e.data.code == 0) {		
+			//--普通门店排版--
+			setTimeout(function(){			
+			  var sto_list=th.data.data.storageId;
+			  if(sto_list){
+					 for (var k = 0; k < e.data.data.pageData.length; k++) {
+					   var it=e.data.data.pageData[k];	 
+					   if (sto_list.indexOf(it.keyid)==-1) {
+						  //删除
+						  e.data.data.pageData.splice(k--, 1);
+					   }
+					 }		 
+			  }
-    var arrsku = new Array();
-    var gitem = null;
-    var gb = 1,gg = "";
-    for (var i = 0; i < arrdata.length; i++) {
-      var goodsinfo=arrdata[i],prom=null;
-      if (goodsinfo.goods_id != g_id) {
-        if(goodsinfo.prom_type==1){
-          await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-          }).then(res=>{
-            if(res.data.code==0) prom=res.data.data;
-          })
-        }
-        if(goodsinfo.prom_type==6){
-          await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-          }).then(res=>{
-            if(res.data.code==0) prom=res.data.data;
-          })
-        }
-      }
-      //---如果有活动，不算在一起---
-      if(prom){
-        if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){
-          continue;
-        }
-      }
-
-      var item = arrdata[i],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 != "") {
-        gg = item.goods_spec + item.goods_color;
-      } else {
-        gg = "规格" + gb;
-        gb++;
-      }
-      item.gg = gg;
-
-      if(item.spec_img)
-        item.original_img=os.imghost+item.spec_img;
-      else
-        item.original_img=os.imghost+item.original_img;
-
-
-      if (item.goods_id == g_id) {
-        gitem = item;
-      } else {
-        arrsku.push(item);
-      }
-    }
-    //-----------排列在最前面-------------
-    arrsku.splice(0, 0, gitem);
-    if (is_normal == 1) {
-      tt.setData({
-        sku_g_pt: arrsku,
-        sele_g: gitem
-      });
-      func();
-    } else {
-      tt.setData({
-        sku_g: arrsku,
-        sele_g: gitem
-      });
-    }
-  },
-
-  //-----------选择属性的按钮事件----------
-  sele_spec: function(e) {
-    var that=this,ee=this,th=this;
-    var gid = e.currentTarget.dataset.gid;
-    var sku_g = this.data.sku_g;
-    var item = null;
-    for (var i in sku_g) {
-      if (sku_g[i].goods_id == gid) {
-        item = sku_g[i];
-        break
-      }
-    }
-    if (item) this.setData({
-      sele_g: item,
-      gid: gid
-    });
-
-    that.check_is_youhui(gid)
-
-    var ty=0;
-	
-    this.get_sto();
-	
-	
-    //默认门店要拿下门店库存
-    if(that.data.sales_rules==2 && that.data.def_pick_store){
-      var lock=0,plist=null;
-      //先读取门店的lock,采用链式写法，少用await
-      getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-        data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000}
-      }).then(res=>{
-        if(res.data.code==0 && res.data.data.total>0){
-          for(var i in res.data.data.pageData)
-            lock+=res.data.data.pageData[i].outQty
-        }
-        //---通过接口获取门店的线下库存信息--
-        return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-          data:{storageNos:that.data.def_pick_store.pickup_no,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}
-        })
-      }).then(res=>{
-        if(res.data.code==0 && res.data.data.total>0){
-          plist=res.data.data.pageData[0];
-        }
-        if(plist && plist.CanOutQty-lock>0){
-          that.data.def_pick_store.CanOutQty=plist.CanOutQty-lock;
-        }else{
-          that.data.def_pick_store.CanOutQty=0;
-        }
-        //--给门店赋值线下库存--
-        th.setData({def_pick_store:that.data.def_pick_store});
-      })
-    }
-
-
-    this.sele_spec_chech_activity();
-  },
-
-  //选择了不同的规格的时候要判断是不是有活动正在进行中
-  async sele_spec_chech_activity(){
-    //---如果是活动的时候---
-    var prom=null,goodsinfo=this.data.sele_g,th=this;
-    if(goodsinfo.prom_type==1){
-      await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-      }).then(res=>{
-        if(res.data.code==0){
-          prom=res.data.data;
-        }
-      })
-    }
-    if(goodsinfo.prom_type==6){
-      await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{
-      }).then(res=>{
-        if(res.data.code==0){
-          prom=res.data.data;
-        }
-      })
-    }
-    //----------如果有活动，并且在进行中，就不计算线下库存---------------
-    var now=ut.gettimestamp();
-    if(prom){
-      if(prom.is_end==0 && prom.end_time>now && prom.start_time<now){
-        th.setData({
-          prom_type:goodsinfo.prom_type,
-          prom_price:prom.price,
-          prom_buy_limit:prom.buy_limit,
-          prom_end_time:prom.end_time,
-          prom_start_time:prom.start_time,
-          prom_st:1,
-        })
-        return false;
-      }
-    }
-    //---设置普通商品---
-    th.setData({
-      prom_type:0,
-      prom_price:null,
-      prom_buy_limit:null,
-      prom_end_time:null,
-      prom_start_time:null,
-      prom_st:null,
-    })
-
-  },
-
-
-  //---------拿出门店分类和门店------------
-  get_sto(e) {
-    var th = this,that=this;
-	var is_normal=e;	
-	
-	if(e==1){
-		th.setData({is_normal:1})
-	}else{
-		th.setData({is_normal:0})
-	}
-	
-    var timer_get = setInterval(function() {
-      if (th.data.is_get_local_ok == 0) return false;
-      var dd = null,i = getApp().request;
-	  if (!th.data.sele_g) return false;	  
-		  
-      var g_distr_type = th.data.sele_g.distr_type;
-      if (g_distr_type != 0) {
-        dd = {
-          store_id: o.stoid,
-          distr_type: g_distr_type,
-          isstop: 0,
-          pageSize: 2000
-        }
-      } else {
-        dd = {
-          store_id: o.stoid,
-          isstop: 0,
-          pageSize: 2000
-        }
-      }
-      //如果有距离的话
-      if (th.data.lat != null) {
-        dd.lat = th.data.lat;
-        dd.lon = th.data.lon;
-      }
-      clearInterval(timer_get);
-	  
-	  //如果会员是有默认的门店话
-	  if(!th.data.def_pick_store && th.data.fir_def_store){
-		  th.setData({def_pick_store:th.data.fir_def_store});
-	  }
-	  
-	  /*--最新的，不用这里筛选配送方式
-      if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
-        th.setData({def_pick_store:null});
-      }--*/
-	  
-	 
-	  wx.showLoading({
-		  title:'加载中.'
-	  });
-      //----------获取门店----------------
-      getApp().request.promiseGet("/api/weshop/pickup/list", {
-        data: dd,
-      }).then(res => {
-        var e = res;
-		 
-        if (e.data.code == 0) {
-
-          //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
-          if(dd.lat && (!th.data.def_pick_store ||  JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){
-            th.setData({
-              def_pick_store:e.data.data.pageData[0],
-              sto_sele_name: e.data.data.pageData[0].pickup_name,
-              sto_sele_id: e.data.data.pageData[0].pickup_id,
-              sto_sele_distr: e.data.data.pageData[0].distr_type
-            });
-            th.data.fir_def_store=e.data.data.pageData[0];
-          }
-
-          //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
-          if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
-            for (var k = 0; k < e.data.data.pageData.length; k++) {
-              if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
-                e.data.data.pageData.splice(k, 1); //删除
-                break;
-              }
-            }
-            e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
-          }
-
-
-          th.setData({all_pick_list:e.data.data.pageData});
+			  //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店
+			  if(dd.lat && (!th.data.def_pick_store ||  JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){
+				th.setData({
+				  def_pick_store:e.data.data.pageData[0],
+				  sto_sele_name: e.data.data.pageData[0].pickup_name,
+				  sto_sele_id: e.data.data.pageData[0].pickup_id,
+				  sto_sele_distr: e.data.data.pageData[0].distr_type
+				});
+				th.data.fir_def_store=e.data.data.pageData[0];
+			  }
-          //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
-          if(th.data.sales_rules==2 && !th.data.is_newsales_rules && ((th.data.prom_type!=1 && th.data.prom_type!=6  && th.data.prom_type!=4) || is_normal==1)){
-            setTimeout(function(){
-              th.deal_pickup_dline(e);
-            },800)
-          }else{
-            setTimeout(function(){
-              th.deal_pickup(e);  //--普通门店排版--
-            },800)
-          }
+			  //-- 如果有默认选择门店的时候，要把默认门店放在第一位，修改不要配送方式的判断 --
+			  if (th.data.def_pick_store && JSON.stringify(th.data.def_pick_store)!='{}'){
+				for (var k = 0; k < e.data.data.pageData.length; k++) {
+				  if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
+					e.data.data.pageData.splice(k, 1); //删除
+					break;
+				  }
+				}
+				e.data.data.pageData.splice(0, 0, th.data.def_pick_store); //添加
+			  }
+						  	  
+			  th.setData({all_pick_list:e.data.data.pageData});		  
+		      th.deal_pickup(e);  
+		    },800)
+          
         }
       })
     }, 200)
-
   },
   //------------处理门店---------------
   deal_pickup(e){
     var th=this;
-	if(!th.data.sele_g) return false
-	
-    var g_distr_type=th.data.sele_g.distr_type;
+	if(!th.data.data) return false
 	wx.hideLoading(); 
-
     //单总量超出5个的时候
     if (e.data.data.total > 5) {
       getApp().request.get("/api/weshop/storagecategory/page", {
@@ -2288,8 +867,8 @@ Page({
               var ishas = 0;
               //-- 开始就看5个门店 --
               for (var k = 0; k < 5; k++) {
-                if (k == e.data.data.pageData.length) break;
-                def_arr.push(e.data.data.pageData[k]);
+                 if (k == e.data.data.pageData.length) break;
+                  def_arr.push(e.data.data.pageData[k]);
               }
               th.setData({
@@ -2368,7 +947,6 @@ Page({
 			  if(newarr.length>0)
 			      newarr.sort(compare("sort"));
-
               //----安排其他的分类-----
               if (qita.length > 0) {
                 var item = {
@@ -2381,1394 +959,66 @@ Page({
               th.setData({
                 is_show_sto_cat: 1,
-                all_sto: newarr
-              });
-
-            } else {
-              th.setData({
-                is_show_sto_cat: -1,
-                only_pk: e.data.data.pageData
-              });
-              //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
-              if (!th.data.def_pick_store) {
-                th.setData({def_pick_store:e.data.data.pageData[0]})
-              }
-            }
-          } else {
-            th.setData({
-              is_show_sto_cat: -1,
-              only_pk: e.data.data.pageData
-            });
-            //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
-            if (!th.data.def_pick_store) {
-              th.setData({def_pick_store:e.data.data.pageData[0]})
-            }
-
-          }
-        }
-      });
-    } else {	
-      th.setData({
-        is_show_sto_cat: 0,
-        only_pk: e.data.data.pageData
-      });
-      //-----如果没有默认门店，要取第一个门店作为默认店------
-      if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) {
-        th.setData({
-          def_pick_store:e.data.data.pageData[0],
-          sto_sele_name: e.data.data.pageData[0].pickup_name,
-          sto_sele_id: e.data.data.pageData[0].pickup_id,
-          sto_sele_distr: e.data.data.pageData[0].distr_type
-        })
-      }
-    }
-  },
-  
-  //------------处理线下门店库存--------
-  deal_pickup_dline(e){
-    var pkno=[],th=this;
-	if(!th.data.sele_g) return false;
-	
-    if(this.data.def_pick_store){
-      pkno.push(this.data.def_pick_store.pickup_no);
-    }
-    for(var i in e.data.data.pageData){
-      var item=e.data.data.pageData[i];
-      if(pkno.indexOf(item.pickup_no)<0)
-        pkno.push(item.pickup_no);
-    }
-    var pkno_str=pkno.join(",");
-    var o_plist=e.data.data.pageData;
-    var new_list=[];
-    var is_find_def_store=0;
-
-
-    var g_distr_type=th.data.sele_g.distr_type;
-    var lock=[];
-    //先读取门店的lock,采用链式写法，少用await
-    getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-      data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000}
-    }).then(res=>{
-      if(res.data.code==0 && res.data.data.total>0){
-        lock=res.data.data.pageData
-      }
-      //---通过接口获取门店的线下库存信息--
-      return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-        data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid,pageSize:2000}
-      })
-    }).then(res=>{
-
-      wx.hideLoading(); 
-      if(res.data.code==0){
-        if(res.data.data.pageData && res.data.data.pageData.length>0){
-          var plist=res.data.data.pageData;
-          var def_pick_store=th.data.def_pick_store;
-          //以原来的数组为外循环，保证距离的顺序
-          for(var kk in o_plist){
-            for(var ii in plist){
-              //线下的门店小心
-              var n_item=plist[ii];
-              if(n_item.StorageNo==o_plist[kk].pickup_no){
-
-                //拿到锁库的数量
-                var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock);
-                //可出库数大于预出库库存的数量，可以判断为有库存
-                if(n_item.CanOutQty>lock_num){
-                  o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;
-                  new_list.push(o_plist[kk]);
-                  //--如果找到默认门店,同时也应该判断配送方式对不对--
-                  if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no  &&  (g_distr_type==0 ||  th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
-                    th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num;
-                    if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id)
-                      th.setData({def_pick_store:th.data.fir_def_store})
-                    is_find_def_store=1;
-                  }
-                }
-                break;
-              }
-            }
-          }
-
-          //数据组装下
-          var em={};em.data={};em.data.data={};
-          em.data.data.total=new_list.length;
-          em.data.data.pageData=new_list;
-
-          //--如果找到默认门店,同时也应该判断配送方式对不对--
-          if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id  &&  (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
-            th.data.fir_def_store.CanOutQty=0;
-            //--当选择的门店是客户默认的门店的时候--
-            if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
-              th.setData({def_pick_store:th.data.fir_def_store});
-              em.data.data.pageData.unshift(th.data.def_pick_store);
-            }else{
-              em.data.data.pageData.splice(1,0,th.data.fir_def_store);
-            }
-          }
-
-          //---把数组组装进去---
-          th.deal_pickup(em);
-        }else{
-          th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
-        }
-      }else{
-        th.setData({def_pick_store:null,all_sto:null,only_pk:null,def_pickpu_list:null})
-      }
-    })
-  },
-
-  find_lock_num(pick_id,lock){
-    var lock_num=0;
-    if(!lock) return 0;
-    if(lock.length<0) return 0;
-    for(var i in lock){
-      if(pick_id==lock[i].pickupId){
-        lock_num+=lock[i].outQty;
-      }
-    }
-    return lock_num;
-  },
-
-  //----------取货门店被点击的效果------
-  getmendian: function(t) {
-    this.setData({
-      ismend: 1,
-    });
-  },
-
-  //----------隐藏取货门店，选取门店----------
-  hidemend: function(e) {
-    var pid = e.target.dataset.p_id;
-    var pname = e.target.dataset.p_name;
-    var p_distr_t = e.target.dataset.p_dis;
-    this.setData({
-      ismend: 0,
-      is_sec_mend: 0,
-      sto_sele_id: pid,
-      sto_sele_name: pname,
-      sto_sele_distr: p_distr_t
-    });
-  },
-
-  //------显示取货2级----------
-  show_sec: function(t) {
-    var index = t.target.dataset.index;
-    var item = this.data.all_sto[index];
-    this.setData({
-      is_sec_mend: 1,
-      sec_sto: item
-    });
-  },
-
-  //------隐藏取货门店2级----
-  hide_sec_mend: function() {
-    this.setData({
-      is_sec_mend: 0,
-    });
-  },
-
-  //评论的调用
-  requestComments_new: async function(){
-    var e = this, th = e,ee=e; var tp = e.data.activeCategoryId3;
-    var t = '/api/weshop/comment/pageComment?page=' + e.data.c_curr_p;
-
-    wx.showLoading();
-    var req_where = {
-      store_id: o.stoid, pageSize: 5,is_show:1,
-      parent_id: 0, goods_id: th.data.gid, commenttype: tp,
-    }
-    if (getApp().globalData.userInfo) {
-      req_where.userId = getApp().globalData.userInfo.user_id;
-    }
-
-    var rs_data=null;
-    await getApp().request.promiseGet(t,  { data: req_where}).then(res=>{
-      var tot = res.data.data.total;
-      e.data.c_curr_p++;
-      e.setData({
-        com_num: tot, //已经有加载
-      });
-      if (res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-        rs_data=res.data.data.pageData;
-      }else{
-        th.setData({comments_no_more:1,auto:1});
-      }
-    })
-
-    if (rs_data){
-      //var cda = th.data.comments;
-      var cda = rs_data,com_data=th.data.comments;
-      for (var ind in cda) {
-        var ep = cda[ind];
-        if (cda[ind].head_pic == '') {
-          cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png";
-        }
-        if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) {
-          cda[ind].weapp_img = JSON.parse(ep.weapp_img);
-        }
-        if (ep.img != "" && ut.isString(ep.img)) {
-          cda[ind].img = ut.unserialize(ep.img);
-        }
-
-        //--测量多有字的宽带，计算有多少行--
-        var widh=ut.measureText(ep.content,30);
-        var lines=widh/712;
-        cda[ind].seeMore=false;
-        if(lines>3) cda[ind].seeMore=true;
-
-        await getApp().request.promiseGet("/api/weshop/comment/pageComment", {
-          data: {store_id: o.stoid, parent_id: ep.comment_id }
-        }).then(res => {
-          if (res.data.data.pageData && res.data.data.pageData.length > 0) {
-            cda[ind].replay_list = res.data.data.pageData;
-          }
-        })
-      }
-
-      if (!com_data) com_data = cda;
-      else com_data = com_data.concat(cda);
-
-      th.setData({ comments: com_data});
-    }
-    th.setData({get_c: 1});
-    wx.hideLoading();
-  },
-
-  //加载更多是靠这个函数
-  onReachBottom: function() {
-    if (this.data.activeCategoryId == 2){
-      if(!this.data.comments_no_more)   this.requestComments_new();
-    }
-
-    var goods_list = this.selectComponent("#goods_list"); //组件的id
-    if (goods_list) goods_list.get_list();
-  },
-
-  //--------检查是否活动，活动是否开始，或者是否结束-------
-  async check_prom(gid, prom_type, prom_id) {
-    var ee = this,
-        th = ee;
-    if (prom_type == 3 || prom_type == 0 || prom_type == 2  || prom_type == 5) {
-      this.setData({
-        prom_type: 0,
-        isshow: 1,
-      });
-      return false;
-    }
-	
-	
-	
-     //if (prom_type != 3 && prom_type!=0){
-     //---判断秒杀----
-     if (prom_type == 1) {
-      //-------判断活动是否抢光---------
-      await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
-        1: 1
-      }).then(res => {
-        var em = res;
-        if (em.data.code == 0) {
-
-          if (em.data.data <= 0) ee.setData({
-            prom_r_null: 1
-          });
-          //拿取价格并且判断时间--
-          getApp().request.get("/api/ms/flash_sale/get/" +
-              os.stoid + "/" + prom_id, {
-            success: function(t) {
-              if (t.data.code != 0) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                return false;
-              }
-              //----已经结束-----
-              if (t.data.data.is_end == 1) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                ee.get_sto();
-                return false;
-              }
-              //----已经过期-----
-              var now = ut.gettimestamp();
-              if (t.data.data.end_time < now) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                return false;
-              }
-
-              /*-- 还没有开始预热的也不显示 --*/
-              if (t.data.data.show_time > now) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                ee.get_sto();
-                return false;
-              }
-
-              var t_gd = ee.data.data;
-              var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
-              var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
-
-              ee.setData({
-                prom_price: t.data.data.price,
-                prom_type: 1,
-                prom_id: prom_id,
-                prom_buy_limit: t.data.data.buy_limit,
-                prom_act: t.data.data,
-                prom_end_time: prom_end_time,
-                prom_start_time: prom_start_time,
-                isshow: 1,
-              });
-
-              ee.get_sto();
-
-
-              var newTime = ut.gettimestamp();
-              var endTime2 = t.data.data.end_time;
-              var endTime1 = t.data.data.start_time;
-
-              //---苹果机不兼容---
-              /*----
-              var endTime2 = new Date(prom_end_time).getTime();
-              var endTime1 = new Date(prom_start_time).getTime();----*/
-
-              if (endTime1 > newTime) {
-                ee.setData({
-                  prom_time_text: '距秒杀开始还有'
-                })
-                ee.countDown(endTime1, 0);
-              } else {
-                if (endTime2 > newTime) {
-                  ee.setData({
-                    prom_time_text: '距秒杀结束还有',
-                    prom_st: 1
-                  })
-                  ee.countDown(endTime2);
-                }
-              }
-            }
-          });
-        }
-      })
-    }
-
-	 if(prom_type==4){
-		//th.setData({is_integral_normal:1});
-		var rdata={
-			store_id:o.stoid,stype:1,stypeup:1,goods_id:gid
-		}
-		
-		var integrals=0;
-		var get_datas= {
-		  user_id:getApp().globalData.user_id, store_id:o.stoid,  
-		};    
-		await getApp().request.promiseGet("/api/weshop/users/getAllPoints", {
-		  data: get_datas
-		}).then(res => {
-			if(res.data.code==0){
-				 integrals=res.data.data.Integral;	
-			}		 	 
-		})
-					
-		//获取一下积分活动
-		await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList", {
-		   data: rdata
-		}).then(res => {	
-		   //调用接口有数据的时候 	
-		   if (res.data.code == 0 && res.data.data && res.data.data.pageData &&  res.data.data.pageData.length>0) {
-			   var inte_data=res.data.data.pageData[0];						   
-			   var can_integral=(parseFloat(integrals)>=parseFloat(inte_data.integral));						 
-			   ee.setData({
-			     prom_price:parseFloat(inte_data.addmoney),
-				 prom_integral:parseFloat(inte_data.integral),
-			     prom_type: 4,
-			     prom_id: inte_data.id,
-			     prom_buy_limit: inte_data.limitvipqty,
-			     prom_act: inte_data,
-			     isshow: 1,
-				 can_integral:can_integral,
-				 is_shopbuy: parseInt(inte_data.is_shopbuy?inte_data.is_shopbuy:0)
-			   });			   
-			   ee.get_sto();
-			  			   
-		   }else{
-			   ee.setData({prom_type: 0, isshow: 1,});
-			   ee.get_sku(os.stoid, ee.data.data.sku, gid);
-			   ee.get_sto();
-			   return false;
-		   }					   
-		})
-		
-	 }	
-	
-  
-    //---判断拼单----
-    if (prom_type == 6) {
-      //-------判断活动是否抢光---------
-      await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/" + prom_type + "/" + prom_id, {
-        1: 1
-      }).then(res => {
-        var em = res;
-        if (em.data.code == 0) {
-
-
-          if (em.data.data <= 0) ee.setData({
-            prom_r_null: 1
-          });
-          //拿取价格并且判断时间--
-          getApp().request.get("/api/weshop/teamlist/get/" +
-              os.stoid + "/" + prom_id, {
-            success: function(t) {
-              if (t.data.code != 0) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                ee.get_sto();
-                return false;
-              }
-              //----已经结束-----
-              if (t.data.data.is_end == 1) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                return false;
-              }
-              //----已经过期-----
-              var now = ut.gettimestamp();
-              if (t.data.data.end_time < now) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                ee.get_sto();
-                return false;
-              }
-
-              /*-- 还没有开始预热的也不显示 --*/
-              if (t.data.data.show_time > now) {
-                ee.setData({
-                  prom_type: 0,
-                  isshow: 1,
-                });
-                ee.get_sku(os.stoid, ee.data.data.sku, gid);
-                ee.get_sto();
-                return false;
-              }
-
-              //-------查看自己是不是有买过该团的商品，并还为支付，或者在进行中-------
-              getApp().request.get("/api/weshop/order/page", {
-                data: {
-                  pt_prom_id: prom_id,
-                  user_id: oo.user_id,
-                  store_id: os.stoid,
-                  pageSize: 1,
-                  page: 1
-                },
-                success: function(e) {
-                  if (e.data.code == 0 && e.data.data.pageData.length > 0) {
-                    var odr = e.data.data.pageData[0];
-                    th.data.buy_order = odr;
-                    if (odr.pt_status == 0 && odr.order_status == 1) {
-                      th.setData({
-                        user_order_pt_state: 1
-                      });
-                    }
-                    if (odr.pt_status == 1 && odr.order_status == 1) {
-                      if (odr.is_zsorder == 4) {
-                        getApp().request.promiseGet("/api/weshop/teamgroup/page/", {
-                          data: {
-                            store_id: os.stoid,
-                            team_id: odr.pt_prom_id,
-                            listno: odr.pt_listno
-                          }
-                        }).then(res => {
-                          var now = ut.gettimestamp();
-						  if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-							   var tgr = res.data.data.pageData[0];
-							   //如果团的时间已经到了
-							   if (now >= tgr.kt_end_time) {
-							     th.update_jiti(tgr.id);
-							   } else {
-							     th.setData({
-							       user_order_pt_state: 2
-							     });
-							   }
-						  }                        
-                        })
-
-                      } else {
-                        th.setData({
-                          user_order_pt_state: 2
-                        });
-                      }
-                    }
-
-                    if (odr.pt_status == 2 && odr.is_zsorder == 4) {
-                      th.setData({
-                        user_order_pt_state: 3,
-                      });
-                      th.data.wk_order_id = odr.order_id;
-                    }
-                  }
-                },
-              });
-
-              //----------查看阶梯团------------
-              if (t.data.data.ct_rylist != "" && t.data.data.ct_rylist != null && t.data.data.ct_rylist != undefined) {
-                t.data.data.ct_rylist = JSON.parse(t.data.data.ct_rylist);
-                var max_num = 0;
-                t.data.data.ct_rylist.forEach(function(val, ind) {
-                  if (parseInt(val.rynum) > max_num) max_num = parseInt(val.rynum);
-                })
-                t.data.data.max_ct_num = max_num;
-              }
-
-              var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
-              var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
-              ee.setData({
-                prom_price: t.data.data.price,
-                prom_type: 6,
-                prom_id: prom_id,
-                prom_buy_limit: t.data.data.buy_limit,
-                prom_act: t.data.data,
-                prom_end_time: prom_end_time,
-                prom_start_time: prom_start_time,
-                isshow: 1,
-              });
-
-              ee.get_sto();
-
-              var newTime = now;
-              var endTime2 = t.data.data.end_time;
-              var endTime1 = t.data.data.start_time;
-
-              if (endTime1 > newTime) {
-                ee.setData({
-                  prom_time_text: '距拼单开始还剩:'
-                })
-                ee.countDown(endTime1, 0);
-              } else {
-                if (endTime2 > newTime) {
-                  ee.setData({
-                    prom_time_text: '距拼单结束还剩:',
-                    prom_st: 1
-                  })
-                  ee.countDown(endTime2);
-                }
-              }
-              //-------查看有多少人在开这个团-------
-              th.get_team_group(prom_id);
-            }
-          });
-        }
-      })
-    }
-
-  },
-
-  //--获取有多少人在开团--
-  async get_team_group(prom_id) {
-    var teamgroup = [],
-        th = this,
-        grounp_tatal = 0;
-    //如果活动是开团不是商家团
-    if (this.data.prom_act.kttype > 1) {
-      //获取活动从表信息team_id
-      await getApp().request.promiseGet("/api/weshop/teamgroup/page", {
-        data: {
-          store_id: os.stoid,
-          pageSize: 3,
-          page: 1,
-          state: 2,
-          team_id: prom_id
-        }
-      }).then(res => {
-        teamgroup = res.data.data.pageData;
-        grounp_tatal = res.data.data.total;
-      })
-      //获取订单的总数这个接口不能用
-      for (i = 0; i < teamgroup.length; i++) {
-        await getApp().request.promiseGet("/api/weshop/order/page", {
-          data: {
-            store_id: os.stoid,
-            pt_status: 1,
-            pt_listno: teamgroup[i].listno
-          }
-        }).then(res => {
-          var order = res.data.data.pageData;
-          teamgroup[i].open_num = order.length;
-        })
-        await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + teamgroup[i].openvipid, {}).then(res => {
-          var user = res.data.data;
-          teamgroup[i].user = user;
-        })
-      }
-
-      if (teamgroup.length > 0) {
-        th.setData({
-          teamgroup: teamgroup,
-          grounp_tatal: grounp_tatal
-        });
-        th.countDown2();
-      }
-    }
-  },
-
-  //---小于10的格式化函数----
-  timeFormat(param) {
-    return param < 10 ? '0' + param : param;
-  },
-
-  //----倒计时函数-----
-  countDown(time, prom_st) {
-    if (!this.data.is_timer) return false;
-    var th = this;
-    // 获取当前时间，同时得到活动结束时间数组
-    var endTime = time;
-    var newTime = ut.gettimestamp();
-    // 对结束时间进行处理渲染到页面
-    var obj = null;
-    // 如果活动未结束，对时间进行处理
-    if (endTime - newTime > 0) {
-      var time = (endTime - newTime);
-      // 获取天、时、分、秒
-      var day = parseInt(time / (60 * 60 * 24));
-      var hou = parseInt(time % (60 * 60 * 24) / 3600);
-      var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-      var sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
-      obj = {
-        day: this.timeFormat(day),
-        hou: this.timeFormat(hou),
-        min: this.timeFormat(min),
-        sec: this.timeFormat(sec)
-      }
-    } else {
-      if (th.data.prom_st == 0) {
-        //var endTime2 = new Date(th.data.prom_end_time).getTime();
-        var endTime2 = th.data.prom_act.end_time;
-        th.setData({
-          prom_time_text: '距结束还剩:',
-          prom_st: 1
-        })
-        setTimeout(function() {
-          th.countDown(endTime2)
-        }, 1000);
-        return false;
-
-      } else {
-        //活动已结束，全部设置为'00'
-        obj = {
-          day: '00',
-          hou: '00',
-          min: '00',
-          sec: '00'
-        }
-        th.setData({
-          prom_time_text: '活动已经结束:',
-          prom_st: 3
-        })
-        th.setData({
-          djs: obj
-        });
-        return false;
-      }
-    }
-
-    th.setData({
-      djs: obj
-    });
-    setTimeout(function() {
-      th.countDown(endTime)
-    }, 1000);
-  },
-
-
-  //-------------获取购买数量的总函数----------------
-  get_buy_num: function(gd, func) {
-    var map = this.data.g_buy_num,
-        th = this,
-        user_id = getApp().globalData.user_id;
-    if (user_id == null) {
-      map.set(gd.goods_id, 0);
-      th.setData({
-        g_buy_num: map,
-        prom_buy_num: 0,
-      });
-      "function" == typeof func && func();
-      return false;
-    }
-
-    if (map.has(gd.goods_id)) {
-      "function" == typeof func && func();
-    } else {
-      //----获取商品购买数----
-      getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-        data: {
-          store_id: os.stoid,
-          user_id: user_id,
-          goods_id: gd.goods_id
-        },
-        success: function(t) {
-          if (t.data.code == 0) {
-            var g_buy_num = t.data.data.goodsbuynum;
-            if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) {
-              //----获取活动购买数----
-              getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", {
-                data: {
-                  store_id: os.stoid,
-                  user_id: user_id,
-                  goods_id: gd.goods_id,
-                  prom_type: gd.prom_type,
-                  prom_id: gd.prom_id
-                },
-                //-----获取-----
-                success: function(tt) {
-                  if (tt.data.code == 0) {
-                    map.set(gd.goods_id, g_buy_num);
-                    th.setData({
-                      g_buy_num: map,
-                      prom_buy_num: tt.data.data.goodsbuynum,
-                    });
-                    "function" == typeof func && func();
-                  }
-                }
-              });
-            } else {
-              map.set(gd.goods_id, g_buy_num);
-              th.setData({
-                g_buy_num: map
-              });
-              "function" == typeof func && func();
-            }
-          }
-        }
-      });
-    }
-  },
-
-  //--拼单推荐的显示---
-  tj_Click: function(e) {
-    var ind = parseInt(e.target.dataset.ind);
-    this.setData({
-      is_show_gz: ind
-    });
-  },
-
-  //--------拼团玩法显示详情--------
-  show_pt_xx: function(e) {
-    this.setData({
-      pd_xx: 1,
-    })
-  },
-  close_pt_xx: function() {
-    this.setData({
-      pd_xx: 0,
-    })
-  },
-
-  //--点击弹起拼单--
-  openSpecModel_pt: function(e) {
-
-
-    this.setData({ open_ind_store: 4});//拼团直接给4
-
-
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/togoin/togoin',
-      })
-      return false;
-    }
-
-    var th = this;
-    var ind = parseInt(e.currentTarget.dataset.it);
-    //如果是拼单活动的普通购买
-    if (ind == 1) {
-      //如果拼单的sku data是空的，就要先获取一下
-      if (th.data.sku_g_pt) {
-		th.get_sto(1);  
-        th.setData({
-          is_normal: ind,
-          openSpecModal_pt: 1
-        });
-      } else {
-		th.get_sto(1);  		  
-        th.get_sku(o.stoid, th.data.data.sku, th.data.gid, 1, function() {
-          th.setData({
-            is_normal: ind,
-            openSpecModal_pt: 1
-          });
-        });
-      }
-    } else {
-     
-      //拼单商品从这里进，先判断有没有买过商品，
-      getApp().request.get("/api/weshop/order/page", {
-        data: {
-          pt_prom_id: th.data.prom_act.id,
-          user_id: oo.user_id,
-          store_id: os.stoid,
-          pageSize: 1,
-          page: 1
-        },
-        success: function(e) {
-          //--跳转到已经购买的情况--
-          if (e.data.data.pageData.length > 0) {
-            var odr = e.data.data.pageData[0];
-            //还未支付
-            if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
-              wx.showModal({
-                title: "您已经购买了该商品待支付中",
-                success: function(a) {
-                  if (a.confirm) {
-                    wx.navigateTo({
-                      url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
-                    });
-                  }
-                }
-              });
-            } else if (odr.pt_status == 1 && odr.order_status == 1) {
-				
-			  if(this.data.is_go_to_team_show) return false;
-			  this.data.is_go_to_team_show=1;
-			  wx.showLoading(); 	
-				
-              wx.redirectTo({
-                url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
-              });
-            } else {
-              th.setData({
-                is_normal: ind,
-                openSpecModal_pt: 1
-              });
-            }
-
-          } else {
-            th.setData({
-              is_normal: ind,
-              openSpecModal_pt: 1
-            });
-          }
-        }
-      });
-    }
-  },
-
-  //-----------------拼单生成方法---------------------
-  addCart_pt: function() {
-    var th = this;
-    if (this.data.is_normal == 0) {
-      //看一下有没有起购数，如果有起购数，要计算起购数
-      var qnum = parseFloat(th.data.prom_act.minbuynum);
-      if (qnum > 0 && th.data.goodsInputNum < qnum) {
-        getApp().confirmBox("拼团商品至少要买" + qnum + "件!");
-        return false;
-      }
-
-      th.addcart_pt_func();
-    } else {
-      th.addcart_pt_func();
-    }
-  },
-
-  addcart_pt_func: function() {
-    if (oo.user_id == null) {
-      s.my_warnning("还未登录！", 0, this);
-      return;
-    }
-    var e = this,
-        th = e,
-        o = this.data.sele_g;
-    if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
-
-    //----------添加到购物车时，要判断限购数量，--------
-    e.get_buy_num(o, async function(ee) {
-
-      //---判断商品是否超出限购---
-      if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-        if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品限购'
-          });
-
-          var num=th.data.prom_buy_limit-th.data.prom_buy_num;
-          if(num<0) num=0;
-          th.setData({goodsInputNum:num})
-          return false;
-        }
-      }
-      //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购---
-      if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal!=1) {
-        if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品活动限购'
-          });
-
-          var num=th.data.prom_buy_limit-th.data.prom_buy_num;
-          if(num<0) num=0;
-          th.setData({goodsInputNum:num})
-          return false;
-        }
-      }
-
-      var redis_num = 0
-      //不是普通购买的时候
-      if(th.data.is_normal!=1){
-        //-------判断活动是否抢光---------
-        await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, {
-          1: 1
-        }).then(res => {
-          redis_num = res.data.data;
-        })
-
-        if (th.data.goodsInputNum > redis_num) {
-          wx.showModal({
-            title: '提示',
-            content: '超出商品活动库存'
-          });
-
-          th.setData({goodsInputNum:redis_num})
-
-          return false;
-        }
-      }
-
-      if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      if (th.data.goodsInputNum > o.store_count) {
-        th.setData({goodsInputNum:o.store_count})
-        return s.my_warnning("超出商品库存", 0, th);
-      }
-
-      if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
-        this.setData({
-          sto_sele_name: ""
-        });
-      if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
-      //--------------此时操作的数据------------
-      var newd = {
-        goods_id: o.goods_id,
-        goods_num: th.data.goodsInputNum,
-        pick_id: th.data.sto_sele_id,
-        user_id: oo.user_id,
-        store_id: th.data.stoid,
-        goods_price: o.shop_price,
-        goods_name: o.goods_name,
-        goods_sn: o.goods_sn,
-        sku: o.sku,
-      };
-
-      //---是不是从收藏夹出来的---
-      if(th.data.c_guide_id){
-        newd['guide_id'] = th.data.c_guide_id;
-        newd['guide_type']=2;
-
-      }else{
-        if(getApp().globalData.guide_id){
-          newd['guide_id'] = getApp().globalData.guide_id;
-          newd['guide_type']=0;
-
-        }
-      }
-
-      //让商品带上房间号
-      if(th.data.sys_switch.is_skuroom_id==1){
-        if(th.data.data.goods_id==getApp().globalData.room_goods_id){
-          newd.room_id=getApp().globalData.room_id;
-        }
-      }else{
-        if(newd.goods_id==getApp().globalData.room_goods_id){
-          newd.room_id=getApp().globalData.room_id;
-        }
-      }
-
-      //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
-
-      if(th.data.is_normal == 1){
-        var conf=th.data.bconfig;
-        if(conf.switch_list){
-          var s_list=JSON.parse(conf.switch_list);
-          //如果后台有开启等级价的功能
-          if(parseInt(s_list.rank_switch)==2){
-            var card_price=o[getApp().globalData.userInfo['card_field']];
-            //如果会员有等级价
-            if(getApp().globalData.userInfo['card_field']!=undefined && getApp().globalData.userInfo['card_field']!=null
-                && getApp().globalData.userInfo['card_field']!="" && card_price>0){
-              newd.goods_price=card_price;
-            }
-          }
-        }
-      }
-
-
-      //-----如果是秒杀，团购，积分购,拼团,且不是普通购买-----
-      if (th.data.prom_type == 6 && th.data.is_normal!= 1) {
-        newd.goods_price = th.data.prom_price;
-        newd.prom_type = th.data.prom_type;
-        newd.prom_id = th.data.prom_id;
-        newd.kt_type = th.data.prom_act.kttype; //开团类型
-        newd.is_pt_tz = 0;
-        //th.data.sto_sele_distr=1; //直接用自提的方式提交
-        if (newd.kt_type > 1) {
-          newd.is_pt_tz = 1; //开团类型
-        }
-        if (newd.kt_type == 3) {
-          th.data.sto_sele_distr = 1;
-        }
-
-      } else if (th.data.prom_type == 3) {
-        newd.prom_type = 0;
-        newd.prom_id = 0;
-      }
-
-      newd['pick_name'] = th.data.sto_sele_name;
-      newd['pick_dis'] = th.data.sto_sele_distr;
-      newd['is_normal'] = th.data.is_normal;
-
-      th.buyNow_pt(newd);
-    })
-  },
-  //----------立即购买_pt-----------
-  buyNow_pt: function(e) {
-    s.set_b_now(e);
-    wx.navigateTo({
-      url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + e.goods_id,
-    });
-  },
-
-  //-------跳转pt商品-------
-  go_to_nopay: function() {
-      var th = this; 
-      url="/pages/user/order_detail/order_detail?order_id=" + th.data.buy_order.order_id;
-	  getApp().goto(url);
-   
-  },
-  //-------跳转pt teamshow-------
-  go_to_team_show: function() {
-	
-	 if(this.data.is_go_to_team_show) return false;
-	 this.data.is_go_to_team_show=1;
-	 wx.showLoading(); 
-	  
-     var th = this;
-     var url="/pages/team/team_success/team_success?ordersn=" + th.data.buy_order.order_sn;
-	 wx.redirectTo({
-		 url:url,
-	 })
-    
-  },
-
-  //---拼团倒计时---
-  countDown2() {
-    if (!this.data.is_timer) return false;
-    var th = this;
-    // 获取当前时间，同时得到活动结束时间数组
-    var newTime = ut.gettimestamp();
-    var List = th.data.teamgroup;
-    for (var j = 0; j < List.length; j++) {
-      // 对结束时间进行处理渲染到页面
-      var endTime = List[j].kt_end_time;
-      let obj = null;
-      // 如果活动未结束，对时间进行处理
-      if (endTime - newTime > 0) {
-        let time = (endTime - newTime);
-        // 获取天、时、分、秒
-        let day = parseInt(time / (60 * 60 * 24));
-        let hou = parseInt(time % (60 * 60 * 24) / 3600);
-        let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-        let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
-        obj = {
-          day: this.timeFormat(day),
-          hou: this.timeFormat(hou),
-          min: this.timeFormat(min),
-          sec: this.timeFormat(sec)
-        }
-      } else {
-        //活动已结束，全部设置为'00'
-        obj = {
-          day: '00',
-          hou: '00',
-          min: '00',
-          sec: '00'
-        }
-      }
-      var txt = "timer[" + j + "]";
-      th.setData({
-        [txt]: obj
-      });
-    }
-    setTimeout(th.countDown2, 1000);
-  },
-  //跳转参加团
-  go_cj_team: function(e) {
-    var ind = e.currentTarget.dataset.ind;
-    var item = this.data.teamgroup[ind];
-    var id = item.id;
-    var th = this;
-
-    getApp().request.get("/api/weshop/order/page", {
-      data: {
-        pt_prom_id: item.team_id,
-        user_id: oo.user_id,
-        store_id: os.stoid,
-        pageSize: 1,
-        page: 1
-      },
-      success: function(e) {
-        if (e.data.code != 0) {
-          getApp().my_warnning("读取订单失败", 0, th);
-          return fasle;
-        }
-        //--跳转到已经购买的情况--
-        if (e.data.data.pageData.length > 0) {
-          var odr = e.data.data.pageData[0];
-          //还未支付
-          if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) {
-            wx.showModal({
-              title: "您已经购买了该商品待支付中",
-              success: function(a) {
-                if (a.confirm) {
-                  wx.navigateTo({
-                    url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id,
-                  });
-                }
+                all_sto: newarr
+              });
+
+            } else {
+              th.setData({
+                is_show_sto_cat: -1,
+                only_pk: e.data.data.pageData
+              });
+              //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
+              if (!th.data.def_pick_store) {
+                th.setData({def_pick_store:e.data.data.pageData[0]})
               }
-            });
-          } else if (odr.pt_status == 1 && odr.order_status == 1) {
-			  
-			  if(this.data.is_go_to_team_show) return false;
-			  this.data.is_go_to_team_show=1;
-			  wx.showLoading();  
-			  
-              wx.redirectTo({
-                 url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
-             });
+            }
           } else {
-            wx.navigateTo({
-              url: "/pages/team/team_show/team_show?tg_id=" + id,
+            th.setData({
+              is_show_sto_cat: -1,
+              only_pk: e.data.data.pageData
             });
-          }
-        }
-        //--跳转到参团--
-        else {
-          wx.navigateTo({
-            url: "/pages/team/team_show/team_show?tg_id=" + id,
-          });
-        }
-      }
-    })
-
-  },
-
-  //跳到团更多
-  go_t_more: function() {
-    var team_id = this.data.prom_id;
-    wx.navigateTo({
-      url: "/pages/team/team_more/team_more?team_id=" + team_id,
-    });
-  },
-
-  //--点赞功能--
-  click_zan: function(e) {
-    var com_id = e.currentTarget.dataset.com_id;
-    var item_id = e.currentTarget.dataset.item_id;
-    var app = getApp(),
-        th = this;
-
-    if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) {
-      app.confirmBox("您还未登录");
-      return false;
-    }
-
-    var iszan = th.data.comments[item_id].userZanNum;
-    if (this.data.iszaning) return false;
-    this.data.iszaning = 1;
-
-
-    app.request.post("/api/weshop/commentZan/save", {
-      data: {
-        store_id: o.stoid,
-        user_id: app.globalData.user_id,
-        goods_id: th.data.gid,
-        comment_id: com_id
-      },
-      success: function(ee) {
-
-        if (ee.data.code == "-1") {
-          app.my_warnning("不能给自己点赞", 0, th);
-          th.data.iszaning = 0;
-          return;
-        }
-
-        if (ee.data.code == 0 && iszan != 1) {
-          var num = th.data.comments[item_id].zan_num;
-          num++;
-          var text = "comments[" + item_id + "].zan_num";
-          var text1 = "comments[" + item_id + "].userZanNum";
-          var _errObj = {};
-          _errObj[text] = num;
-          _errObj[text1] = 1;
-          th.setData(_errObj);
-
-        } else {
-          var num = th.data.comments[item_id].zan_num;
-          num--;
-          var text = "comments[" + item_id + "].zan_num";
-          var text1 = "comments[" + item_id + "].userZanNum";
-          var _errObj = {};
-          _errObj[text] = num;
-          _errObj[text1] = 0;
-          th.setData(_errObj);
-        }
-
-        setTimeout(function() {
-          th.data.iszaning = 0;
-        }, 500)
-
-      }
-    })
-  },
-
-  /*----券的开关---*/
-  switchCoupon: async function(event) {
-    var coupon = event.currentTarget.dataset.coupon;
-    var app = getApp();
-    var url = "/api/weshop/prom/coupon/pageCouponList";
-    var quan_list = this.data.quan_list;
-    var th = this;
-
-    //当开启，且列表为空的情况下要
-    if (!quan_list && coupon == "1") {
-      wx.showLoading();
-      await app.request.promiseGet(url, {
-        data: {
-          store_id: os.stoid,
-          type: 1,
-          pageSize: 100,
-          page: 1,
-          user_id: app.globalData.user_id,
-		  is_share:0
-        }
-      }).then(res => {
-        wx.hideLoading();
-        quan_list = res.data.data.pageData;
-      })
+            //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
+            if (!th.data.def_pick_store) {
+              th.setData({def_pick_store:e.data.data.pageData[0]})
+            }
-      if (quan_list) {
-        for (var ind in quan_list) {
-          var ep = quan_list[ind];
-          var start = ut.formatTime(ep.use_start_time, "yyyy-MM-dd");
-          var end = ut.formatTime(ep.use_end_time, "yyyy-MM-dd");
-          start = start.replace("00:00:00", "");
-          end = end.replace("00:00:00", "");
-          quan_list[ind].start = start;
-          quan_list[ind].end = end;
+          }
         }
-      }
-
-      th.setData({
-        coupon: coupon,
-        quan_list: quan_list
       });
-    } else {
+    } else {	
       th.setData({
-        coupon: coupon
+        is_show_sto_cat: 0,
+        only_pk: e.data.data.pageData
       });
+      //-----如果没有默认门店，要取第一个门店作为默认店------
+      if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) {
+        th.setData({
+          def_pick_store:e.data.data.pageData[0],
+          sto_sele_name: e.data.data.pageData[0].pickup_name,
+          sto_sele_id: e.data.data.pageData[0].pickup_id,
+          sto_sele_distr: e.data.data.pageData[0].distr_type
+        })
+      }
     }
   },
-
-  //--查看评价--
-  look_pj: function() {
-    this.tabComment();
-    this.doScrollTop();
-  },
-
-  //-----领取券-----
-  get_quan: function(e) {
-    var cid = e.currentTarget.dataset.cid;
-    var index = e.currentTarget.dataset.ind;
-    var item = this.data.quan_list[index];
-
-
-    //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      wx.navigateTo({
-        url: '/pages/togoin/togoin',
-      })
-      return false;
-    }
-
-
-    //如果券还在领取中，不能再点
-    if (item.linging == 1) {
-      getApp().my_warnning('领取中..', 0, this);
-      return false;
+ 
+  //加载更多是靠这个函数
+  onReachBottom: function() {
+    if (this.data.activeCategoryId == 2){
+      if(!this.data.comments_no_more)   this.requestComments_new();
     }
-    //如果领取的次数到了
-    if (item.everyone_num > 0 && item.lqnum >= item.everyone_num) {
-      getApp().my_warnning('领取失败，您已领完该券', 0, this);
-      return false;
-    }
+    var goods_list = this.selectComponent("#goods_list"); //组件的id
+    if (goods_list) goods_list.get_list();
+  },
-    var lq_num = item.lqnum;
-    var pdata = {
-      'uid': oo.user_id,
-      'cid': cid,
-      'store_id': os.stoid,
-      'type': 5
-    };
-	
-	//-- 导购ID --
-	if(getApp().globalData.guide_id){
-		pdata.guide_id=getApp().globalData.guide_id;
-	}
-	
-    var app = getApp(),
-        th = this;
-    app.request.post("/api/weshop/couponList/saveCouponList", {
-      data: pdata,
-      success: function(res) {
-        if (res.data.code == 0) {
-          app.my_warnning("领取成功", 1, th);
-          lq_num++;
-          var text = "quan_list[" + index + "].lqnum";
-          var text2 = "quan_list[" + index + "].linging";
-          var obj = {};
-          obj[text] = lq_num;
-          obj[text2] = 0;
-          th.setData(obj);
-        } else {
-          app.confirmBox(res.data.msg);
-          var text2 = "quan_list[" + index + "].linging";
-          var obj = {};
-          obj[text2] = 0;
-          th.setData(obj);
-        }
-      }
-    })
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
   },
-  
+
+ 
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function() {
     //--先判断会员状态--
@@ -4279,33 +1529,6 @@ Page({
     }
   },
-  /*---视频相关--*/
-  videopicture: function(e) {
-    var vipi = e.currentTarget.dataset.vipi;
-    this.setData({
-      videopicture: vipi,
-      swiperCurrent: vipi,
-      noon: 0,
-      current: 1
-    });
-  },
-
-  videoPlay: function(e) {
-    var _index = e.currentTarget.id
-    this.setData({
-      _index: _index,
-      noon: 1
-    })
-
-    setTimeout(function() {
-      //将点击视频进行播放
-      var videoContext = wx.createVideoContext(_index)
-      videoContext.play();
-    }, 500)
-  },
-
-
-
   //--获取头像的本地缓存,回调写法--
   get_head_temp: function(tt, func) {
     var ee = this;
@@ -4358,16 +1581,6 @@ Page({
     });
   },
-  //--外侧评价的点击效果---
-  clik_evaluate: function(e) {
-    var val = e.currentTarget.dataset.val;
-    this.setData({
-      activeCategoryId: 2,
-      activeCategoryId3: val,
-      comments: null
-    });
-    this.requestComments_new();
-  },
   //--跳转到商品详情页面--
   go_goods: function(e) {
@@ -4376,11 +1589,6 @@ Page({
     getApp().goto(url);
   },
-  //--跳转到支付尾款界面--
-  go_pay_wk: function() {
-    var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.wk_order_id;
-    getApp().goto(url);
-  },
   pop_err_img: function(e) {
     var txt = e.currentTarget.dataset.errorimg;
@@ -4389,25 +1597,6 @@ Page({
     this.setData(ob);
   },
-  //--调用更新阶梯团的接口--
-  update_jiti: function(id) {
-    var th = this;
-    //--更新阶梯团--
-    getApp().request.put("/api/weshop/teamgroup/updateTeamOrder/" + os.stoid + "/" + id, {
-      success: function(ee) {
-        //--等于0是要去支付尾款，接口调用失败，就要去查看参团详情--
-        if (ee.data.code == 0) {
-          th.setData({
-            user_order_pt_state: 3,
-          });
-        } else if (ee.data.code == -1) {
-          th.setData({
-            user_order_pt_state: 2,
-          });
-        }
-      }
-    })
-  },
   // 选择门店
   choice_store: function(ee) {
     var th = this;
@@ -4437,27 +1626,20 @@ Page({
           th.data.lat = res.latitude;
           th.data.lon = res.longitude;
           th.data.is_get_local_ok = 1;
-          th.setData({
-            is_gps: 1
-          });
-          //th.onShow();
+          th.setData({ is_gps: 1 });
           th.get_sto(th.data.is_normal);
         },
         fail: function(res) {
-          //th.onShow();
+        
           th.data.is_get_local_ok = 1;
           th.get_sto(th.data.is_normal);
           if (res.errCode == 2) {
-            th.setData({
-              is_gps: 0
-            });
+            th.setData({is_gps: 0});
             if (th.data.is_gps == 0) {
               getApp().confirmBox("请开启GPS定位", null, 25000, !1);
             }
           } else {
-            th.setData({
-              is_gps: "3"
-            });
+            th.setData({ is_gps: "3" });
           }
         }
@@ -4520,8 +1702,6 @@ Page({
         sort_store: 0
       })
     }
-
-
   },
   //选择更多门店
@@ -4530,9 +1710,8 @@ Page({
       sort_store: 1
     });
   },
-  sort_store: function() {
-
-  },
+  
+  sort_store: function() { },
   // 返回按钮
   returns: function() {
     this.setData({
@@ -4563,52 +1742,6 @@ Page({
   },
-  //如果开启线下库存，已经急速库存才会使用
-  async check_the_pick(item,func){
-    var th=this;
-    var goodsinfo=th.data.sele_g;
-    var erpwareid=goodsinfo.erpwareid;
-    var plist=null;
-    var lock=0;
-
-    //---如果是活动的时候,同时不是普通购买---
-    if((th.data.prom_type==1 || th.data.prom_type==6  || th.data.prom_type==4) && !th.data.is_normal )  {
-      func(); return false;
-    }
-
-    if(this.data.sales_rules!=2){
-      func();
-    }else{
-
-      //先读取门店的lock
-      await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-        data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000}
-      }).then(res=>{
-        if(res.data.code==0 && res.data.data.total>0){
-          for(var i in res.data.data.pageData )
-            lock+=res.data.data.pageData[i].outQty;
-        }
-      })
-      //读取线下的门店库存
-      await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-        data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
-      }).then(res=>{
-        if(res.data.code==0 && res.data.data.total>0){
-          plist=res.data.data.pageData[0];
-        }
-      })
-
-      if(plist && plist.CanOutQty-lock>0){
-        item.CanOutQty=plist.CanOutQty-lock;
-        func();
-        return false;
-      }
-      getApp().my_warnning(item.pickup_name+"库存不足！", 0, th);
-
-    }
-  },
-
-
   //确定def_pick为选择的门店
   sure_pick: function(e) {
     var th = this;
@@ -4627,30 +1760,30 @@ Page({
       var index = th.data.sec_pick_index;
       item = th.data.sec_sto.s_arr[index];
     }
-	
+
+    var ser_card=this.data.data;
 	//判断门店的配送方式是不是匹配
-	var g_distr_type = th.data.sele_g.distr_type;
-	if(item.distr_type!=0 && g_distr_type!=0 &&  item.distr_type!=g_distr_type){
+	if(ser_card.storageId!=null && ser_card.storageId!=""  &&  ser_card.storageId.indexOf(item.keyid)==-1){
 		wx.showToast({
-		  title: "门店配送方式不匹配",
+		  title: "该门店无此服务项目，请重新选择！",
 		  icon: 'none',
 		  duration: 2000
 		});
 		return false;
 	}
-    //--回调函数的用法--
-    th.check_the_pick(item,function(){
+   
       th.setData({
         def_pick_store: item,
         sto_sele_name: item.pickup_name,
         sto_sele_id: item.pickup_id,
+        sto_sele_keyid: item.keyid,
         sto_sele_distr: item.distr_type,
         store: 0,
         choice_sort_store: 0,
         fir_pick_index: 0
       });
-
+	  
       if (openindstore == 1) {
         th.setData({
           openSpecModal: !0,
@@ -4662,7 +1795,7 @@ Page({
           openSpecModal_ind: openindstore,
         });
       }
-      else if (openindstore == 4) { //4就是拼团
+      else if(openindstore == 4) { //4就是拼团
         th.setData({
           openSpecModal_pt: 1,      //打开拼团购买界面
           store: 0,                 //关闭门店
@@ -4676,11 +1809,9 @@ Page({
           choice_sort_store: 0,
           sort_store: 0
         })
-      }	  
-	  //如果商品没有其他活动,要取一下线下价格
-	  th.get_off_price();	  
-    })
+      }	      
   },
+  
   //---点击二级之后的选择---
   choose_for_store: function(e) {
     var index_c = e.currentTarget.dataset.ind;
@@ -4708,23 +1839,24 @@ Page({
     }
 	//判断门店的配送方式是不是匹配
-	var g_distr_type = th.data.sele_g.distr_type;
-	if(item.distr_type!=0 && g_distr_type!=0 &&  item.distr_type!=g_distr_type){
+    var ser_card=this.data.data;
+    //判断门店的配送方式是不是匹配
+    if(ser_card.storageId!=null && ser_card.storageId!=""  &&  ser_card.storageId.indexOf(item.keyid)==-1){
 		wx.showToast({
-		  title: "门店配送方式不匹配",
+		  title: "该门店无此服务项目，请重新选择！",
 		  icon: 'none',
 		  duration: 2000
 		});
 		return false;
 	}
-    //先设置之前,要判断是不是有库存
-    th.check_the_pick(item,function(){
-      var store_id = o.stoid;
-      var user_id = getApp().globalData.user_id;
-      var def_pickup_id = item.pickup_id;
+    
+    
+     var store_id = o.stoid;
+     var user_id = getApp().globalData.user_id;
+     var def_pickup_id = item.pickup_id;
-      getApp().request.put('/api/weshop/users/update', {
+     getApp().request.put('/api/weshop/users/update', {
         data: {
           user_id:user_id,
           def_pickup_id:def_pickup_id
@@ -4747,6 +1879,7 @@ Page({
         def_pick_store: item,
         sto_sele_name: item.pickup_name,
         sto_sele_id: item.pickup_id,
+        sto_sele_keyid: item.keyid,
         sto_sele_distr: item.distr_type,
         store: 0,
         choice_sort_store: 0
@@ -4787,10 +1920,6 @@ Page({
         })
       }
-	  //如果商品没有其他活动,要取一下线下价格
-	  th.get_off_price();	
-	  
-    })
   },
   wait_for_store_config: function() {
@@ -4830,135 +1959,26 @@ Page({
       clearInterval(t_time);
     }, 500)
   },
-  //显示全部
-  toggleHandler: function(e) {
-    var that = this,
-        index = e.currentTarget.dataset.index;
-    for (var i = 0; i < that.data.comments.length; i++) {
-      if (index == i) {
-        for (var i = 0; i < that.data.comments.length; i++) {
-          that.data.comments[index].auto = true;
-          that.data.comments[index].seeMore = false;
-        }
-      }
-    }
-    that.setData({
-      comments: that.data.comments
-    })
-  },
-
-  //收起更多
-  toggleContent: function(e) {
-    var that = this,
-        index = e.currentTarget.dataset.index;
-    for (var i = 0; i < that.data.comments.length; i++) {
-      if (index == i) {
-        that.data.comments[index].auto = true;
-        that.data.comments[index].seeMore = true;
-      }
-    }
-    that.setData({
-      comments: that.data.comments
-    })
-  },
-
-  //---  获取卡类列表 ---
-  getPlusCardType: function (func) {
-    var storid = os.stoid;
-    var th = this;
-    var user=getApp().globalData.userInfo;
-	if(!user) return false;
-    getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
-      var plusCard = res.data.data;
-      var arr = [1219, 2089, 3031];
-      var new_arr = new Array();
-      var card_name_map=new Map();
-      for (var i = 0; i < plusCard.length; i++) {
-        if((user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue;
-        var name="card"+plusCard[i].CorrPrice.toLowerCase();
-        card_name_map.set(name,plusCard[i].CardName);
-      }
-
-      var ob={"card_list":plusCard,"name_map":card_name_map};
-      func(ob);
-    })
-  },
-
-  go_plus:function(){
-    getApp().goto("/pages/user/plus/plus");
-  },
-  go_card_info:function(){
-    getApp().goto("/pages/user/cardinfo/cardinfo");
-  },
+  
+  
   //-- 根据ID拿出门店 --
   get_pick_from_list(pid){
     var all_pick_list=this.data.all_pick_list;
     for(var i in all_pick_list){
       var item=all_pick_list[i];
-      if(item.pickup_id==pid){
-        return item;
-      }
-    }
-  },
-  //-----显示优惠券的时候情况-----
-  show_more_cx:function () {
-    if(this.data.is_more_cx){
-      this.setData({is_more_cx:0});
-    }else{
-      this.setData({is_more_cx:1});
+      if(item.pickup_id==pid){ return item;}
     }
   },
-
-  //----跳转到搭配购买----
-  go_prom_list:function () {
-	  
-	var url= "../../../packageA/pages/prom_list/prom_list?goods_id="+this.data.gid;
-	var room_id= getApp().globalData.room_id;
-	if(room_id && this.data.gid==getApp().globalData.room_goods_id){
-		url+="&room_id="+room_id;
-	}
-    wx.navigateTo({ url: url,})
-  },
-
-  //---检查有没有优惠活动---
-  check_is_youhui:function(gid){
-    var th=this;
-    //调用接口判断订单优惠，
-    getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+gid+"/0", {}).then(res => {
-      if(res.data.code==0){
-        var r_data=res.data.data;
-        var max=0,min=0;
-        if(r_data.collocationList){
-          for(var i in r_data.collocationList){
-            if(max==0) max=r_data.collocationList[i].price;
-            if(min==0) min=r_data.collocationList[i].price;
-
-            if(max<parseFloat(r_data.collocationList[i].price)) max=r_data.collocationList[i].price;
-            if(min>parseFloat(r_data.collocationList[i].price)) min=r_data.collocationList[i].price;
-          }
-          r_data.collocationPromList.max=(max+th.data.data.shop_price).toFixed(2);
-          r_data.collocationPromList.min=(min+th.data.data.shop_price).toFixed(2);
-        }
-        th.setData({
-          order_prom:r_data.promOrder,
-          collocationGoods:r_data.collocationPromList,
-          prom_goods:r_data.promGoodsLists,
-        })
-		
-		th.is_show_more_buy();
-      }
-    })
-  },
-	
-	closePoster() {
+  
+  closePoster() {
 		this.setData({
 			showPoster: false,
 		});
-	},
+   },
 	// 保存图片到手机
-	 savePic() {
-		 console.log('保存图片');
+	savePic() {
+	   console.log('保存图片');
 	   var self = this;
 	   // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
 	   this.getSetting().then((res) => {
@@ -4977,9 +1997,7 @@ Page({
 	       // 如果已经授权，保存下载文件
 	       this.saveImage(self.data.shareImgPath)
 				 .then(() => {
-					 self.setData({
-					 	 showPoster: false
-					 });
+					 self.setData({ showPoster: false });
 				 });
 	     }
@@ -5027,8 +2045,7 @@ Page({
 	     })
 	   })
 	 },
-	 
-	 
+	 	 
 	 // 保存图片到系统相册
 	 saveImage(saveUrl) {
 	   var self = this;
@@ -5061,61 +2078,7 @@ Page({
 		   urls: [this.data.shareImgPath]
 		 });
 	 },
-	 
-	 is_show_more_buy:function(){
-		var prom_goods=this.data.prom_goods;
-		var per_price=this.data.sele_g.shop_price
-		if(this.data.card_field && this.data.sele_g[this.data.card_field]>0){
-			 per_price=this.data.sele_g[this.data.card_field];
-		}		
-		var all_price=per_price*this.data.goodsInputNum;
-		var con=null;
-		for(var i in prom_goods){
-			var item=prom_goods[i];
-			if(item.prom_type==1){
-				if(item.condition>this.data.goodsInputNum) {
-					con=item;
-					con.need=(item.condition-this.data.goodsInputNum)+"件";
-					break;
-				}
-			}else{
-				if(item.condition>all_price){
-					con=item;
-					con.need=(item.condition-all_price)+"元";
-					break;
-				}
-			}
-		}
-		
-		this.setData({hui_condition:con});
-					
-	 },
-	 
-	 //-- 积分购 --
-	 go_pay_integral:function(){
-		this.get_sto(0)
-		this.setData({openSpecModal_inte:1}); 
-	 },
-	  //-- 积分购普通购买 --
-	 go_pay_integral_normal:function(){
-		this.get_sto(1)
-		this.setData({openSpecModal_inte_normal:1}); 
-	 },
-	  
-	 closeSpecModal_inte:function(){
-		 this.setData({openSpecModal_inte:0}); 
-	 } ,
-	 closeSpecModal_inte_normal:function(){
-		 this.setData({openSpecModal_inte_normal:0}); 
-	 },
-	 
-	 addCart_inte:function(t){
-		  this.add_cart_func_inte(t);
-	 },
-	 
-	 
-	 
-
+	 	
 	onShareTimeline() {
 		return {
 			title:this.data.data.goods_name + '-' + getApp().globalData.config.store_name,
@@ -14,419 +14,41 @@
         </view> 
       </view>
     </view> -->
-
     <view class="goods-detail">
-      <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
-        <!--  视频  -->
-        <!-- <swiper bindchange="swiperChange"class="xc-pictures  swiperContainer rel" current="{{swiperCurrent}}"
-	  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> -->
+      <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">    
         <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove">
-
           <view class="xc-videos-picture rel">
-            <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
-							<!-- <swiper-item> -->
-              <!-- <swiper-item wx:if="{{mapurl}}"> -->
-                <!-- <view wx:if="{{noon == 0}}">
-                  <image class="xc-picturess" src="{{iurl+mapurl_f_img}}" mode="aspectFit">
-                    <image id="{{index}}" class="xc-play" src="{{iurl}}/miniapp/images/pofang.png" bindtap="videoPlay"></image>
-                  </image>
-                </view>
-                <view wx:else>
-                  <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"> </video>
-                </view>
-              </swiper-item> -->
-							
-							<!-- <swiper-item wx:for="{{gallery}}" wx:key="gallery"> -->
-              <swiper-item>
-                <image class="wh100" src="{{iurl + data.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
-              </swiper-item>
-            </swiper>
-            <!-- <block wx:if="{{mapurl}}">
-              <view wx:if="{{hiddenn==1}}">
-                <view class="xc-imageCount">{{current}}/{{gallery.length}}</view>
-              </view>
-              <view class="xc-video-picture abs">
-                <view class="xc-video" data-vipi="0" bindtap="videopicture">
-                  <view class="{{videopicture==0 ? 'xc-video-button':'xc-video-buttons'}}  {{videopicture==0 ? 'xc-sn':''}}">
-                    视频
-                  </view>
-                </view>
-                <view class="xc-picture  {{videopicture==1 ? 'xc-sn':''}}" data-vipi="1" bindtap="videopicture">
-                  <view>
-                    图片
-                  </view>
-                </view>
-              </view>
-            </block> -->
+            <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">					
+                <swiper-item>
+                  <image class="wh100" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}"  binderror="bind_bnerr"
+                         mode="aspectFit"  lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image>
+                </swiper-item>
+            </swiper>  
           </view>
         </view>
-
-        <!----显示秒杀价,团购，积分购---->
-        <!-- <view class="prom_show rel" wx:if="{{prom_type==1}}">
-          
-          <image class="secondkill-img" src='{{prom_st==1? iurl+"/miniapp/images/red_jx.png":iurl+"/miniapp/images/blue_ks.png"}}'></image>
-          <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image>
-       
-          <view class="stop fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
-          <view class="start fs26  abs" wx:if="{{prom_st==2}}">距活动开始还有</view>
-          <view class="secview  flex abs fs24 xc-miaosha-time">
-            <block wx:if="djs.day">
-              <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.day}}</view>
-              <view class="day white" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view>
-            </block>
-            <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.hou}}</view>
-            <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view>
-            <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.min}}</view>
-            <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}"> 分</view>
-            <view class='time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.sec}}</view>
-            <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
-          </view>
-        </view> -->
-
-        <!----拼单---->
-        <!-- <view class="pt_show " wx:if="{{prom_type==6}}">
-          <view class="pt_view rel"> -->
-            <!--许程 7. 24 -->
-            <!-- <image class="secondkill-img" src="{{prom_st==1? iurl+'/miniapp/images/red_jx.png':iurl+'/miniapp/images/blue_ks.png'}}"></image>
-            <view class="abs xc-qt-price">
-              <view class="flex" style='height:40rpx; margin-top:5rpx'>
-                <view class="flex fs35 xc-qtsign">￥</view>
-                <view class="fs50 val">{{prom_price}}</view>
-              </view>
-              <view class="word-line fs20 xc-qtunit-price">零售价￥{{data.market_price}}</view>
-            </view>
-            <view class="abs white xc-nanber">
-              <text class="fs22">已拼{{prom_act.buy_num}}件</text>
-              <view class="flex" style='margin-top:-34rpx'>
-                <view class="xc-people-img">
-                  <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image>
-                </view>
-                <view class="t-s fs20 xc-people-val">
-                  {{prom_act.ct_num}}人拼
-                </view>
-              </view>
-            </view>
-            <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
-            <view class="hy-stop word-color-lan fs26  abs" wx:if="{{prom_st==0}}">距活动开始还有</view>
-            <view class="secview  flex abs fs24 " style="color: black;right: 3px; top:46rpx;">
-              <block wx:if="djs.day">
-                <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}};margin-top:-34rpx;">{{djs.day}}</view>
-                <view class="day white" style="margin-top:-34rpx;margin-right:10rpx;color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view>
-              </block>
-              <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.hou}}</view>
-              <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view>
-              <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.min}}</view>
-              <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}"> 分</view>
-              <view class='xc-time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.sec}}</view>
-              <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
-            </view>
-          </view>
-
-          <view class="pt_fir"> -->
-            <!----显示团类型和团价格---->
-            <!-- <view class="pt_fir_title "> -->
-              <!-- 许程 商家团主页 -->
-              <!-- <view class="xc-goods-explain flex-vertical-between">
-                <view class="xc-explain fs32 ellipsis-2"  wx:if="{{prom_type!=0 }}">
-                  {{data.goods_name}}
-                </view>
-
-                <view class="xc-share-frame-jieti flex"  bindtap="saveImageToPhotosAlbum" style="top:0">
-                  <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
-                  <view class="share-font">分享</view>
-                </view>
-              </view>
-            </view> -->
-
-            <!----显示价格,阶梯团---->
-            <!-- <block wx:if="{{prom_act.kttype==3}}">
-              <view class="jie_price  flex">
-                <view style='margin-right:26rpx' wx:for="{{prom_act.ct_rylist}}">
-                  <view class="fs35 word-color">
-                    <text class="fs24">￥</text>{{item.price}}</view>
-                  <view class="fs24 t-c xc-person-number ">满{{item.rynum}}人</view>
-                </view>
-              </view>
-            </block>
-          </view>
-
-          <view class="t_gz" wx:if="{{is_show_gz==1}}">
-            {{prom_act.remark}}
-          </view> -->
-
-          <!----------正有多少人在开团---------->
-          <!-- <view class="pt_fir se2" wx:if="{{teamgroup}}">
-            <view class="xc-partner-frame">
-              <view class="zzk-1" bindtap="go_t_more">以下小伙伴正在拼单，可直接参与
-                <view class="ckgd flex">查看详细
-                  <view class="bg_right arrow-one"></view>
-                </view>
-              </view>
-            </view>
-            <view class='group' wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup" style='padding-left:28rpx;'>
-              <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}"> -->
-                <!--//选项框头像-->
-                <!-- <view class='gtou'>
-                  <image src='{{item.user.head_pic}}'></image>
-                </view> -->
-                <!--//等你来拼-->
-                <!-- <view class='gdn ellipsis-1'>{{item.user.nickname}}</view> -->
-                <!--//还差几人，剩余时间-->
-                <!-- <view class="rel">
-                  <view class='ghaicha ellipsis-2 abs'>
-                    <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"><text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text><text wx:else>您已经享最低优惠</text></text>
-                    <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团 </text>
-                    <view class="t_show">
-                      剩余
-					  <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>
-                      <text>{{timer[t_ind].hou}}</text>:
-                      <text>{{timer[t_ind].min}}</text>:
-                      <text>{{timer[t_ind].sec}}</text>
-                    </view>
-                  </view>
-                </view> -->
-                <!--//参加团-->
-                <!-- <view class='cjt t-c'>
-                  去参团
-                </view>
-                <view class="clear"></view>
-              </view>
-            </view>
-          </view>
-
-          <view class="pt_fir se1">
-            <view class="pt_hb">
-              拼团玩法
-              <view class="ptgz_an xq flex" bindtap="show_pt_xx">查看详细
-                <view class="bg_right arrow-two"></view>
-              </view>
-            </view>
-            <view class="flex-level" style='height:198rpx; width:100%;'>
-              <view class="flex-vertical-between rel" style='width:94%;margin-left:10rpx;'> -->
-                <!-- 许程 7： 24 -->
-                <!-- <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color">1</view>
-                  <view class="word">选择商品完成下单</view>
-                </view>
-                <view class="abs link {{color_type==0?'link-color-red':'link-color'}}"></view>
-
-                <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color">2</view>
-                  <view class="word">支付开团或参团</view>
-                </view>
-                <view class="abs  link1 {{color_type_one==0?'link-color-red':'link-color'}}"></view>
-
-                <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color">3</view>
-                  <view class="word">邀请好友参团支付</view>
-                </view>
-                <view class="abs link2  {{color_type_two==0?'link-color-red':'link-color'}}"></view>
-
-
-                <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color1">4</view>
-                  <view class="word">人满发货失败退款</view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view> -->
-
-        <!-- 积分购 -->
-       <!-- <view wx:if="{{prom_type==4}}">	
-			  <view class="goods-price rel"> -->
-				  <!-- 价格显示 -->
-				  <!-- <view class="co-red" style="overflow: hidden" >
-				      <view class="market-price" style="overflow: hidden; height: 66rpx;">
-					     <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
-						 <block wx:if="{{prom_integral}}">{{prom_integral}}
-						 <text class="rel_txt">积分</text></block>						
-						 <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>						
-					     <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> 					 
-						 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>						 
-						 <text class="rel_txt" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">&nbsp;&nbsp;&nbsp;零售价:￥{{data.market_price}}</text>
-					  </view>
-				  </view>	 -->
-						  
-				  <!-- 这个是分享按钮 -->
-				  <!-- <view class="xc-share-frame flex  {{prom_type==1?'s_ms_bth':''}} "  bindtap="saveImageToPhotosAlbum">
-					<image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
-					<view class="share-font">分享</view>
-				  </view>
-				  
-				  <view class="goods-title">
-				    <view class="goods-name elli">{{data.goods_name}}</view>
-				  </view>
-				 					  
-				  <view class="goods-num">
-				    <view class="sales">销量：{{prom_act.buy_num}}件</view> -->
-				    <!-- <view class="stock">折扣：{{data.disc}}折</view> -->
-						<!-- <view class="stock">折扣：{{g_filters.num((prom_price?prom_price:0)*100/data.shop_price)}}折</view>
-				    <view class="stock">{{categories3[0].num}}人评价</view>
-				  </view>				 
-			  </view>			  			 
-		</view> -->
-				
-		<!-- 不是拼团，不是积分购 -->
 		<block>
-        <!-- <block wx:if="{{prom_type!=6 && prom_type!=4}}"> -->
+ 
           <view class="goods-price rel">
-            <view class="co-red" style="overflow: hidden" wx:if="{{prom_type==0 || prom_type==3}}">
-                <view class="market-price" style="overflow: hidden">
-									<!-- <block wx:if="{{card_field && data[card_field]>0}}">
-										 <view class="flex ai-center  grade-card-frame" style="margin-left:12rpx;"> 
-										<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-											<view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
-										 </view>
-										 <text class="rel yuan">￥</text>{{filters.toFix(data[card_field],2)}}
-										<view class='yj' style="top:35rpx">
-													<text>零售价:￥{{data.market_price}}</text>
-												</view>
-									</block> -->
-				  <!-- <block wx:else>
-                     <text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}
-                     <view class='yj'><text>零售价:￥{{data.market_price}}</text></view>
-				  </block> -->
-              </view>
-
+            <view class="co-red" style="overflow: hidden">
+                <view class="market-price" style="overflow: hidden"></view>
             </view>
-
-            <!-- 这个是分享按钮 -->
-            <!-- <view class="xc-share-frame flex  {{prom_type==1?'s_ms_bth':''}} "  bindtap="saveImageToPhotosAlbum">
-              <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
-              <view class="share-font">分享</view>
-            </view> -->
-
-            <!-- 不是秒杀 -->
-	        <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
-            <!-- <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 }}">
-           
-                  <view class="flex ai-center  grade-card-frame card-frame" >
-					    	<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-					        <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
-                  </view>
-                  <view class="fs32 xc-black3 ai_and carde_frame">
-                  <text class="fs26">
-                  ￥</text>{{g_filters.get_card_price(data,card_list,0)}}
-                  </view>
-			</view> -->
-
-              <!-- 等级卡的显示,购买, 等级卡近30天要显示续费-->
-              
-			<!-- <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">	 -->
-         
-		    <!-- 不是秒杀，且会员不是等级会员 -->
-            <!-- <view wx:if="{{!card_field && prom_type!=1 }}">
-			   <view class="beauty-makeup-frame flex ai-center">
-				   <view class="left flex ai-center">
-					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
-							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-							<view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
-					   </view>
-					   <view class="card-effect">
-					     <view class="fs24 xc-black3">成为{{g_filters.get_card_price(data,card_list,1)}}立<text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元</view>
-					      <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view>
-				       </view>
-			       </view>				   				
-			       <view class="right flex jc-center ai-center" bindtap="go_plus">
-								<view class="at_once_carde xc-black3 fs28">立即开卡</view>  
-								<view class="bg_right"></view>
-			       </view>
-               
-               </view>
-            </view> -->
-		    <!-- 立即续费的显示 -->	
-			<!-- <view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1}}">
-				    <view class="beauty-makeup-frame flex ai-center">
-				 				   <view class="left flex ai-center">
-				 					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
-				 							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-				 							<view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
-				 					   </view>
-				 					   <view class="card-effect">
-				 					     <view class="fs24 xc-black3">成为{{card_name}}立<text class="co-red">省{{filters.toFix(data.shop_price[card_field],2)}}</text>元</view>
-				 					      <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view>
-				 				       </view>
-				     </view>				 				   				
-				     <view class="right flex jc-center ai-center" bindtap="go_card_info">
-				        <view class="at_once_carde xc-black3 fs28">立即续费</view>  
-				        <view class="bg_right"></view>
-				     </view>
-				 
-				 </view>
-				
-			</view> -->
-			
-			<!-- </block> -->
-            <!--许程商品名字-->
-
-						<!-- <view wx:if="{{prom_type!=1}}"> -->
+				  
             <view>
-							<view class="co-red"><text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
-              <view class="goods-title">
-                <view class="goods-name elli">{{data.goods_name}}</view>
-              </view>
+				<view class="co-red"><text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
+                <view class="goods-title"> <view class="goods-name elli">{{data.goods_name}}</view></view>
             </view>
-
-            <view class="goods-num" wx:if="{{prom_type!=1}}">
-              <view class="sales">耗时：{{data.sales_sum}}</view>
-              <view class="stock">次数：{{data.disc}}</view>
-							<!-- <view class="stock">折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折</view> -->
-              <view class="stock">有效天数：{{data.validDays}}</view>
-							<!-- <view class="stock">有效天数：1234{{categories3[0].num}}</view> -->
-            </view>
-            <!-- <view wx:if="{{prom_type==1}}">
-              <view class="flex">
-                <view>
-                  <view class="flex xc-price-frame">
-                    <view class="flex fs45  sign">￥</view>
-                    <view class="fs60 val">{{prom_price}}</view>
-                  </view>
-                  <view class="word-line fs24 xc-unit-price">零售价￥{{data.market_price}}</view>
-                </view>
-                <view class="xc-val-price"> 
-                  <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
-                  <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view>
-                  <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view>
-                </view>
-              </view>
-            </view> -->
-           
-            <!-- <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4}}">
-              {{data.goods_name}}
-            </view> -->
-
-            <!-- <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> -->
-            <!-- 许程 7.24 暂时注释 -->
-            <!-- <view wx:if="{{prom_type==1}}">
-              <view class="goods-num" wx:if="{{prom_type==1}}">
-
-                <block wx:if="prom_st>0" >
-                  <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
-                  <view class="stock">限购:{{prom_act.buy_limit}}件</view>
-                  <block wx:if="{{prom_st==0}}">
-                      <view class="sales">已购:0件</view>
-                  </block>  
-                   <block wx:else>
-                      <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view>
-                  </block>  
-                </block>
-
-                <block wx:else>
-                   <view class="stock">总数量：{{prom_act.goods_num}}件</view>
-                   <view class="stock">限购:{{prom_act.buy_limit}}件</view>
-                   <view class="sales">已购:{{prom_act.buy_num}}件</view>
-                </block>
-
-              </view>
-            </view> -->
-
+			
+			<view class="goods-num" style="margin-bottom: 10rpx;">
+			  <view class="sales">销量：{{data.sales_sum}}</view>
+			  <view class="sales">有效天数：{{data.validDays?data.validDays:'不限'}}</view>
+			</view>
+				 
           </view>
         </block>
             <!-- 门店收货地址 -->
-            <!-- <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
+            <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
                  <view class="address_frame" bindtap="choice_store"  data-ind="0">
                   <view class="flex-vertical-between "> 
                     <view class="flex-vertical select_store_height">
@@ -449,14 +71,12 @@
                      </view>
                   </view>	
-								
-				
-				  <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+												
+				  <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(未找到门店)</view>
 				  <block wx:else>					
-							 <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+							 <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(未找到门店)</view>
 							 <block wx:else>
-								  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
-								  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
+								  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(该门店无此项目)</view>
 							 </block>							
 				  </block>
@@ -464,226 +84,39 @@
                   </view>
                  </view>   
-            </view> -->
-
-        <!--许程 7.24暂时注释 -->
-        <!-- <view class="bdt16" wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}">
-          <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
-            <view class="cx-sizs fs30">领券</view>
-            <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="{{index}}">
-              <view class="circle xc-circular xc-one"></view>
-              <view class="xc-coupon t-c four-level-word">满{{item.condition}}减{{item.money}}</view>
-              <view class="circle xc-circular xc-two"></view>
-            </view>
-
-            <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
-              <text class="bg_jj"></text>
-            </view>
-          </view>
-        </view> -->
-
-        <!-- 要判断是不是有促销活动 -->
-        <!-- <block wx:if="{{prom_goods}}">
-          <view class="cx-frame flex" style="position: relative; height: auto" >
-            <view class="cx-sizs wsize">促销</view> -->
-            <!-- 中间显示层 -->
-            <!-- <view style="margin-top: 36rpx">
-                <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}">
-                    <view class="prom_condition">消费满{{item.condition}}<text wx:if="{{item.prom_type==1}}">件</text><text wx:else>元</text></view>
-                    <view class="word {{is_more_cx?'':'ellipsis-1'}}">
-                            <text wx:if="{{item.money>0}}">减价{{item.money}}元;</text>
-							<text wx:if="{{item.sale>0}}">打{{item.sale}}折;</text>
-							<text wx:if="{{item.past==1}}">包邮;</text>
-							<text wx:if="{{item.intValue>0}}">送{{tem.intValue}}积分;</text>
-							<text wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券;</text>
-							<text wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}};</text>
-							<text wx:if="{{item.lb_id>0}}">送{{item.lbtitle}};</text>
-                    </view>
-                </view>
-
-            </view>
-            <view data-coupon="1" bindtap="show_more_cx" class="cx-obtain-coupon wsize">
-              <text class="bg_jj {{is_more_cx?'down1':''}}"></text>
-            </view>
-          </view>
-        </block> -->
-
-        <!-- 要判断是不是有订单优惠 -->
-        <!-- <block wx:if="{{order_prom}}">
-          <view class="cx-frame flex" style="position: relative; height: auto" >
-            <view class="cx-sizs wsize" style="width: 144rpx">订单优惠</view> -->
-            <!-- 中间显示层 -->
-            <!-- <view class="flex ai-center">
-                  <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image>
-                  <view class="order_hui">
-                      <view class="fs28 ellipsis-1">{{order_prom.name}}</view>
-                      <view class="fs26" >(活动时间：{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}})</view>
-                  </view>
-            </view>
-          </view>
-        </block> -->
-
-
-        <!-- <view class="bz_view flex ai-center bdt16" wx:if="{{bconfig}}" style="line-height: 36rpx">
-          <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
-          <view class="bz-content">{{bconfig.service_bz}}</view>
-        </view> -->
-
-
-        <!--- 搭配促销 ---->
-        <!-- <view class="dp_cx_view" wx:if="{{collocationGoods}}">
-          <view class="bb_view">
-            <view>优惠热配</view>
-            <view class="red_bb" bindtap="go_prom_list">查看全部
-              <text class="bg_jj"></text>
-            </view>
-          </view> -->
-
-          <!-- 搭配的显示 -->
-          <!-- <view class="flex" bindtap="go_prom_list">
-                <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image>
-                <view class="act_content">
-                     <view class="fs32">{{collocationGoods.title}}</view>
-                     <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}}</view>
-                     <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view>
-                     <view class="fs30 color-gray">活动至{{filters.format_time(collocationGoods.end_time,1)}}</view>
-                </view>
-          </view> -->
-        <!-- </view> -->
-
-
-        <!--- 宝贝评价 ---->
-        <!-- <view class="bdt16" style="overflow: hidden">
-          <view class="bb_view">
-            <view>宝贝评价（{{categories3[0].num}}）</view>
-            <view class="red_bb" bindtap="look_pj">查看全部
-              <text class="bg_jj"></text>
-            </view>
-          </view>
-
-          <view class="xc_comment">
-            <view class="xc_comment-have-pictures" data-val="5" bindtap="clik_evaluate">有图({{categories3[1].num}}) </view>
-            <view class="xc_comment-discuss" data-val="2" bindtap="clik_evaluate">好评({{categories3[2].num}}) </view>
-            <view class="xc_comment-discuss" data-val="3" bindtap="clik_evaluate">中评({{categories3[3].num}}) </view>
-            <view class="xc_comment-discuss" data-val="4"bindtap="clik_evaluate">差评({{categories3[4].num}}) </view>
-          </view>
-
-          <scroll-view scroll-x="true" class="pj_scroll">
-						
-							<view class="xc_comment-detail" style="display: inline-block" wx:for="{{fir_comments}}" wx:key="fir_comments">
-							  <view class="xc_comment-left">
-							    <view class="xc_comment-user">
-							      <view class="xc_user-img">
-							        <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
-							      </view>
-							
-							      <view class="xc_user">
-							        <view class="xc_user-name five-level-word">{{item.is_anonymous!=1?item.username:'匿名'}}</view>
-							        <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
-							      </view>
-							    </view>
-							    <view class="xc_comment-font pj_word_size ellipsis-2">
-							     {{item.content?item.content:''}}
-							    </view>
-							    <view class="xc_comment-val">
-							      <view class="xc_comment-time">{{item.add_time}}</view>
-							
-							    </view>
-							  </view>
-							  <view class="xc_goods-img-frame">
-							      <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
-							      <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image>
-							      <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image>
-							  </view>
-							</view>
-						
-          </scroll-view>
-        </view> -->
+            </view> 
+     
         <!-- 图文详情 -->
         <view>
-          <view class="tuwen_title">
+           <view class="tuwen_title">
             <view class="g_line"></view>
             <view class="center_s">
-              <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image>
-              <text>详情</text>
-            </view>
-          </view>
-					<view>{{data.serviceContent}}</view>
-          <!-- <view class="t_g_info">
-            <view class="red_shu"></view>
-            <view class="fs30">商品信息</view>
-          </view> -->
-          <!-- <view class="table_s">
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>商品名称</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.goods_name}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>商品编号</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.goods_sn}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>商品条码</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.sku}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
-              <view class="item_left">
-                <text>品类</text>
-              </view>
-              <view class="item_right">
-                <text>{{cat_name}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
-              <view class="item_left">
-                <text>品牌</text>
-              </view>
-              <view class="item_right">
-                <text>{{brand_name}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
-              <view class="item_left">
-                <text>国别</text>
-              </view>
-              <view class="item_right">
-                <text>{{nation_name}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>规格</text>
-              </view>
-              <view class="item_right">
-                <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
-              </view>
-            </view>
-            <view class="tb_item tb-l">
-              <view class="item_left">
-                <text>上架时间</text>
-              </view>
-              <view class="item_right">
-                <text>{{data.on_time}}</text>
-              </view>
-            </view>
-          </view> -->
-          <!--详情图片-->
-          <!-- <view class="wxParse">
-            <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
-          </view> -->
+              <image src="{{iurl}}/miniapp/images/tuwen_c.png"></image><text>详情</text>
+            </view>
+           </view> 
+		   	   
+		   <view  wx:if="{{service_list}}">
+		       <view class="goods-num" style="font-size: 26rpx; background-color: #f6f5f4;">
+		   	    <view class="stock">项目名称</view>
+		   	    <view class="stock">耗时(分)</view>					
+		   	    <view class="stock">手工费</view>					
+		   	    <view class="stock">次数</view>
+		   	</view>					
+		   	<block wx:for="{{service_list}}">
+		   	   <view class="goods-num" style="margin-bottom: 10rpx;font-size: 22rpx;">
+		   		   <view class="stock">{{item.projectName}}</view>
+		   		   <view class="stock">{{item.timeConsuming}}</view>					
+		   		   <view class="stock">{{item.money}}</view>					
+		   		   <view class="stock">{{item.frequency}}</view>
+		   	   </view>
+		       </block>							
+		   </view>
+		   
+		   <view class="wxParse">
+		     <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
+		   </view>
+          
         </view>
         <!-- 推荐商品 -->
@@ -694,168 +127,19 @@
             </image>
             <view class="xc-recommend-word">推荐</view>
           </view>
-        </view>
-        
+        </view>     
          <goods_recommend id="goods_list"></goods_recommend> -->
       </view>
-      <!------------商品详情图片页面---------------->
-      <!-- <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
-        <view class="table_s">
-          <view class="tb_item tb-l">
-            <view class="item_left">
-              <text>商品名称</text>
-            </view>
-            <view class="item_right">
-              <text>{{data.goods_name}}</text>
-            </view>
-          </view>
-          <view class="tb_item tb-l">
-            <view class="item_left">
-              <text>商品编号</text>
-            </view>
-            <view class="item_right">
-              <text>{{data.goods_sn}}</text>
-            </view>
-          </view>
-          <view class="tb_item tb-l">
-            <view class="item_left">
-              <text>商品条码</text>
-            </view>
-            <view class="item_right">
-              <text>{{data.sku}}</text>
-            </view>
-          </view>
-          <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
-            <view class="item_left">
-              <text>品类</text>
-            </view>
-            <view class="item_right">
-              <text>{{cat_name}}</text>
-            </view>
-          </view>
-          <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
-            <view class="item_left">
-              <text>品牌</text>
-            </view>
-            <view class="item_right">
-              <text>{{brand_name}}</text>
-            </view>
-          </view>
-          <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
-            <view class="item_left">
-              <text>国别</text>
-            </view>
-            <view class="item_right">
-              <text>{{nation_name}}</text>
-            </view>
-          </view>
-          <view class="tb_item tb-l">
-            <view class="item_left">
-              <text>规格</text>
-            </view>
-            <view class="item_right">
-              <text>{{data.goods_spec==""?"规格1":data.goods_spec}}</text>
-            </view>
-          </view>
-          <view class="tb_item tb-l">
-            <view class="item_left">
-              <text>上架时间</text>
-            </view>
-            <view class="item_right">
-              <text>{{data.on_time}}</text>
-            </view>
-          </view>
-        </view>
-
-        <view class="wxParse">
-          <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
-        </view>
-      </view> -->
-      <!---------------评价页面-------------->
-      <!-- <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
-        <view class="topframe">
-          <view class="topframe-top">
-            <view class="topframe-top-content">
-              <view>宝贝评价</view>
-              <view class="topframe-top-val">({{categories3[0].num}})</view>
-            </view>
-            <view class="topframe-praise" wx:if="{{categories3[0].num}}">好评{{ filters.toFix(categories3[2].num/categories3[0].num*100,2) }}%</view>
-            <view wx:else>好评 0%</view>
-          </view>
-          <view class="buttem-list">
-            <view bindtap="tabClick3"  id="{{item.id}}"  wx:for="{{categories3}}" wx:key="categories3" class="item {{activeCategoryId3==item.id?'red':''}}">{{item.name}}({{item.num}})</view>
-          </view>
-        </view>
-
-        <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="{{cIdx}}">
-           <view style='border-bottom:4rpx solid #eee;'>
-          <view class="middle">
-            <view class="middle-img-frame">
-              <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
-              <view class="middle-user-frame">
-                <view class="middle-user">{{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}</view>
-                <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
-              </view>
-            </view>
-            <view class="xc-pirces">
-            <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" >
-              {{item.content?item.content:''}}
-            </view> 
-            </view>
-            <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>全部显示</view>
-            <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co"  catchtap='toggleContent'>收起</view>
-            <view class="img-ul">
-
-              <block wx:if="{{item.source_type==0}}">
-                  <view class="img-li"  wx:for="{{item.img}}" wx:key="{{index}}">
-                    <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}"
-                           data-id="{{index}}" src="{{iurl}}{{item}}"></image>
-                  </view>
-              </block>
-              <block wx:if="{{item.source_type==1}}">
-                  <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
-                     <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}"
-                           data-id="{{index}}" src="{{aitem}}"></image>
-                  </view>
-              </block>
-            </view>
-
-            <view class="z_parameter">
-              <view class="parameter-font">{{item.add_time}}</view>
-              <view class="parameter-dian" bindtap="click_zan" data-com_id="{{item.comment_id}}" data-item_id="{{cIdx}}">
-                <image wx:if="{{item.userZanNum==1}}" class="parameter-img" src="{{iurl}}/miniapp/images/zan_red.png"></image>
-                <image wx:else class="parameter-img" src="{{iurl}}/miniapp/images/dianzan.png"></image>
-                <view class="parameter-val" style='color:{{item.userZanNum==1? "#d60022":"#999" }}' >{{item.zan_num}}</view>
-              </view>
-            </view>
-          
-          </view>
-          <view class="reply rel" wx:if="{{item.replay_list}}">
-            <view class="line_bulge"></view>
-            <view class="shop-reply">店家回复: </view>
-            <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
-              {{r_item.content}}
-            </view>
-          </view>
-          </view>
-        </block>
-        <block wx:if="{{(!comments || comments.length==0) && get_c }}">
-             <text class="no_pj_list">暂无评价</text>
-        </block>
-        <block wx:if="{{comments.length>10 && comments_no_more}}">
-          <text class="no_pj_list">已经加载到底部</text>
-        </block>
-      </view> -->
-    </view>
+	</view>
   </view>
   <!---滚动到顶部---->
   <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
     <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
   </view>
-  <!-------------------底部按钮-------------------->
+  <!-- 底部按钮 -->
   <view class="join-cart">
 	<!-- bindtap="contactService" -->  	  
     <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
@@ -867,11 +151,6 @@
 		<view>客服</view>
 	</view>
-    <view bindtap="collectGoods" class="custom-service cart-ico new_split">
-      <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
-      <image hidden="{{!is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart-h.png"></image>
-      <view>收藏</view>
-    </view>
     <view class="shopping-cart cart-ico new_split">
       <navigator open-type="switchTab" url="/pages/cart/cart/cart">
         <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
@@ -879,429 +158,148 @@
         <view>购物车</view>
       </navigator>
     </view>
-    <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
-
-    <!-- 普通商品购买 -->
-    <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3}}">
-
-    <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
-		<!-- <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}"> -->
+ 
     <block>
-      <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
-      <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
-    </block>
-    <!-- <block wx:else>
-      <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view>
-    </block> -->
-
+      <!-- <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> -->
+      <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn" style="width: 64%; border-radius: 56rpx;">立即购买</view>
     </block>
-
-    <!-------秒杀-------->
-    <!-- <block wx:if="{{prom_type==1}}">
-      <block wx:if="{{prom_st==1 && !prom_r_null}}">
-        <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
-        <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
-      </block>
-      <block wx:if="{{prom_st==0 && !prom_r_null}}">
-        <view class="buy-btn cart-btn cart-btn-lg lanse set_width">即将开始</view>
-      </block>
-      <block wx:if="{{prom_r_null}}">
-        <view class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view>
-      </block>
-      <block wx:if="{{prom_st==3 && !prom_r_null}}">
-        <view class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view>
-      </block>
-    </block> -->
-
-    <!-------拼单-------->
-    <!-- <block wx:if="{{prom_type==6}}"> -->
-      <!-- <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">
-        <view class="fir-v"> -->
-			<!-- ￥{{data.shop_price,2)}} -->		
-			<!-- <block wx:if="{{card_field && sele_g[card_field]>0}}">
-				{{filters.toFix(sele_g[card_field],2)}}
-			</block> 		 
-			<block wx:else>
-				{{filters.toFix(sele_g.shop_price,2)}}
-			</block>	 		
-		</view>
-        <view>单独购买</view>
-      </view> -->
-
-      <!-- <block wx:if="{{user_order_pt_state==0}}"> -->
-        <!----商家团---->
-        <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h">
-          <view class="fir-v">￥{{prom_act.price}}</view>
-          <view>去参团</view>
-        </view> -->
-        <!----会员团---->
-        <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h"> -->
-            <!--<view class="fir-v">￥{{prom_act.price}}</view>-->
-            <!-- <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}">
-              <view>一键开团</view>
-              <view wx:if="{{prom_act.tz_yhjgtype==3}}">佣金<text style="font-size: 23rpx">￥</text>{{filters.toFix(prom_act.tz_yyhjg,2)}}</view>
-              <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view>
-            </view>
-            <view  wx:else>
-               <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view>
-               <view>一键开团</view>
-          </view> -->
-
-        <!-- </view> -->
-        <!---阶梯团---->
-        <!-- <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
-          <view class="fir-v">￥{{filters.toFix(prom_act.yf_price,2)}}</view>
-          <view>支付定金</view>
-        </view>
-          
-        <view wx:if="{{prom_st==0}}" class="buy-btn cart-btn lanse">即将开始</view>
-        <view wx:if="{{prom_r_null}}" class="buy-btn cart-btn huise">已抢光</view>
-        <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view>
-      </block>
-      <block wx:else>
-        <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise">您还未支付</view>
-        <view bindtap="go_to_team_show" wx:if="{{user_order_pt_state==2}}" class="buy-btn cart-btn">查看支付详情</view>
-        <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk"  class="buy-btn cart-btn">支付尾款</view>
-      </block> -->
-    <!-- </block> -->
-	
-	
-	<!-------积分购-------->
-	<!-- <block wx:if="{{prom_type==4}}">
-		
-	  <block wx:if="{{is_shopbuy}}">	 		
-		  <view bindtap="go_pay_integral_normal" class="join-btn cart-btn line-h">
-			<view class="fir-v">	
-				<block wx:if="{{card_field && sele_g[card_field]>0}}">
-					{{filters.toFix(sele_g[card_field],2)}}
-				</block> 		 
-				<block wx:else>
-					{{filters.toFix(sele_g.shop_price,2)}}
-				</block>	 		
-			</view>
-			<view>单独购买</view>
-		  </view>  
-		  <view bindtap="go_pay_integral"  class="buy-btn cart-btn" wx:if="{{can_integral}}" >立即兑换</view>	
-		  <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else >积分不足</view>	
-	  </block>
-	  
-	   <block wx:else>	 
-			<view bindtap="go_pay_integral"  class="buy-btn-all cart-btn"  style="width: 58%; margin-left:1%;"  wx:if="{{can_integral}}" >立即兑换</view>
-			<view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else >积分不足</view>	   
-	   </block>
-	  
-	</block> -->
-		
-    <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view>-->
+ 
   </view>
   <!--  制作一个圆球导航  -->
   <nav_box></nav_box>
-
 </block>
-<!----弹起来,选择规格数量,普通商品购买和秒杀------>
+<!-- 弹起来,选择规格数量,普通商品购买和秒杀 -->
 <view hidden="{{!openSpecModal}}">
   <view bindtap="closeSpecModal" class="cover-layer"></view> 
   <view class="spec-model">
     <view class="pding"> 
       <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
       <view class="spec-goods">
-        <image class="wh100 spec-img" src="{{iurl + data.image_url}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"/>
+        <image class="wh100 spec-img" src="{{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}}" binderror="pop_err_img" data-errorimg="data.image_url"/>
         <view class="spec-goods-info">
-					<view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
-          <!-- <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view> -->
-          <view class="flex ai_end xc-val-money" >
-              <view class="spec-goods-price" wx:if="{{prom_price==null}}" >			  
-			    <text class="fs20">￥</text>
-		        <!-- 如果是等级会员，且有等级价 -->
-			 	<block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> 		 
-			 	<!-- <block wx:else>{{sele_g.shop_price}}</block> -->
-				<block wx:else>{{data.shop_price}}</block>
-		      </view>
-              <view class="spec-goods-price" wx:else><text class="fs20">￥</text>{{prom_price}}</view>
-			  <!-- 显示线下价格 -->
-			  <!-- <view wx:if="{{sele_g.offline_price}}" class="quan_price flex ai-center jc-center">
-				 券后￥<text class="fs32">{{sele_g.offline_price}}</text>
-			  </view> -->
-         </view>
-       
-          <!-- <block wx:if="{{prom_type==0}}">
-              <view class="flex">
-                <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-		      	<block wx:if="{{sales_rules==2}}">		
-                  <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
-				  <view class="spec-goods-stock" wx:else>可售:0</view>
-		    	</block>
-			    <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>       
-              </view>
-          </block> -->
-          <!-- <block wx:if="{{prom_type==1}}">
-             <view class="flex">
-                <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num+prom_act.virtual}}</view>
-                <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
-                <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>         
-             </view>
-          </block> -->
-        </view>
-
-        <!-- 选择门店模块 -->
-         <!-- <view  class="flex-space-between address ai_end xc-width ">
-
-                     <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-                       <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-                         <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
-                          距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-                         
-                          </view>
-                     </view> -->
-					 
-                     <!-- 没有门店的时候 -->
-                     <!-- <view  class="flex" bindtap="choice_store" wx:else>
-                           <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                           <view class="fs30" style="color:black;">选择门店</view>						  
-                      </view>
-
-                      <view class="red-co fs28" bindtap="choice_store" >
-                         更多门店
-                         <text class="right-arrow"></text>
-                      </view>
-                   </view> -->
-				   <!-- <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-				   <block wx:else>
-				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-						 <block wx:else>
-							  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
-						 </block>				       
-				   </block> -->
-				   	   
-                   <!-- <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view> -->
-         </view>
+			<view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>      
+            <view class="flex ai_end xc-val-money" >
+                <view class="spec-goods-price"><text class="fs20">￥</text><block wx>{{data.shop_price}}</block></view>
+            </view>
+        </view> 
+       </view>
+	   
+	   <!-- 选择门店模块 -->
+	   <view  class="flex-space-between address ai_end xc-width" style="margin-top: 30rpx;">   
+	                <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+	                  <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
+	                    <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
+	                     距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+	                    
+	                     </view>
+	                </view>
+	   			 
+	                <!-- 没有门店的时候 -->
+	                <view  class="flex" bindtap="choice_store" wx:else>
+	                      <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+	                      <view class="fs30" style="color:black;">选择门店</view>						  
+	                 </view>
+	   
+	                 <view class="red-co fs28" bindtap="choice_store" >
+	                    更多门店
+	                    <text class="right-arrow"></text>
+	                 </view>
+	              </view>
+	   		   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+	   		   <block wx:else>
+	   		         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+	   				 <block wx:else>
+	   					  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(该门店无此项目)</view>
+	   			     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
+	   				 </block>				       
+	   		   </block>
+	   		   	   
+	           <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
+	    </view>
-       <!--商品的属性项目-->
-        <!-- <view  class="xc-goods-attribute">
-            <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
-            <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
-             <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
-                {{item.gg}}
-              </view>
-           </view>
-        </view> -->
-  
+    
-        <view class="b_num">
+       <view class="b_num">
           <view>购买数量</view>
           <view class="count">
-            <view bindtap="subCartNum" class="sub">-</view>
-            <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
-            <view bindtap="addCartNum" class="add">+</view>
+             <view bindtap="subCartNum" class="sub">-</view>
+             <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
+             <view bindtap="addCartNum" class="add">+</view>
           </view>
-        </view>
-		
-		<!-- 提示再买多少优惠 -->
-		<!-- <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition && openSpecModal_ind==2}}">
-			再买{{hui_condition.need}}
-			<text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
-			<text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
-			<text wx:if="{{hui_condition.past==1}}">，包邮</text>
-			<text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
-			<text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
-			<text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
-			<text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
-		</view> -->
-	
-		
-      </view>
-       <!-- <view class="spec-cart-btns">	 -->
-	       <!-- <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> -->
-		   <!-- <block wx:else> -->
+       </view>
+      
+	  
-			   <!-- 根本就找不到门店 -->
-			   <!-- <block wx:if="{{!only_pk && !def_pickpu_list}}">
-				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
-			   </block> -->		 
-			   <!-- <block wx:else>
-			   
-						  
-				  <block wx:if="{{only_pk.length && !only_pk.length}}">
-					   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
-				  </block>  	  
-				  <block wx:else>
-					  <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
-						   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-					 </block>
-					 <block wx:else>
-						 <block wx:if="{{!def_pick_store}}">
-							 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
-						 </block>					 
-						 <block wx:else> -->	 						 						  
-							 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-							 <!-- <block wx:if="{{sales_rules==2 && prom_type==0}}">
-								 <block wx:if="{{!def_pick_store.CanOutQty}}">
-									   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>						 
-								 </block>
-								 <block wx:else>
-									  <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
-										   class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-									  <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" 
-										   class="spec-cart-btn spec-buy" data-action="buy">
-										   {{sele_g.offline_price?"券后购买":"立即购买"}}										   
-									  </view> 
-								 </block>			 
-							 </block> -->
-							 <!-- 线上销售 -->
-							 <!-- <block wx:else>
-								 <block wx:if="{{sele_g.store_count<=0}}">
-									  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
-								 </block>
-								 <block wx:else>
-									 <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
-										 class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-									 <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
-										 class="spec-cart-btn spec-buy" data-action="buy">
-										 {{sele_g.offline_price?"券后购买":"立即购买"}}
-									</view> 
-								 </block>
-							 </block> -->
-						 <!-- </block> -->									 
-					 <!-- </block>
-			  </block>  			
-			   </block>				   
-    
-	       </block>
-	 </view> -->
+	  <view class="spec-cart-btns">	
+	           <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" 
+			          style="background-color: #dcdcdc;color: #999;">该门店无此项目</view>
+	  		   <block wx:else>
+	  
+	  			   <!-- 根本就找不到门店 -->
+	  			   <block wx:if="{{!only_pk && !def_pickpu_list}}">
+	  				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
+	  			   </block>		 
+	  			   <block wx:else>
+	  			   
+	  						  
+	  				  <block wx:if="{{only_pk.length && !only_pk.length}}">
+	  					   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
+	  				  </block>  	  
+	  				  <block wx:else>
+	  					  <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+	  						   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
+	  					 </block>
+	  					 <block wx:else>
+	  						 <block wx:if="{{!def_pick_store}}">
+	  							 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
+	  						 </block>					 
+	  						 <block wx:else>	 						 						  
+	  							 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
+	  							 <block wx:if="{{sales_rules==2 && prom_type==0}}">
+	  								 <block wx:if="{{!def_pick_store.CanOutQty}}">
+	  									   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>						 
+	  								 </block>
+	  								 <block wx:else>
+	  									  <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
+	  										   class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
+	  									  <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" 
+	  										   class="spec-cart-btn spec-buy" data-action="buy">
+	  										   {{sele_g.offline_price?"券后购买":"立即购买"}}										   
+	  									  </view> 
+	  								 </block>			 
+	  							 </block>
+	  							 <!-- 线上销售 -->
+	  							 <block wx:else>
+	  								 <block wx:if="{{sele_g.store_count<=0}}">
+	  									  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
+	  								 </block>
+	  								 <block wx:else>
+	  									 <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
+	  										 class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
+	  									 <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
+	  										 class="spec-cart-btn spec-buy" data-action="buy">
+	  										 {{sele_g.offline_price?"券后购买":"立即购买"}}
+	  									</view> 
+	  								 </block>
+	  							 </block>
+	  						 </block>									 
+	  					 </block>
+	  			  </block>  			
+	  			   </block>				   
+	      
+	        </block>
+	  </view>
+	  
+       
       <view class="clear"></view>
-      <!---选择门店的列表--->
-      <view hidden="{{ismend==0}}" class="sto_v">
-        <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend">
-          <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>选择门店
-        </view>
-        <!-----第一级显示------>
-        <!-- <view class="itemlists" hidden="{{is_sec_mend==1}}">
-          <block wx:if="{{is_show_sto_cat}}">
-            <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view>
-          </block>
-          <block wx:else>
-            <view wx:for="{{only_pk}}" wx:key="only_pk" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}}</view>
-          </block>
-        </view> -->
-        <!-----第二级显示------>
-        <!-- <view class="stitle" hidden="{{is_sec_mend==0}}" bindtap="hide_sec_mend">
-          <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>{{sec_sto.name}}
-        </view> -->
-        <!-- <view class="itemlists" hidden="{{is_sec_mend==0}}">
-          <view wx:for="{{sec_sto.s_arr}}" wx:key="{{index}}" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}}
-          </view>
-        </view> -->
-      </view>
+      
     </view>   
 </view>
-<!--  弹起来,购买积分购  -->
-<!-- <view hidden="{{!openSpecModal_inte}}">
-    <include src="buy_integral.wxml" />
-</view>	 -->
-<!--  弹起来,购买积分购的普通购买  -->
-<!-- <view hidden="{{!openSpecModal_inte_normal}}">
-    <include src="buy_integral_normal.wxml" />
-</view>	 -->
-
-<!----弹起来,选择规格数量,拼单商品购买------>
-<!-- <view hidden="{{!openSpecModal_pt}}">
-    <include src="buy_pt.wxml" />
-</view> -->
-<!----弹起来优惠信息------>
-<!-- <view hidden="{{!openPromModal}}">
-  <view bindtap="closePromModal" class="cover-layer"></view>
-  <view class="prom-model">
-    <icon bindtap="closePromModal" class="modal-close" color="gray" size="22" type="cancel"></icon>
-    <view class="prom-title">优惠信息</view>
-    <view class="logistics-item" wx:for="{{select.activity.data}}" wx:key="{{index}}">
-      <view class="item-title">
-        <text class="prom-item">{{item.title}}</text>
-      </view>
-      <view class="item-mes ellipsis-1">{{item.content}}</view>
-    </view>
-  </view>
-</view> -->
-<!----弹起的---->
-<!-- <block wx:if="{{pd_xx==1}}">
-  <view class="bview"></view>
-  <view class="juzhong">
-    <view class="xq">
-      <view class="title" bindtap="close_pt_xx">拼团玩法介绍
-        <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image>
-      </view>
-      <view>1.开团：
-        <text class="hs1">选择心仪商品，点击“发起X人团”按钮，付款后即为开团成功；</text>
-      </view>
-      <view>2.参团：
-        <text class="hs1">进入朋友分享的页面，点击“立即参团”按钮，付款后即为参团成功，若多人同时支付，支付成功时间较早的人获得参团资格；</text>
-      </view>
-      <view>3.成团：
-        <text class="hs1">在开团或参团成功后，点击“邀请小伙伴参团”将页面分享给好友，在有效时间内凑齐人数即为成团，此时商家会开始发货；</text>
-      </view>
-      <view>4.组团失败：
-        <text class="hs1">在有效时间内未凑齐人数，即为组团失败，此时付款项会原路退回到支付账户；</text>
-      </view>
-      <view>5.
-        <text class="hs1">组团有效期间内，拼购商品订单不允许取消。 </text>
-      </view>
-    </view>
-  </view>
-</block> -->
-<!----弹起领券---->
-<view wx:if='{{coupon==1}}'>
-  <view class="cover-layer flex-center" data-coupon='0' bindtap="switchCoupon"></view>
-  <view class="cx-popup {{coupon== true ? 'up' : 'down'}} ">
-    <!-- <view class="top-frame">
-      <view class="top two-level-word t-c">
-        优惠券领取
-      </view>
-    </view> -->
-    <!-- <view class="top-frame">
-      <view class="xc-valid-coupon four-level-word">可以领优惠券</view>
-    </view> -->
-    <view class="xc-frame">
-      <view class="top-frame">
-        <view class="xc-coupon-frame">
-            <!---单张的券--->
-            <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}">
-              <view class="coupon flex">
-                <view class="circle xc-circular-one"></view>
-                <view class="xc-coupon-left ">
-                  <view class="flex xc-money-frame">
-                    <view class=" xc-money two-level-word  xc-rmb">￥</view>
-                    <view class="one-level-word xc-money">{{item.money}}</view>
-                  </view>
-                  <view class="xc-money four-level-word  xc-spacing">
-                    满{{item.condition}}元可用
-                  </view>
-                </view>
-                <view class="xc-coupon-right flex">
-                  <view class="xc-detail-coupon">
-                    <view class="four-level-word">订单金额满{{item.condition}}元可用</view>
-                    <view class="four-level-word xc-below">{{item.start}}-{{item.end}}</view>
-                  </view>
-                  <view class="flex-vertical">
-                  <view class="three-level-word xc-get background  {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}"
-                          data-ind="{{index}}"  data-cid="{{item.id}}" bindtap="get_quan">{{ item.linging==1?'领取中':'领取'}}</view>
-                  </view>
-                </view>
-                <view class="circle xc-circular-two"></view>
-              </view>
-            </view>
-        </view>
-      </view>
-    </view>
-    <view class="cx-confirm flex-center" data-coupon='0' bindtap="switchCoupon">
-      <view  class="confirm t-c">确定</view>
-    </view>
-  </view>
-</view>
 <!-- 选择门店的弹框，1.1版最新的 -->
 <block wx:if="{{store==1}}">
@@ -1458,14 +456,9 @@
  <view class="poster-container">
   <view class="poster-wrapper">
    <view class="poster">
-   <!-- <view class="poster" bindtap="previewImage"> -->
-    <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
-    <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
-   </view>
-   <!-- <view class="btn-container">
-    <button class="btn-share" open-type="share" bindtap="">微信好友分享</button>
-    <button class="btn-share" bindtap="savePic">保存到相册</button>
-   </view> -->
+        <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
+        <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
+   </view>  
   </view>
  </view>
 </view>
@@ -348,11 +348,11 @@ image {
 }
 .join-cart>view {
-    width: 29%;
+    width: 32%;
 }
 .join-cart>.new_split {
-    width: 13%;
+    width: 17%;
     text-align: center;
     padding: 0;
     margin: 0;
@@ -2732,4 +2732,5 @@ button.custom-service::after{
 } 
 .quan_price{
 	background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx;
-}
 \ No newline at end of file
+}
+.stock{ width: 25%; height: 60rpx; border: 1rpx solid #eee; text-align: center; line-height: 60rpx;}
 \ No newline at end of file
@@ -95,6 +95,13 @@ Page({
   /*** 生命周期函数--监听页面显示***/
   onShow: function () {
 	 var th=this;
+	 
+	 
+	 this.setData({
+		//用来判断是否是分销商，是分销商才显示分成佣金
+		is_distribut: app.globalData.userInfo.is_distribut
+	 });
+	 
      getApp().getConfig2(function(rs){
      			  //计算等级价相关
      			  var swithc_list=rs.switch_list;
@@ -77,7 +77,7 @@
 					<view class="flex jc_sb fs24 pdt14">
 						<view class="gray">已售：<text class="red">{{item.sales_sum}}</text></view>
-						<view class="gray">分成金额：						 
+						<view class="gray" wx:if="{{is_distribut}}">分成金额：						 
 						      <text wx:if="{{!pattern}}" class="red">￥{{item.commission}}</text>						 
 							  <text wx:else class="red">￥{{item.fir_rate+item.sec_rate+item.thi_rate}}</text> 	 						
 						</view>
@@ -113,7 +113,9 @@ Page({
       "storageId": storageId,
       "storeId": storeId,
       "userId": userId,
-      "validay": validay
+      "validay": validay,
+      "isxz": 1
+
     }
     var data = JSON.stringify(json);
     wx.request({
@@ -130,47 +132,47 @@ Page({
         wx.hideLoading();
         if (res.data.code == 0) {
           getApp().my_warnning("预约成功", 1, th);
-          var store_name = th.data.store_name; //预约门店
+        //  var store_name = th.data.store_name; //预约门店
           var number = res.data.data.Number;
-          var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口     
-          var userinfo = getApp().globalData.userInfo;
-          var name = d.userInfo.nickname;
-          var json = {
-            // "formId": formid,
-            "keyWord": [{
-                "keyword": res.data.data.ServiceName
-              },
-              {
-                "keyword": time.substring(0, 16)
-              }, {
-                "keyword": res.data.data.BeauticianName
-              }, {
-                "keyword": res.data.data.StorageName
-              }, {
-                "keyword": res.data.data.Address
-              }
-            ],
-            "page": "/packageA/pages/my_service/tment_details?number=" + number,
-            "storeId": a.stoid,
-            "typeId": "1011",
-            "userId": th.data.options.userid
-          };
-          var data = JSON.stringify(json);
-          //调用发送预约成功模版接口
-          wx.request({
-            url: th.data.inurl + temp_url,
-            data: data,
-            method: 'post',
-            header: {
-              'content-type': 'application/json'
-            }, // 设置请求的 header
-            success: function(data) {}
-          })
-          setTimeout(function() {
+         // var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口     
+          //var userinfo = getApp().globalData.userInfo;
+          //var name = d.userInfo.nickname;
+          // var json = {
+          //   // "formId": formid,
+          //   "keyWord": [{
+          //       "keyword": res.data.data.ServiceName
+          //     },
+          //     {
+          //       "keyword": time.substring(0, 16)
+          //     }, {
+          //       "keyword": res.data.data.BeauticianName
+          //     }, {
+          //       "keyword": res.data.data.StorageName
+          //     }, {
+          //       "keyword": res.data.data.Address
+          //     }
+          //   ],
+          //   "page": "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid,
+          //   "storeId": a.stoid,
+          //   "typeId": "1011",
+          //   "userId": th.data.options.userid
+          // };
+          // var data = JSON.stringify(json);
+          // //调用发送预约成功模版接口
+          // wx.request({
+          //   url: th.data.inurl + temp_url,
+          //   data: data,
+          //   method: 'post',
+          //   header: {
+          //     'content-type': 'application/json'
+          //   }, // 设置请求的 header
+          //   success: function(data) {}
+          // })
+   
             wx.redirectTo({
-              url: "/packageA/pages/my_service/tment_details?number=" + number
+              url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid,
             });
-          }, 1000);
+        
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
           th.settime();
@@ -237,40 +239,42 @@ Page({
       wx.showLoading({
         title: '加载中',
       })
-      if (th.ver(version, '7.0.4') >= 0) {
-        //获取模版id
-        getApp().request.promiseGet(temp_url, {
-          data: {
-            store_id: a.stoid,
-            typeid: "1011"
-          }
-        }).then(res => {
-          if (res.data.code == 0 && res.data.data.pageData.length > 0) {
-            template_id = res.data.data.pageData[0].template_id;
-            // //授权订阅
-            wx.requestSubscribeMessage({
-              tmplIds: [template_id],
-              success(res) {
-                th.success();
-              },
-              fail(res) {
-                th.success();
-              }
-            })
-          } else {
-            th.success();
-          }
-        })
-      } else {
-        // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示
-        wx.showModal({
-          title: '提示',
-          content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
-        })
-        th.setData({
-          is_sub: 0
-        })
-      }
+
+      th.success();
+      // if (th.ver(version, '7.0.4') >= 0) {
+      //   //获取模版id
+      //   getApp().request.promiseGet(temp_url, {
+      //     data: {
+      //       store_id: a.stoid,
+      //       typeid: "1011"
+      //     }
+      //   }).then(res => {
+      //     if (res.data.code == 0 && res.data.data.pageData.length > 0) {
+      //       template_id = res.data.data.pageData[0].template_id;
+      //       // //授权订阅
+      //       wx.requestSubscribeMessage({
+      //         tmplIds: [template_id],
+      //         success(res) {
+      //           th.success();
+      //         },
+      //         fail(res) {
+      //           th.success();
+      //         }
+      //       })
+      //     } else {
+      //       th.success();
+      //     }
+      //   })
+      // } else {
+      //   // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示
+      //   wx.showModal({
+      //     title: '提示',
+      //     content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
+      //   })
+      //   th.setData({
+      //     is_sub: 0
+      //   })
+      // }
     }
   },
@@ -579,14 +583,16 @@ Page({
 							UserCode: th.data.options.usercode,
 					  }
 					}).then(res => {
-					  console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
+					    console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode);
 						if(res.data.data.Tech) {
-							th.setData({
+							
+							var data={
 								store_name: res.data.data.StorageName,
 								beautician_name: res.data.data.StaffName,
 								beauticianID: res.data.data.StaffId,
 								StorageId: res.data.data.StorageId,
-							});
+							}
+							th.check_firleader(data);							
 						}
 					});
@@ -670,4 +676,75 @@ Page({
   //   var nav_b = th.selectComponent("#nav_b"); //组件的id
   //   nav_b.close_box();
   // }
+ 
+  //判断分享的导购是不是有门店，是不是该门店下又该会员 
+  check_firleader(data){
+	  var th=this;
+	  var itemId = this.data.itemId; //服务id
+	  var url = "/api/weshop/marketing/reservation/storage/pagenew";
+	  var key_word = data.store_name;
+	  key_word = key_word.replace(/\s+/g, "");
+	  getApp().request.promiseGet(url, {
+	    data: {
+	  	  userId: th.data.options.userid,  
+	      storeId: os.stoid,
+	      serviceId: itemId,
+	      latitude: th.data.lat,
+	      longitude: th.data.lon,
+	      page: 1,
+	      pageSize: 1000,
+	      keyWord: key_word
+	    }
+	  }).then(res => {
+		    //-- 如果是门店的话 --
+		    if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+				var store_data=null;
+				for(var i in res.data.data.pageData){
+					var it=res.data.data.pageData[i];
+					if(it.Id==data.StorageId){
+						store_data={
+							store_name: data.store_name,
+							StorageId: data.StorageId,
+						};
+						break;
+					}
+				}	
+				if(!store_data) return false;
+				th.setData(store_data)
+											
+			}else{
+				return false;
+			}
+			
+		   //导购接口地址	
+		   var url = "/api/weshop/marketing/reservation/staff/pagenew"; 	
+		   return  getApp().request.promiseGet(url, {
+			    isShowLoading:1,
+				data: {
+				  storeId: os.stoid,
+				  userId: th.data.options.userid,
+				  serviceId: itemId,
+				  storageId: data.StorageId
+				}
+			  })
+	  }).then(res=>{
+		  if (res && res.data && res.data.code == 0) {
+			  var beautician_list=res.data.data;
+			  for(var i in beautician_list){
+				  var item=beautician_list[i];
+				  if(item.staffid==data.beauticianID){
+					  th.setData({
+						 beautician_name:data.beautician_name,
+						 beauticianID:data.beauticianID, 
+					  })
+					  break;
+				  }
+			  }
+			  
+		  }
+	  })
+  }
+  
+  
+  
 })
 \ No newline at end of file
@@ -163,9 +163,10 @@ Page({
       var json = {
         "arrangeTime": time,
         "number": th.data.number,
-        "remark": "更改时间",
+        "remark": "更改预约时间",
         "states": 0,
         "storeId": a.stoid,
+        "isxz": 1
       };
       var data = JSON.stringify(json);
       var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
@@ -369,6 +370,7 @@ Page({
       "remark": "更改预约时间",
       "states": 0,
       "storeId": a.stoid,
+      "isxz": 1
     };
     var data = JSON.stringify(json);
     var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
@@ -86,8 +86,8 @@
     <view class="flex-level">
       <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
     </view>
-    <!-- <view class="flex-level fs30 xc-ash">暂无服务项目</view> -->
-		<view class="flex-level fs30 xc-ash">暂无服务卡项，<text class="ctb" data-url="/packageA/pages/cardList/cardList" bindtap="goto">立即购买！</text></view>
+    <view class="flex-level fs30 xc-ash">暂无服务项目</view>
+		<!-- <view class="flex-level fs30 xc-ash">暂无服务卡项，<text class="ctb" data-url="/packageA/pages/cardList/cardList" bindtap="goto">立即购买！</text></view> -->
     <view class="flex-level">
       <navigator data-url="/pages/user/index/index" bindtap="goto">
         <view class="flex-center fs28 white">回到首页</view>
@@ -36,7 +36,8 @@ Page({
         var json = {
           "number": number,
           "storeId": a.stoid,
-          "states": states
+          "states": states,
+          "isxz": 1
         };
         var data = JSON.stringify(json);
         var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
@@ -69,6 +70,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+	  
+	 console.log("预约详情"); 
+	 console.log(options); 
+	  
     var th = this;
     th.setData({
 			options,
+var WxParse = require('../../../utils/wxParse/wxParse.js');
+
+const app =  getApp();
+let self = null;
+let content_privacy = `<div>
+            <p class="tac font16"><b>隐私政策</b><br /><br /></p>
+            <p>美得得（以下或称“我们”）将按法律法规要求，采取相应安全报货措施，尽力保护您的个人信息安全可控。有鉴于此，我们制定本《隐私政策》（下称“本政策”）并提醒你： </p>
+            <p>本政策适用于美得得产品及服务。如我们关联公司的产品或服务中使用了美得得提供的产品或服务但未设独立的隐私政策的，则本政策同样适用于该部分产品或服务。 </p>
+            <p>需要特别说明的是，<strong><u>本隐私政策不适用于其他第三方通过前述网页或客户端或者小程序或公众号等向您提供服务。例如您通过美得得使用第三方应用或者服务，或第三方服务和产品依托美得得产品向您提供服务时，您向第三方提供的信息不适用本政策。</u></strong><strong><u> </u></strong></p>
+            <p>在使用美得得产品或服务前，请您务必仔细查阅并透彻理解本政策，再确认充分理解并同意后使用相关产品或服务，如您对本隐私政策有任何疑问，您可以通过我们公布的联系方式与我们联系。<strong><u>一旦您开始使用美得得产品或服务，即表示您已同意我们按照本隐私政策来收集、处理、存储、使用、共享和保护您的个人信息。</u></strong><strong><u> </u></strong></p>
+            <p>第一部分定义</p>
+            <p>个人信息：指以电子或者其他方式记录的能够单独或者与其他信息结合识别特定自然人身份或者反映特定自然人活动情况的各种信息。</p>
+            <p>个人敏感信息：包括身份证件号码、手机号码、个人生物识别信息、银行账号、财产信息、行踪轨迹、交易信息、14岁以下（含）儿童的个人信息等。</p>
+            <p>个人信息删除：指在实现日常业务功能所涉及的系统中去除个人信息的行为，使其保持不可被检索、访问的状态。</p>
+            <p>第二部分 隐私政策 <br />
+                1、我们如何收集和使用您的个人信息； <br />
+                2、我们如何使用 Cookie 和同类技术； <br />
+                3、我们如何共享、转让、公开披露您的个人信息； <br />
+                4、我们如何保护您的个人信息； <br />
+                5、您如何行使您的个人信息权利； <br />
+                6、我们如何处理儿童的个人信息； <br />
+                7、您的个人信息如何在全球范围转移； <br />
+                8、本政策如何更新； <br />
+                9、如何联系我们。 </p>
+            <p>一、我们如何收集和使用您的个人信息 <br />
+                我们会出于本政策所述的以下目的，收集和使用您的个人信息： </p>
+            <p>（一）提供账号服务 <br />
+                为了遵守法律法规的要求，以及向您提供更个性化、更便捷的服务，我们需要识别您的身份，<strong><u>当您注册我们的账户及您在使用我们的相关服务时，需要您授权您的微信或微博等第三方账号的ID及头像和昵称，您需要填写、提交及/或以其他任何方式提供您的个人信息，包括但不限于您的姓名、性别、出生年月日、身份证号码、电话号码、电子邮箱、收货地址及相关附加信息（如您地址中的所在省份和城市、邮政编码等）、银行账户或其他支付工具的账户信息等。</u></strong>如果您仅需使用浏览、搜索等基本服务，您不需要注册成为我们的账号及提供上述信息。如您不提供真实姓名、性别、出生年月日、身份证号码、电话号码、电子邮箱也不影响您使用美得得的服务进行基本浏览、搜索、购买功能等服务。 </p>
+            <p>（二）为您展示或推送商品或服务 <br />
+                <strong><u>为给您提供更好的交易服务，我们会根据您的浏览及搜索记录、设备信息、位置信息、订单信息、及可能的个人身份信息，提取您的浏览、搜索偏好、行为习惯、位置信息等特征，基于特征标签进行间接人群画像并展示、推送信息。</u></strong>如您不想接受我们给您发送的商业广告，您可通过短信提示回复退订或我们提供的其他方式进行退订。 </p>
+            <p>（三）向您提供商品或服务 <br />
+                <strong><u>1、您向我们提供的信息</u></strong><strong><u> </u></strong><br />
+                <strong><u>为便于向您提供我们的产品或服务，我们会记录您提供的收货人姓名、收货地址、邮政编码、收货人联系电话。为完成交易，我们将搜集您的支付信息，以便我们了解您的支付状态。</u></strong><strong><u> </u></strong><br />
+                   
+                您可以通过美得得为其他人订购商品或服务或要求其他人帮您付款，您需要提供该实际订购人的前述个人信息或提供代付人的支付信息或手机号码。向美得得提供这些个人信息之前，您需确保您已经取得其授权同意。 <br />
+                <strong>2、我们在您使用服务过程中收集的信息</strong><strong> </strong><br />
+                      
+                为向您提供更契合您需求的页面展示和搜索结果、了解产品适配性、识别账户异常状态，我们会收集关于您使用的服务以及使用方式的信息并将这些信息进行关联，这些信息包括： <br />
+                     
+                设备信息：我们会根据您在软件安装及使用中授予的具体权限，接收并记录您所使用的设备相关信息（例如设备型号、操作系统版本等软硬件特征和设备环境信息）、设备所在位置相关信息（例如IP 地址、GPS位置以及能够提供相关信息的Wi-Fi 接入点、蓝牙和基站等传感器信息）。 <br />
+                      
+                日志信息：当您使用我们的网站或客户端提供的产品或服务时，我们会自动收集您对我们服务的详细使用情况，作为有关网络日志保存。例如您的IP地址、浏览器的类型、电信运营商、使用的语言、访问日期和时间及您访问的网页记录等。 <br />
+                <strong><u>请注意，单独的设备信息、日志信息等是无法识别特定自然人身份的信息。</u></strong>如果我们将这类非个人信息与其他信息结合用于识别特定自然人身份，或者将其与个人信息结合使用，则在结合使用期间，这类非个人信息将被视为个人信息，除取得您授权或法律法规另有规定外，我们会将该类个人信息做匿名化、去标识化处理。 <br />
+                为展示您账户的订单信息，我们会收集您在使用我们服务过程中产生的订单信息用于向您展示及便于您对订单进行管理。 <br />
+                <strong><u>当您与我们联系时，我们可能会保存您的通信/通话记录和内容或您留下的联系方式等信息，以便与您联系或帮助您解决问题，或记录相关问题的处理方案及结果。</u></strong><strong><u> </u></strong><br />
+                <strong>3、我们通过间接获得方式收集到的您的个人信息</strong><strong> </strong><br />
+                为确认交易状态及为您提供售后与争议解决服务，我们会通过您基于交易所选择的交易对象、交易方式、支付机构、物流公司等收集与交易进度相关的您的交易、支付、物流信息，或将您的交易信息共享给上述服务提供者。 <br />
+                您可通过我们提供的链接入口使用美得得账户登录我们关联公司或者合作公司提供的产品或服务，包括来自微信、微博、快手、小程序等的信息。 <br />
+                <strong><u>您在使用第三方服务时，可以直接使用第三方服务时直接跳转到我们提供服务的页面，如您进行了除浏览以外的行为，我们将可能收集到您的个人信息（包括您在第三账号的ID、头像、昵称等）。</u></strong><strong><u> </u></strong></p>
+            <p>（四）为您提供安全保障 <br />
+                为提高您使用我们及我们关联公司、合作伙伴提供服务的安全性，保护您或其他用户或公众的人身财产安全免遭侵害，<strong><u>我们可能使用或整合您的个人信息、交易信息、设备信息、有关网络日志以及我们关联公司、合作伙伴取得您授权或依据法律共享的信息，来综合判断您账户及交易风险、进行身份验证、检测及防范安全事件，并依法采取必要的记录、审计、分析、处置措施。</u></strong><strong><u> </u></strong></p>
+            <p>（五）其他用途 <br />
+                我们将信息用于本政策未载明的其他用途，或者将基于特定目的收集而来的信息用于其他目的时，会事先征求您的同意。 <br />
+                （六）征得授权同意的例外 <br />
+                根据相关法律法规规定，以下情形中收集您的个人信息无需征得您的授权同意： <br />
+                1、根据法律法规的规定或行政、司法机构等有权机关的要求或者授权； <br />
+                2、您出现违反适用法律、法规规定或者违反您与我们签署的相关协议（包括在线签署的电子协议）或相关规则时需要向第三方披露的情形。 <br />
+                3、我们与第三方进行联合营销活动，我们可能与其共享活动过程中产生的、为完成活动所必要的个人信息，如参加活动的用户数、中奖名单、中奖人联系方式等，以便第三方能及时向您发放奖品。如与授权合作伙伴共享，仅为实现本政策中声明的目的，我们的某些服务将由授权合作伙伴提供。我们可能会与合作伙伴共享您的某些个人信息，以提供更好的客户服务和用户体验。例如，在您使用我们配送服务时，我们必须与物流服务提供商共享您的个人信息才能安排送货，或者安排合作伙伴提供服务。我们仅会出于合法、正当、必要、特定、明确的目的共享您的个人信息，并且只会共享提供服务所必要的个人信息。我们的合作伙伴无权将共享的个人信息用于任何其他用途； <br />
+                4、为维护我们及关联方或其他我们用户的合法权益； <br />
+                5、从合法公开披露的信息中收集个人信息的，如合法的新闻报道、政府信息公开等渠道； <br />
+                6、出于实现本政策公示的我们如何使用您的个人信息的目的，或为履行我们和您签订的协议中或本隐私政策中的义务和行使我们的权利，向我们的关联方、合作伙伴或代表我们履行某项职能的第三方（例如处理银行卡的支付机构等）分享您的个人信息。； <br />
+                7、法律法规规定的其他情形。 <br />
+                如我们停止运营美得得产品或服务，我们将及时停止继续收集您个人信息的活动，将停止运营的通知以逐一送达或公告的形式通知您，对所持有的个人信息进行删除或匿名化处理。 </p>
+            <p>二、我们如何使用 Cookie 和同类技术 <br />
+                （一）Cookie的使用 <br />
+                为确保网站正常运转、为您获得更轻松的访问体验、向您推荐您可能感兴趣的内容，我们会在您的计算机或移动设备上存储名Cookie、Flash Cookie或浏览器或关联应用程序提供的其他通常包含标识符、站点名称以及一些号码和字符的本地存储（统称“Cookie”）。借助于 Cookie，网站能够存储您的偏好或购物车内的商品等数据。 <br />
+                如果您的浏览器或浏览器附加服务允许，您可修改对Cookie的接受程度或拒绝我们的Cookie。但如果您这么做，在某些情况下可能会影响您安全访问我们的网站，而无法使用部分我们提供的服务。 <br />
+                （二）网站信标和像素标签 <br />
+                除Cookie 外，我们还会在网站上使用网站信标和像素标签等其他同类技术。例如，我们向您发送的电子邮件可能含有链接至我们网站内容的地址链接，如果您点击该链接，我们则会跟踪此次点击，帮助我们了解您的产品或服务偏好以便于我们主动改善客户服务体验。网站信标通常是一种嵌入到网站或电子邮件中的透明图像。借助于电子邮件中的像素标签，我们能够获知电子邮件是否被打开。如果您不希望自己的活动以这种方式被追踪，则可以随时从我们的寄信名单中退订。 </p>
+            <p>三、我们如何共享、转让、公开披露您的个人信息 <br />
+                （一）共享 <br />
+                我们不会与美得得服务提供者以外的公司、组织和个人共享您的个人信息，但以下情况除外： <br />
+                1、在您主动选择情况下共享：若您主动通过美得得购买商品和服务，我们会根据您的选择，将您的订单信息与交易有关的必要信息与相关商品和服务的提供者共享来实现您向其购买商品或服务的需求，并促使其可以完成后续的售后服务。您可以在相关商品和服务的提供者从事经营活动的主页面查询其营业执照登载的信息，以辨别您的交易对象身份。 <br />
+                2、在获取明确同意情况下共享：获得您的明确同意后，我们会与其他方共享您的个人信息。例如，如果我们委托第三方向您提供产品或服务时，我们会在征得您同意后将上述信息共享给第三方，如果您拒绝提供此类信息，我们将无法完成相关交付服务。 <br />
+                3、在法定情形下共享：我们可能会根据法律法规规定、诉讼争议解决需要，或按行政、司法机关依法提出的要求，对外共享您的个人信息。 <br />
+                4、与关联公司共享：<strong><u>为便于我们基于</u></strong><strong><u>美得得</u></strong><strong><u>账户向您提供服务，推荐您可能感兴趣的信息或保护</u></strong><strong><u>美得得</u></strong><strong><u>关联公司或其他用户或公众的人身财产安全免遭侵害，您的个人信息可能会与我们的关联公司共享。</u></strong>我们只会共享必要的个人信息，且受本隐私政策中所声明目的的约束，如果我们共享您的个人敏感信息或关联公司改变个人信息的使用及处理目的，将再次征求您的授权同意。 <br />
+                5、与授权合作伙伴共享：我们会委托授权合作伙伴为您提供某些服务或代表我们履行职能，我们仅会出于合法、正当、必要、特定、明确的目的共享您的信息，授权合作伙伴只能接触到为其履行职责所需信息，且不能将此信息用于任何其他目的。 <br />
+                目前，我们的授权合作伙伴包括以下类型： <br />
+                （1）<strong><u>使用我们SaaS软件的商家，使用我们的SaaS软件的商家为您商品或服务时，您提交的订单信息、支付信息、收货地址和联系人信息等，我们会使用我们SaaS软件的商家提供，以便于他们能完成您所需要的服务。如您不使用他们的服务，我们不会主动给任何一个商家提供您的任何个人信息。</u></strong><strong><u> </u></strong><br />
+                （2）广告、分析服务类的授权合作伙伴。除非得到您的许可，否则我们不会将您的个人身份信息（指可以识别您身份的信息，例如姓名或电子邮箱，通过这些信息可以联系到您或识别您的身份）与提供广告、分析服务的合作伙伴共享。 <br />
+                （3）供应商、服务提供商和其他合作伙伴。我们将信息发送给支持我们业务的供应商、服务提供商和其他合作伙伴，这些支持包括提供技术基础设施服务、分析我们服务的使用方式、衡量服务的有效性、提供客户服务、支付便利或进行学术研究和调查。 <br />
+                   
+                <strong><u> 对我们与之共享个人信息的公司、组织和个人，我们会与其签署严格的数据保护协议，要求他们按照我们的说明、本隐私政策以及其他任何相关的保密和安全措施来处理个人信息。</u></strong><strong><u> </u></strong><br />
+                （二）转让 <br />
+                我们不会将您的个人信息转让给任何公司、组织和个人，但以下情况除外： <br />
+                1、在获取明确同意的情况下转让：获得您的明确同意后，我们会向其他方转让您的个人信息。 <br />
+                2、在美得得服务提供者发生合并、收购或破产清算情形，或其他涉及合并、收购或破产清算情形时，如涉及到个人信息转让，我们会要求新的持有您个人信息的公司、组织继续受本政策的约束，否则我们将要求该公司、组织和个人重新向您征求授权同意。 <br />
+                （三）公开披露 <br />
+                我们仅会在以下情况下，公开披露您的个人信息： <br />
+                1、获得您明确同意或基于您的主动选择，我们可能会公开披露您的个人信息； <br />
+                2、<strong><u>如果我们确定您出现违反法律法规或严重违反</u></strong><strong><u>美得得</u></strong><strong><u>相关协议规则的情况，或为保护</u></strong><strong><u>美得得</u></strong><strong><u>及其关联公司用户或公众的人身财产安全免遭侵害，我们可能依据法律法规或</u></strong><strong><u>美得得</u></strong><strong><u>相关协议规则征得您同意的情况下披露关于您的个人信息，包括相关违规行为以及</u></strong><strong><u>美得得</u></strong><strong><u>已对您采取的措施。</u></strong>例如，若您销售假货而严重违反美得得规则，我们可能会公开披露您的店铺主体信息与处罚情况。 <br />
+                （四）共享、转让、公开披露个人信息时事先征得授权同意的例外 <br />
+                以下情形中，共享、转让、公开披露您的个人信息无需事先征得您的授权同意： <br />
+                1、根据法律法规的规定或行政、司法机构、国家部门等有权机关的要求依法提供的； <br />
+                2、出于维护您或其他个人的生命、财产等重大合法权益但又很难得到本人同意的； <br />
+                3、您自行向社会公众公开的个人信息； <br />
+                4、从合法公开披露的信息中收集个人信息的，如合法的新闻报道、政府信息公开等渠道。 <br />
+                根据法律规定，共享、转让经去标识化处理的个人信息，且确保数据接收方无法复原并重新识别个人信息主体的，不属于个人信息的对外共享、转让及公开披露行为，对此类数据的保存及处理将无需另行向您通知并征得您的同意。 </p>
+            <p>四、我们如何保护您的个人信息安全 <br />
+                （一）为保障您的信息安全，我们努力采取各种符合业界标准的物理、电子和管理方面的安全措施来保护您的个人信息，防止您的个人信息遭到未经授权访问、公开披露、使用、修改、损坏或丢失。我们会采取一切合理可行的措施，保护您的个人信息。例如在您的浏览器与“服务”之间交换数据（如信用卡信息）时采用 SSL 加密保护技术；同时对网站本身提供 https 安全浏览方式；使用加密技术确保数据的保密性；使用受信赖的保护机制防止数据遭到恶意攻击；部署访问控制机制，确保只有授权人员才可访问个人信息；以及举办安全和隐私保护培训课程，加强员工对于保护个人信息重要性的认识。。 <br />
+                （二）我们的安全系统，有专门的团队在负责，公司从人力财力上均有较大的投入，且我们的系统安全性已通过权威第三方的监测，并获得了ISO27001等认证。 <br />
+                （三）我们会采取合理可行的措施，尽力避免收集无关的个人信息。<strong><u>我们只会在达成本政策所述目的所需的期限内保留您的个人信息，除非需要延长保留期或受到法律的允许。</u></strong> <br />
+                （四）互联网并非绝对安全的环境，我们强烈建议您通过安全方式、使用复杂密码，协助我们保证您的账号安全。 <br />
+                （五）在不幸发生个人信息安全事件后，我们将按照法律法规的要求向您告知：安全事件的基本情况和可能的影响、我们已采取或将要采取的处置措施、您可自主防范和降低风险的建议、对您的补救措施等。事件相关情况我们将以邮件、信函、电话、推送通知等方式告知您，难以逐一告知个人信息主体时，我们会采取合理、有效的方式发布公告。 <br />
+                同时，我们还将按照监管部门要求，上报个人信息安全事件的处置情况。 </p>
+            <p>五、您如何行使您的个人信息权利 <br />
+                您对您的个人信息您享有以下权利： <br />
+                （一）您有权访问您的个人信息，法律法规规定的例外情况除外。如果您想行使数据访问权，可以通过以下方式自行访问： <br />
+                账户信息——如果您希望访问或编辑您的账户中的个人资料信息和支付信息、更改您的密码、添加安全信息或关闭您的账户等，您可以通过访问美得得网页执行此类操作。 <br />
+                搜索信息——您可以在美得得网及相关网站中访问或清除您的搜索历史记录、查看和修改兴趣以及管理其他数据。 <br />
+                如果您无法通过上述链接访问这些个人信息，您可以随时联系我们的客服。我们将在30天内回复您的访问请求。 <br />
+                （二）您有权更正您的个人信息； <br />
+                （三）<strong><u>您有权删除您的个人信息，您可以登录</u></strong><strong><u>美得得</u></strong><strong><u>账号，点击您需要注销账号，再您确认删除您的账号信息时，我们将删除您的信息，由此产生的您的权益或者资产同时消失的损失由您承担；</u></strong><strong><u> </u></strong><br />
+                （四）您有权改变您授权同意的范围。 <br />
+                以上信息您均可以通过美得得网站主页进行访问和更新。 <br />
+                如果您认为美得得存在违反法律的规定收集、使用您个人信息的情形，您可以通过美得得客服与我们取得联系。 </p>
+            <p>六、您的个人信息如何在全球范围转移 <br />
+                我们在中华人民共和国境内运营中收集和产生的个人信息，存储在中国境内，以下情形除外： <br />
+                1、法律法规有明确规定； <br />
+                2、获得您的明确授权； <br />
+                3、您通过互联网进行跨境交易等个人主动行为。 <br />
+                针对以上情形，我们会确保依据本隐私政策对您的个人信息提供足够的保护。 </p>
+            <p>七、我们如何处理儿童的个人信息 <br />
+                <strong><u>本政策所指的儿童是指不满14周岁的个人，如果没有父母或监护人的同意，儿童不得创建自己的用户账户。如您为未成年人的，建议您请您的父母或监护人仔细阅读本隐私政策，并在征得您的父母或监护人同意的前提下使用我们的服务或向我们提供信息。对于经父母或监护人同意使用我们的产品或服务而收集未成年人个人信息的情况，我们只会在法律法规允许、父母或监护人明确同意或者保护未成年人所必要的情况下使用、共享、转让或披露此信息。</u></strong>如果我们发现自己在未事先获得可证实的父母同意的情况下收集了儿童的个人信息，则会设法尽快删除相关数据。 </p>
+            <p>八、本隐私政策如何更新 <br />
+                <strong><u>我们提供的服务和产品会不时更新和调整，隐私政策也将随之可能变更，如发生变更我们会以公示的方式进行通知到您，也不排除使用“弹框”或者邮件、短信等方式通知到您，请您及时查看最新的隐私政策。</u></strong><strong><u> </u></strong></p>
+            <p>九、如何联系我们 <br />
+                我们设立了个人信息保护部门，如对本政策内容有任何疑问、意见或建议，或发现您的个人信息可能被泄露，您可以电话到400-087-9077与我们联系，我们将在15天内回复您的请求 <br />
+                如果您对我们的回复不满意，特别是您认为我们的个人信息处理行为损害了您的合法权益，您还可以通过被告住所地有管辖权的法院提起诉讼来寻求解决方案。 </p>
+
+        </div>`;
+let content_use = `<div>
+    <p class="tac font16"><b>用户协议</b><br /></p>
+    <b><p>特别提示：<br />您在使用美得得科技（深圳）有限公司（以下简称“美得得”）及关联公司提供的各项服务之前，请您务必审慎阅读、充分理解本协议各条款内容，特别是以粗体标注的部分，包括但不限于免除或者限制责任的条款。如您不同意本服务协议及/或随时对其的修改，您应立即停止注册；您一旦使用美得得提供的服务，即视为您已了解并完全同意本服务协议各项内容，包括美得得对服务协议所做的修改，并成为我们的用户。<br /></p></b>
+    <p><b>一、账号注册</b><br />1、您应当同意本协议的条款并按照页面上的提示完成全部的注册程序。您在进行注册程序或第三方授权登录程序过程中勾选协议即表示您与美得得达成协议，完全接受本协议项下的全部条款约束。</p>
+    <p>2、当您选择通过第三方授权登录程序进入美得得，您需授权美得得收集您的账号昵称及头像等标识化的个人信息，授权完成后，您即成为美得得的“用户”。<br />
+           
+        当您按照注册页面提示填写信息并注册成功后，您即成为美得得的“用户”；美得得将给予您一个用户帐号，密码由您自行设置。该用户帐号和密码由您自行负责保管。</p>
+    <p>   您应当对您在美得得进行的活动和事件负法律责任。</p>
+    <p>3、本协议服务条款和公告可由美得得定时更新，并按照法定流程进行公示。您在使用相关服务时,应关注并遵守其所适用的相关条款。</p>
+    <p style="font-weight: bold; text-decoration: underline">4、使用同一身份认证信息、同一手机号或经美得得排查认定多个美得得账户的实际控制人为同一人的，均视为同一用户。</p>
+    <p>5、您确认，在您开始使用本服务前，您应当具备中华人民共和国法律规定的与您行为相适应的民事行为能力。<b style=" text-decoration: underline">若您不具备前述与您行为相适应的民事行为能力，则您需要在您监护人的陪同下完成注册，并且您与您的监护人应依照法律规定承担因此而导致的一切后果。</b></p>
+    <p>二、注册信息和隐私保护<br />
+        1、您帐号的所有权归美得得，使用权归您。您按注册页面引导填写信息，阅读并同意本协议且完成全部注册程序后，即可获得注册账号并成为用户。<b style=" text-decoration: underline">您应提供及时、详尽及准确的个人资料，并不断更新注册资料，符合及时、详尽准确的要求。所有原始键入的资料将引用为注册资料。如果因注册信息不真实或更新不及时而引发的相关问题，由您自行承担相应的责任。</b></p>
+        <p>2、您应当通过真实身份信息认证注册帐号，且您提交的帐号名称、头像、 简介等注册信息中不得出现违法和不良信息，经公司审核，如存在上述情况，美得得将不予注册；同时，在注册后，如发现您以虚假信息骗取帐号名称注册，或其帐号头像、简介等注册信息存在违法和不良信息的，<b style=" text-decoration: underline">美得得有权不经通知单方采取限期改正、暂停使用、注销登记、收回等措施。</b></p>
+    <p>3、您帐号包括帐户名称和密码，账户名称作为您有效的身份凭证之一。您可使用手机号和密码登录。</p>
+        <p><b style=" text-decoration: underline">4、您不应将其帐号、密码转让、出售或出借予他人使用，若您授权他人使用帐户，应对被授权人在该帐户下发生所有行为负全部责任。</b>由于您其他账户使用信息，仅当依法律法规、司法裁定或经美得得同意，并符合美得得规定的用户帐号转让流程的情况下，方可进行帐号的转让。</p>
+        <p>5、因您个人原因导致的帐号信息遗失，如需找回帐号信息，请按照帐号找回要求提供相应的信息，并确保提供的信息合法真实有效，<b style=" text-decoration: underline">若提供的信息不符合要求，无法通过安全验证，美得得有权拒绝提供帐号找回服务；若帐号的唯一凭证不再有效，美得得有权拒绝支持帐号找回。</b>例如手机号二次出售，美得得可拒绝支持帮助找回原手机号绑定的帐号。</p>
+    <p>6、在需要终止使用帐号服务时，符合以下条件的，您可以申请注销您的帐号：<br />
+        （1）您仅能申请注销您本人的帐号，并依照美得得的流程进行注销；<br />
+        （2）您仍应对您在注销帐号前且使用的行为承担相应责任，同时美得得仍可保存您注销前的相关信息；<br />
+        （3）注销成功后，帐号信息、个人身份信息、交易记录、会员权益等将无法恢复或提供。<br />
+        7、当您使用美得得产品进行支付、登录等操作的时候，服务器会自动接收、验证、并记录一些必要的信息，如手机号码、IP地址、服务访问异常信息、以及部分设备信息等，以保障您在使用服务时账户登录和支付过程的安全，进而保护您的上网安全。<b style=" text-decoration: underline">您使用美得得的服务，即表示您同意美得得可以按照《隐私政策》处理您的个人信息。</b>美得得可能会与合作伙伴共同向您提供您所要求的服务或者共同向您展示您可能感兴趣的内容。在信息为该项产品/服务所必须的情况下，您同意美得得可与其分享必要的信息。并且，美得得会要求其确保数据安全并且禁止用于任何其他用途。除此之外，美得得不会向任何无关第三方提供或分享信息。</p>
+    <p>8、您知悉并授权，美得得仅在必需的情况下使用或与关联公司同步您的信息，以为您提供更好的服务。<br />
+        9、为更好地向您提供服务，您同意美得得通过短信、app通知等形式向您发送相关商业性服务信息。</p>
+        <p><b style=" text-decoration: underline">三、使用规则</b><br />
+        1、您在使用美得得的服务时，必须遵守中华人民共和国相关法律法规的规定，您应同意将不会利用本服务进行任何违法或不正当的活动，包括但不限于下列行为:<br />
+        （1）您设置的会员名或提供的信息不得含有下列内容之一的信息：<br />
+        　　
+        ① 反对宪法所确定的基本原则的；  <br />
+        　　
+        ② 危害国家安全，泄露国家秘密，颠覆国家政权，破坏国家统一的；  <br />
+        　　
+        ③ 损害国家荣誉和利益的；  <br />
+        　　
+        ④ 煽动民族仇恨、民族歧视、破坏民族团结的；  <br />
+        　　
+        ⑤ 破坏国家宗教政策，宣扬邪教和封建迷信的；  <br />
+        　　
+        ⑥ 散布谣言，扰乱社会秩序，破坏社会稳定的；  <br />
+        　　
+        ⑦ 散布淫秽、色情、赌博、暴力、凶杀、恐怖或者教唆犯罪的；  <br />
+        　　
+        ⑧ 侮辱或者诽谤他人，侵害他人合法权利的；  <br />
+        　　
+        ⑨ 含有虚假、有害、胁迫、侵害他人隐私、骚扰、侵害、中伤、粗俗、猥亵、或其它道德上令人反感的内容；  <br />
+        　　
+        ⑩ 含有中国法律、法规、规章、条例以及任何具有法律效力之规范所限制或禁止的其它内容的；  <br />
+        （2）不得为任何非法目的而使用美得得服务系统；<br />
+        （3）不利用美得得的服务从事以下活动：<br />
+        　　
+        ① 未经允许，进入计算机信息网络或者使用计算机信息网络资源的；  <br />
+        　　
+        ② 未经允许，对计算机信息网络功能进行删除、修改或者增加的；  <br />
+        　　
+        ③ 未经允许，对进入计算机信息网络中存储、处理或者传输的数据和应用程序进行删除、修改或者增加的；  <br />
+        　　
+        ④ 故意制作、传播计算机病毒等破坏性程序的；  <br />
+        　　
+        ⑤ 其他危害计算机信息网络安全的行为。  <br />
+            <b style=" text-decoration: underline">2、您违反本协议或相关的服务条款的规定，导致或产生的任何第三方主张的任何索赔、要求或损失，包括合理的律师费，您同意赔偿美得得与合作公司、关联公司，并使之免受损害。对此，美得得有权视您的行为性质，采取包括但不限于删除您发布信息内容、暂停使用许可、终止服务、限制使用、回收帐号、追究法律责任等措施。对恶意注册帐号或利用帐号进行违法活动、捣乱、骚扰、欺骗、其他用户以及其他违反本协议的行为，美得得有权回收其帐号。同时，美得得会视司法部门的要求，协助调查。<br />
+                3、您需要对自己在服务使用过程中的行为负法律责任，即使您已经终止使用该服务。您承担法律责任的形式包括但不限于：对受到侵害者进行赔偿，以及在美得得首先承担了因您的行为导致的行政处罚或侵权损害赔偿责任后，您应给予美得得等额的赔偿。<br /></b>
+        4、美得得有权根据认定程序及标准判断您账户的使用可能危及您的账户安全及/或美得得平台信息安全的，美得得可拒绝提供相应服务或终止本协议。<br />
+    </p>
+        <p><b style=" text-decoration: underline">四、服务内容</b></p>
+    <p>1、您在交易过程中与其他用户发生争议的，您或其他用户中任何一方可以自行协商解决，也可以通过美得得介入处理，若您觉得以上的方式均无法达到您要的结果，您可以寻求司法机关的协助。</p>
+    <p>2、您选择美得得介入的方式处理相关问题，那么您需要遵守和执行美得得的处理结果。若您对美得得的处理结果不满意，您可以寻求其他途径解决纠纷例如起诉、仲裁等方式，但在此之前您需先履行该结果。</p>
+    <p>3、美得得目前为您提供免费提供服务，但美得得保留因业务调整或者其他法律法规要求向您收取费用的权利。</p>
+    <p>4、美得得网络服务的具体内容由美得得根据实际情况提供。<br />
+        <b style=" text-decoration: underline"> 5、鉴于网络服务的特殊性，您同意美得得有权不经事先通知，随时变更、中断或终止部分或全部的网络服务（包括收费网络服务）。美得得不担保网络服务不会中断，对网络服务的及时性、安全性、准确性也都不作担保。</b></p>
+    <b><p>6、您需遵守美得得7天无理由退换货的相关规则。</p>
+    <p>7、终止服务<br />
+        您同意美得得得基于其自行之考虑，因任何理由，或美得得认为您已经违反本服务协议的文字及精神，终止您的密码、帐号或本服务之使用（或服务之任何部分），并将您在本服务内任何内容加以移除并删除。您同意依本服务协议任何规定提供之本服务，无需进行事先通知即可中断或终止，您承认并同意，美得得可立即关闭或删除您的帐号及您帐号中所有相关信息及文件，及/或禁止继续使用前述文件或本服务。此外，您同意若本服务之使用被中断或终止或您的帐号及相关信息和文件被关闭或删除，美得得对您或任何第三人均不承担任何责任。</p>
+        <p>五、个人数据保护与授权</p></b>
+    <p>1、为了保护您的财产及信息安全，预防诈骗或者其他网络犯罪行为，美得得有权收集您的个人信息，包括但不限于个人会员信息、交易信息来判断您个人的交易风险，对您身份进行验证等。</p>
+        <b style=" text-decoration: underline"><p>2、根据相关法律法规规定，以下情形中收集您的个人信息无需征得您的授权同意：</p>
+    <p>①、涉及公共安全，与重大利益相关的；</p>
+    <p>②、与政府部门包括司法机关等相关的；</p>
+    <p>③、出于保护您的个人财产或者利益的目的，但无法事先征求您同意的行为；</p>
+    <p>④、您以自行对外公开的，包括但不限于通过报纸、新闻等方式公开；</p>
+    <p>⑤、根据您的要求签订合同所必需的；</p>
+    <p>⑥、用于维护所提供的产品或服务的安全稳定运行所必需的，例如发现、处置产品或服务的故障；</p>
+            <p>⑦、国家法律法规政策认可或支持的相关行为；</p></b>
+    <p>3、我们已采取符合业界标准、合理可行的安全防护措施保护您提供的个人信息安全，防止个人信息遭到未经授权访问、公开披露、使用、修改、损坏或丢失。<br />
+    </p>
+    <p><b>六、免责声明</b></p>
+    <p>因以下情况造成网络服务在合理时间内的中断，美得得无需为此承担任何责任；<br />
+        （1）美得得需要定期或不定期地对提供网络服务的平台或相关的设备进行检修或者维护，美得得保留不经事先通知为维修保养、升级或其它目的暂停本服务任何部分的权利。<br />
+        （2）因台风、地震、洪水、雷电或恐怖袭击等不可抗力原因；<br />
+        （3）您的电脑软硬件和通信线路、供电线路出现故障的；<br />
+        （4）因病毒、木马、恶意程序攻击、网络拥堵、系统不稳定、系统或设备故障、通讯故障、电力故障、银行原因、第三方服务瑕疵或政府行为等原因。<br />
+        尽管有前款约定，美得得将采取合理行动积极促使服务恢复正常。</p>
+        <p><b>七、知识产权和其他合法权益</b><br />
+        1、美得得产品及相关网站上由美得得上传、制作、拥有的所有内容，包括但不限于著作、图片、档案、资讯、资料、网站架构、网站画面的安排、网页设计，均由美得得或其关联公司依法拥有其知识产权，包括但不限于商标权、专利权、著作权、商业秘密等。但如因您上传的由其自行制作、拥有的内容涉及侵犯美得得或其他任何第三方的合法权益的，您应自行对其侵权行为产生的纠纷进行处理，并对其侵权行为承担法律责任，且就由此给美得得造成的损失（包括但不限于美得得声誉的影响、美得得由此承担的连带责任（如有）等）进行赔偿。</p>
+    <p>2、非经美得得或其关联公司书面同意，任何人不得擅自使用、修改、复制、公开传播、改变、散布、发行或公开发表在本网站上程序或内容（仅限于由美得得上传、制作、拥有的所有内容，包括但不限于著作、图片、档案、资讯、资料、网站架构、网站画面的安排、网页设计等）；如您需使用著作权非美得得所有的内容的，您应获得具体内容的著作权所有者的合法授权才能使用，如因您私自使用非自己所有的、且未经他人合法授权的著作、图片、档案、资讯、资料等内容的，由您自行承担责任，包括但不限于您自行对其侵权行为产生的纠纷进行处理，并对其侵权行为承担法律责任，且就由此给乙方造成的损失（包括但不限于乙方声誉的影响、乙方由此承担的连带责任（如有）等）进行赔偿。</p>
+    <p>3、尊重知识产权是您应尽的义务，如有违反，您应承担损害赔偿责任。</p>
+    <p><b>八、其他</b></p>
+    <p>1、本协议之效力、解释、变更、执行与争议解决均适用中华人民共和国法律，没有相关法律规定的，参照通用国际商业惯例和（或）行业惯例。</p>
+    <p>2、 如本协议的任何条款被视作无效或无法执行，则上述条款可被分离，其余条款则仍具有法律效力。<br />
+        3、本协议任何一方于另一方过失或违约时放弃本协议规定的权利的，不得视为其对一方的其他或以后同类之过失或违约行为弃权。</p>
+    <p>4、美得得未行使或执行本服务协议任何权利或规定，不构成对前述权利或权利之放弃。</p>
+    <p>5、杭州美得得科技有限公司和杭州起码科技有限公司是同一实际控制人控制下的两家企业，故本合同项下部分权利义务由杭州起码科技有限公司履行。</p>
+    <p>6、本协议最终解释权及修订权在法律范围内归美得得所有。</p>
+    </div>`;
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+		list: null,
+		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+		pageNum: 1, // 当前页数
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+		self = this;
+		let title = '';
+		let content = '';
+		if(options.t == 0) {
+			title = '用户使用协议';
+			content = content_use;
+		} else if(options.t == 1) {
+			title = '隐私政策';
+			content = content_privacy;
+		};
+		wx.setNavigationBarTitle({
+			title: title,
+		});		
+
+		WxParse.wxParse('content', 'html', content, self);
+		
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+	
+	/**
+	 * get请求数据
+	 */
+	get(url, data) {
+		app.request.get(url + '/' + data.store_id, {
+		  success: function(res) {
+			  if(res.data.code == 0){
+					console.log('success~~~~~~~~~~~',res);
+					self.setData({
+						content: res.data.data.distriRule,
+					});
+					/**
+					* WxParse.wxParse(bindName , type, data, target,imagePadding)
+					* 1.bindName绑定的数据名(必填)
+					* 2.type可以为html或者md(必填)
+					* 3.data为传入的具体数据(必填)
+					* 4.target为Page对象,一般为this(必填)
+					* 5.imagePadding为当图片自适应是左右的单一padding(默认为0,可选)
+					*/
+					WxParse.wxParse('content', 'html', self.data.content, self);
+				}else{
+					wx.showToast({
+					  title: "网络繁忙，请重试",
+					  icon: 'none',
+					  duration: 2000
+					})
+				}
+		  },
+			fail: function() {},
+		});
+	},
+		
+})
 \ No newline at end of file
+{
+  "usingComponents": {
+		"nodata": "/components/nodata/nodata"
+	},
+	"navigationBarTitleText": "",
+	"enablePullDownRefresh": false
+}
 \ No newline at end of file
+<view class="pd20">
+	<!-- <image src="../../../images/cloud.jpg" mode="widthFix" style="width: 100%;"></image> -->
+	<view class="fs28 taj">
+		<import src="../../../utils/wxParse/wxParse.wxml"/>
+		<template is="wxParse" data="{{wxParseData:content.nodes}}"/>
+	</view>
+</view>
+/* packageA//pages/distribution/rookie/rookie.wxss */
+.tac {
+	text-align: center;
+}
+
+.font16 {
+  font-size: 16px;
+}
 \ No newline at end of file
@@ -6,6 +6,8 @@ function e(e, a, r) {
     writable: !0
   }) : e[a] = r, e;
 }
+const app = getApp();
+let self = null;
 var a = getApp(),
   r = a.globalData.setting,
@@ -17,10 +19,10 @@ var a = getApp(),
 var timestamp = Date.parse(new Date());
 var date = new Date(timestamp);
-const {
-  barcode,
-  qrcode
-} = require('../../../utils/index.js');
+// const {
+//   barcode,
+//   qrcode
+// } = require('../../../utils/index.js');
 Page({
   data: {
@@ -31,7 +33,7 @@ Page({
     defaultAvatar: r.resourceUrl + "/static/images/user68.jpg",
     user: null,
     tc_hide: true,
-    stoname: "",
+    stoname: "请选择",
     checkDate: false,
     datet: "",
     year: date.getFullYear(),
@@ -54,7 +56,7 @@ Page({
     open_ind_store: 0, //哪里打开的门店列表的控制属性
     ispwhid: 1, //是否隐藏密码显示
     isstcsp: 0, //是否启用密码消费
-    isGender: 1, //什么性别
+    isGender: 0, //什么性别
     iscalendar: 0, //是否是农历
     consumption: "", //消费密码
     identity_card: "", //身份证值
@@ -68,6 +70,7 @@ Page({
     is_lable_set: "", //是否启用我的兴趣标签
     check_label: [], //我选择的兴趣标签
     fir_guide_id:null,  //存储会员详情接口出来的美导ID
+		isLunar: 0,
   },
   //通过路径跳转到其他页面
@@ -75,22 +78,8 @@ Page({
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
-  //获取配置信息
-  get_config: function() {
-    var th = this;
-    getApp().getConfig2(function(ee) {
-      var sms_conf = ee.switch_list;
-      sms_conf = JSON.parse(sms_conf);
-      th.setData({
-        is_lable_set: sms_conf.user_label_set,  //是不是会员标签设置
-        guide_title:sms_conf.guide_consultant,  //系统参数  导购标题
-        guide_change_time:sms_conf.guide_change_time     //每月能修改几次
-      })
-      if (sms_conf.user_label_set) {
-        th.query_checklabels();
-      }
-    })
-  },
+	
+
   //查找会员选择的兴趣标签
   query_checklabels: function() {
     var th = this;
@@ -119,20 +108,8 @@ Page({
       }
     })
   },
-  //是否启动密码消费
-  isstcsp: function() {
-    var th = this;
-    var isstcsp = th.data.isstcsp;
-    if (isstcsp == 0) {
-      th.setData({
-        isstcsp: 1
-      })
-    } else {
-      th.setData({
-        isstcsp: 0
-      })
-    }
-  },
+
+
   //出生日期是否是农历
   iscalendar: function() {
@@ -149,29 +126,8 @@ Page({
       })
     }
   },
-  //性别
-  isGender: function(e) {
-    var th = this;
-    var sex = e.currentTarget.dataset.sex;
-    th.setData({
-      isGender: sex
-    })
-  },
-  //密码是否隐藏显示
-  ispwhid: function() {
-    var th = this;
-    var ispwhid = th.data.ispwhid;
-
-    if (ispwhid == 0) {
-      th.setData({
-        ispwhid: 1
-      })
-    } else {
-      th.setData({
-        ispwhid: 0
-      })
-    }
-  },
+	
+	
   checkDate: function() {
     var th = this;
     if (th.data.checkDate) {
@@ -184,11 +140,7 @@ Page({
       })
     }
   },
-  bindChange: function(e) {
-    this.setData({
-      datet: e.detail.value,
-    });
-  },
+
   //---点击二级之后的选择---
   choose_for_store: function(e) {
     var index_c = e.currentTarget.dataset.ind;
@@ -198,6 +150,8 @@ Page({
       fir_pick_index: index_c
     })
   },
+	
+	
   //确定def_pick为选择的门店
   sure_pick: function(e) {
     var th = this;
@@ -273,8 +227,6 @@ Page({
   },
   onclickstore: function() {
     var th = this;
-    //检验门店的点击，看下次数是不是到了	
-	this.check_click_ok(function(){
 		if (th.data.store == 0) {
 		  th.setData({
 		    store: 1
@@ -432,10 +384,8 @@ Page({
 		      });
 		    }
 		  }
-		}, 200)		 
-						  
-	},2)
-	 
+		}, 200)	
+   
   },
   //选择更多门店
@@ -444,6 +394,7 @@ Page({
       sort_store: 1
     });
   },
+	
   //---选择分类门店---
   choice_sort_store: function(e) {
     var index = e.currentTarget.dataset.index;
@@ -464,6 +415,8 @@ Page({
       choice_sort_store: 0
     });
   },
+	
+	
   //身份证号严格校验
   IdentityIDCard: function(e) {
     var code = e.detail.value;
@@ -518,7 +471,7 @@ Page({
     //区域数组中不包含需验证的身份证前两位
     else if (!city[code.substr(0, 2)]) {
-      errorMess = "您输入的身份证地址编码有误！";
+      errorMess = "您输入的身份证号格式有误！";
       isPass = false;
     } else {
       //18位身份证需要验证最后一位校验位
@@ -542,95 +495,108 @@ Page({
           errorMess = "您输入的身份证号不存在！";
           isPass = false;
         }
-      }
-    }
+      };
+    };
     var returnParam = {
       'errorMess': errorMess,
       'isPass': isPass
-    }
+    };
     if (errorMess != "") {
-      wx.showModal({
-        title: errorMess,
-        content: '',
-        showCancel: false,
-        confirmText: '确定',
-        confirmColor: '',
-        success: function(res) {},
-        fail: function(res) {},
-        complete: function(res) {},
-      })
-    }
+      // wx.showModal({
+      //   title: errorMess,
+      //   content: '',
+      //   showCancel: false,
+      //   confirmText: '确定',
+      //   confirmColor: '',
+      //   success: function(res) {},
+      //   fail: function(res) {},
+      //   complete: function(res) {},
+      // })
+			
+			getApp().my_warnning(errorMess, 0, this);
+			this.setData({
+				id: null,
+			});
+    };
     return returnParam;
   },
   //------初始化加载----------
   onLoad: function(t) {
-    var user = getApp().globalData.userInfo;
-    if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) {
-      var now = ut.gettimestamp();
-      var str = user.card_expiredate.replace(/-/g, '/');;
-      var end = new Date(str);
-      end = Date.parse(end) / 1000;
-      if (now < end) {
-        this.puls_user();
-      }
-    }
-    this.initial_user();
-  },
-  //-----------会员是否初始化---------------------
-  initial_user: function() {
-
-    var th = this;
-    getApp().request.get("/api/weshop/users/grade/vip/init/get", {
-      data: {
-        storeId: r.stoid,
-      },
-      success: function(su) {
-        var isBool = su.data.data.isBool;
-        th.setData({
-          isBool: isBool
-        });
-
-        if (!isBool) return false;
-        //-----会员权益获取--------------		
-        getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
-          data: {
-            storeId: r.stoid,
-            userId: getApp().globalData.user_id,
-          },
-          success: function(su) {
-            var gradename = su.data.data.GradeName;
-            th.setData({
-              gradename: gradename
-            });
-          }
-        });
-
-      }
-    });
-    this.get_config();
-  },
+		self = this;
+		let url1 = '/api/weshop/storeconfig/get/';
+		let url3 = '/api/weshop/users/getERPUser/';
+		url1 += r.stoid;
+		var user=app.globalData.userInfo;
+		if(!user) return false;
+		
+		//-- 赋予默认值 --
+		app.request.get(url1, {
+		  success: function(res) {
+				console.log('x-->', res.data.code, res.data.data.reg_type, res.data.data.reg_info);
+				if(res.data.code == 0) {
+					let reg_type = res.data.data.reg_type;
+					let reg_info = res.data.data.reg_info;
+					if(reg_type) {	//reg_type为1才显示积分信息
+						if(reg_info) {
+							reg_info = JSON.parse(reg_info);							
+							if(reg_info.reginfo_coupon){
+							   //判断有没有领过券
+							   self.check_is_send_quan(reg_info.reginfo_coupon,user.user_id);
+							}								
+						};
+					};
+					self.setData({
+						reg_type,
+						reg_info,
+						user: app.globalData.userInfo,
+					});
+				};
+				
+			},
+		});
+				
+		//获取默认信息
+		url3 += r.stoid + "/" +user.user_id;
+		app.request.get(url3, {
+			success: function(res) {
+				if(res.data.code == 0) {
+					console.log('url3', res.data.data.birthday);
+					let data = res.data.data;
+                    if(data['idcard']) self.data.id=data['idcard'];
+                    if(data['vipname']) self.data.name=data['vipname'];
+                    if(data['address']) self.data.address=data['address'];
-  //-----Plus会员获取-----------
-  puls_user: function() {
-    var th = this;
-    getApp().request.get("/api/weshop/plus/vip/mem/list", {
-      data: {
-        storeId: r.stoid,
-        userId: getApp().globalData.user_id,
-      },
-      success: function(su) {
+					if(data.birthday){
+						data.birthday= ut.formar_no_full(data.birthday);						
+					}
+					if(!data.pickup_name){
+						data.pickup_name="";
+					}	
+					if(!data.pickup_id){
+						data.pickup_id=0;
+					}												
+					//-- 获取门店 --
+                    self.setData({
+                        isGender: data.sex,
+                        isLunar: data.islunar,
+                        datet: data.birthday,
+                        stoname: data.pickup_name,
+                        sto_sele_id: data.pickup_id,
+                        vip_user:data
+                    });
-        if (su.data.code == 0) {
-          var cardname = su.data.data[0].MemCardName;
-          th.setData({
-            pulscardname: cardname
-          });
-        }
-      }
-    });
+				};
+			}
+		});
+	
+		if(user){			
+			 getApp().promiseGet("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + user.user_id,{});				
+             self.setData({user:user})   		
+		}
+		     		
   },
-
+  
   onShow: function() {
     var e = this;
     if (this.data.is_zy) return false;
@@ -644,44 +610,7 @@ Page({
     }
     var req = t;
-    req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, {
-      success: function(src) {
-        var a = src.data.data;
-	
-		if(!a) a={};	
-        var time ="",birthday =""; 
-		 if(a && a.reg_time) time=util.formatTime(a.reg_time, "'Y/M/D");       
-		 if(a && a.birthday) birthday=util.formatTime(a.birthday, "'Y/M/D");
-		  
-        a.reg_time = time;
-        a.birthday = birthday
-
-        if(a.address=='null' || !a.address){
-          a.address="";
-        }
-
-        e.data.fir_guide_id=a.staffId;
-        if(choice_guide){
-          a.staffName=choice_guide.StaffName;
-          a.staffId=choice_guide.Id;
-        }
-
-
-        e.setData({
-          phone: a.mobile,
-          user: a,
-          openid: a.openid,
-          sto_sele_id: a.pickup_id,
-          consumption: a.paypwd,
-          identity_card: a.idcard,
-          address: a.address,
-          isGender: a.sex,
-          isstcsp: a.vipnopwd,
-		  iscalendar:a.islunar
-        });
-
-      }
-    })
+ 
     a.getUserInfo(function(a) {
       var txt = util.formatTime(a.birthday, 'yyyy-M-d'),
         arr = txt.split(' ');
@@ -695,52 +624,47 @@ Page({
             if(da.data.data){
               //设置门店
               e.setData({
-                stoname: da.data.data.pickup_name
+                // stoname: da.data.data.pickup_name
               });
             }
           }
         })
       }
-      // var phone = "";
-      // phone+=a.mobile.substr(0, 3)+"****";
-      // phone += a.mobile.substr(7, 12);
-
-
-
-      //   e.setData({
-      //     isGender:e.data.user.sex
-      //   })
+     
     }, !0);
   },
-  editUserInfo: function(e) {
-    var r = e.currentTarget.dataset.type;
-    if (("password" == r || "paypwd" == r) && !this.data.user.mobile) return a.showWarning("请先绑定手机号码");
-    r && this.data.user && wx.navigateTo({
-      url: "/pages/user/userinfo_edit/userinfo_edit?type=" + r
-    });
-  },
-
-  /*--------------------修改头像---------------------*/
-  changeAvatar: function() {
-    return false;
-    var r = this;
-    wx.chooseImage({
-      count: 1,
-      sizeType: ["compressed", "original"],
-      sourceType: ["camera", "album"],
-      success: function(u) {
-        t.uploadFile(r.data.url + "/api/user/upload_headpic", {
-          filePath: u.tempFilePaths[0],
-          name: "head_pic",
-          success: function(t) {
-            var u = s.getFullUrl(t.data.result);
-            r.setData(e({}, "user.head_pic", u)), a.globalData.userInfo.head_pic = u, a.showSuccess("设置头像成功");
-          }
-        });
-      }
-    });
+  check_is_send_quan:function(cid,uid){
+	  var self=this;
+	  let url2 = '/api/weshop/prom/coupon/get/';
+	  //看一下会员有没有领过注册的券  
+      getApp().promiseGet("/api/weshop/couponList/page",{
+				 data:{store_id:r.stoid,uid:uid,cid:cid}
+			 }).then(res=>{
+				 var is_ling=0;
+				 if(res.data.code==0 && res.data.data  && res.data.data.total>0){
+					 is_ling=1;
+				 }
+				 
+				 //没有领过券，就显示
+				 if(!is_ling){
+					 //获取优惠券
+					 url2 += cid;
+					 app.request.get(url2, {
+					 	success: function(r) {
+					 		if(r.data.code == 0) {
+					 			console.log('000res==>', r.data.data.name);
+					 			self.setData({
+					 				couponInfo: r.data.data.name,
+					 			});
+					 		};
+					 	},
+					 });
+				 }
+							 
+			 })
+		  
   },
@@ -762,14 +686,8 @@ Page({
       tc_hide: true,
     });
   },
-  //消费密码输入框失去焦点事件
-  lose_focus: function(e) {
-    var th = this;
-    var val = e.detail.value;
-      this.setData({
-        consumption: val
-    })
-  },
+	
+
   //地址
   address: function(e) {
@@ -779,28 +697,7 @@ Page({
     });
   },
-  //身份证验证
-  identity_card: function(e) {
-    var val = e.detail;
-
-    this.setData({
-      identity_card: val.value
-    });
-
-  },
-  //用户名字
-  user_name: function(e) {
-    var th = this;
-    var name = e.detail.value;
-    var vipname = 'user.vipname';
-    if (name != "" || name != null) {
-      th.setData({
-        [vipname]: name
-      });
-    }
-
-  },
-
+  
   //点击确认修改信息
   confirm_revision: function() {
     var th = this;
@@ -878,13 +775,13 @@ Page({
     // this.setData({ is_zy: 1 });
   },
   //更换手机
-  go_phone: function(e) {
-    var url = e.currentTarget.dataset.url;
-    this.setData({
-      is_zy: 1
-    });
-    getApp().goto(url);
-  },
+  // go_phone: function(e) {
+  //   var url = e.currentTarget.dataset.url;
+  //   this.setData({
+  //     is_zy: 1
+  //   });
+  //   getApp().goto(url);
+  // },
   //--点击分享事件---
   onShareAppMessage: function(t) {
@@ -911,7 +808,340 @@ Page({
 				}
 			}
 	   });
-  }
+  },
+	
+	//获取输入框内容
+	getInput(e) {
+		return e.detail.value;
+	},
+	
+	verifyInput(e) {
+		let value = e.detail.value;
+		if (value == "" || value == null || value == undefined) {
+		  app.my_warnning("请输入", 0, this);
+		}
+	},
+	
+	//获取推荐人
+	getReferee(e) {
+		let referee = this.getInput(e);
+		this.data.referee = referee;
+		console.log(referee);
+	},
+	
+	//获取姓名
+	getName(e) {
+		let name = this.getInput(e);
+		this.data.name = name;
+	},
+	
+	//获取性别
+	getGender(e) {
+	  let sex = e.currentTarget.dataset.sex;
+	  this.setData({
+			isGender: sex,
+		});
+	},
+	
+	//获取身份证
+	getId(e) {
+		let id = this.getInput(e);
+		this.data.id = id;
+	},
+	
+	//验证身份证号码
+	// verifyId(e) {
+	// 	let id = this.data.id;
+	// 	if(id) {
+	// 		if (id != null && id != undefined &&  id != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(id))) {
+	// 		  getApp().my_warnning("身份证号码无效！", 0, this);
+	// 		}
+	// 	};
+	// },
+	
+	//获取地址
+	getAddress(e) {
+		let address = this.getInput(e);
+		this.data.address = address;
+	},
+	
+	//获取生日
+	bindChange: function(e) {
+		let strBirthday = e.detail.value;
+		let age = this.verifyBirthday(strBirthday);
+
+		if(age <= 10) {
+			app.my_warnning("会员年龄不能小于10岁(含10岁)", 0, this);
+		} else if(age >= 70) {
+			app.my_warnning("会员年龄不能超过70岁(含70岁)", 0, this);
+		} else {
+			this.setData({
+			  datet: e.detail.value,
+			});
+		};
+	  
+		// console.log(this.data.datet, this.data.isCalendar);
+	},
+	
+	// 生日判断
+	verifyBirthday(strBirthday) {
+		var returnAge;  
+		var strBirthdayArr = strBirthday.split("-");  
+		var birthYear = strBirthdayArr[0];  
+		var birthMonth = strBirthdayArr[1];  
+		var birthDay = strBirthdayArr[2];  
+			
+		d = new Date();  
+		var nowYear = d.getFullYear();  
+		var nowMonth = d.getMonth() + 1;  
+		var nowDay = d.getDate();  
+		      
+		if(nowYear == birthYear){  
+				returnAge = 0;//同年 则为0岁  
+		} else {  
+			var ageDiff = nowYear - birthYear ; //年之差  
+			if(ageDiff > 0){  
+				if(nowMonth == birthMonth) {  
+						var dayDiff = nowDay - birthDay;//日之差  
+						if(dayDiff < 0)  
+						{  
+								returnAge = ageDiff - 1;  
+						}  
+						else  
+						{  
+								returnAge = ageDiff ;  
+						}  
+				}  
+					else  
+					{  
+							var monthDiff = nowMonth - birthMonth;//月之差  
+							if(monthDiff < 0)  
+							{  
+									returnAge = ageDiff - 1;  
+							}  
+							else  
+							{  
+									returnAge = ageDiff ;  
+							}  
+					}  
+			}  
+			else  
+			{  
+					returnAge = -1;//返回-1 表示出生日期输入错误 晚于今天  
+			}  
+	}     
+		  return returnAge;//返回周岁年龄  
+	},
+	
+	//是否为农历
+	isLunar(e) {
+		let isLunar = null;
+		if(e.detail.value[0]) {
+			isLunar = 1;
+		} else {
+			isLunar = 0;
+		}; 
+		this.data.isLunar = isLunar;
+		// console.log(isLunar);
+	},
+	
+	// 是否同意协议
+	isAgree(e) {
+		let isAgree = null;
+		if(e.detail.value[0]) {
+			isAgree = true;
+		} else {
+			isAgree = false;
+		}; 
+		// this.data.isAgree = isAgree;
+		this.setData({
+			isAgree,
+		});
+		console.log(isAgree);
+	},
+	
+	
+	//保存
+	save: function() {
+	        var th = this;
+			var sto_sele_id = this.data.sto_sele_id;
+			var user=app.globalData.userInfo;
+			
+			var data = {
+			    store_id: r.stoid,
+			    user_id: app.globalData.user_id,
+			};
+			
+			//-- 需要推荐人 --
+			if(this.data.reg_info.introducer_state){
+				let tjrname = this.data.referee;
+				if (tjrname == "" || tjrname == null) {
+				  app.my_warnning("请输入推荐人", 0, this);
+				  return false;
+				};				
+				if(tjrname==user.mobile || tjrname==user.erpvipno ){
+					app.my_warnning("推荐人不能是自己", 0, this);
+					return false;
+				}	
+				data.tjrname=tjrname;						
+			}
+		
+	    	//-- 需要姓名 --
+			if(this.data.reg_info.name_state){
+				let vipname = this.data.name;
+				if (vipname == "" || vipname == null) {
+				  app.my_warnning("请输入姓名", 0, this);
+				  return false;
+				};
+				data.vipname=vipname;
+			}
+			//需要性别
+			if(this.data.reg_info.sex_state){
+			   let sex = this.data.isGender;
+			   if (sex != "1" && sex != "2") {
+			     app.my_warnning("请选择性别", 0, this);
+			     return false;
+			   };
+			   data.sex=sex;
+			}
+			
+			//需要生日
+			if(this.data.reg_info.birthday_state){
+				let birthday = this.data.datet;
+				if (birthday == "" || birthday == null) {
+				  app.my_warnning("请选择出生日期", 0, this);
+				  return false;
+				};
+			
+				data.birthday=birthday;
+				data.islunar=self.data.isLunar;
+			}
+	
+		    //-- 需要身份证 --
+			if(this.data.reg_info.idcard_state){	
+				let idcard = this.data.id;
+				if (idcard == "" || idcard == null) {
+				  app.my_warnning("请输入身份证号码", 0, this);
+				  return false;
+				};
+				data.idcard=idcard;
+			}
+			//需要地址
+			if(this.data.reg_info.address_state){	
+				let address = this.data.address;
+				if (address == "" || address == null) {
+				  app.my_warnning("请输入地址", 0, this);
+				  return false;
+				};
+				data.address=address;
+			}
+			//需要门店
+			if(this.data.reg_info.pick_state){	
+				let pickup_id = sto_sele_id;
+				if (pickup_id == "" || pickup_id == null) {
+				  app.my_warnning("请输入门店", 0, this);
+				  return false;
+				};
+				data.pickup_id=sto_sele_id;
+			}
+			
+			let isAgree = this.data.isAgree;
+			if(!isAgree) {
+				app.my_warnning("请您先阅读和勾选指定的内容", 0, this);
+				return false;
+			};
+		
+			
+			console.log('data==>', data);
+			
+			app.request.put("/api/weshop/users/updateInfo", {
+			  data: data,
+			  success: function(res) {
+			    if (res.data.code == 0) {
+			      getApp().my_warnning("保存成功", 1, self);
+						getApp().goto("/pages/user/index/index");
+			    } else {
+			      getApp().my_warnning(res.data.msg, 0, self);
+			    };
+			  }
+			})
+			
+		// } else {
+		// 	app.my_warnning("请您先阅读和勾选指定的内容", 0, self);
+		// };
+	  // var isstcsp = th.data.isstcsp; //是否启用消费密码
+	  // var phone = th.data.phone; //手机号码
+	  // if (phone == "" || phone == null) {
+	  //   getApp().my_warnning("手机不能为空", 0, th);
+	  //   return false;
+	  // }
+	  // var consumption = th.data.consumption; //消费密码    
+	  // var isstcsp = th.data.isstcsp;
+	//   if (isstcsp == 1) {
+	
+	//     if (consumption == null || consumption == "" || consumption == undefined) {
+	//       getApp().my_warnning("消费密码不能为空", 0, th);
+	//       return false;
+	//     }
+	//     if (consumption.length < 6) {
+	//       getApp().my_warnning("消费密码不能小于6位", 0, th);
+	//       return false;
+	//     }
+	//   }
+	  // var sex = th.data.isGender; //性别
+	
+	  // if (sex != "1" && sex != "2") {
+	  //   getApp().my_warnning("请选择性别", 0, th);
+	  //   return false;
+	  // }
+	  // var vipname = th.data.user.vipname; //用户姓名
+	  // if (user_name == "" || user_name == null) {
+	  //   getApp().my_warnning("请输入名字", 0, th);
+	  //   return false;
+	  // }
+	  // var identity_card = th.data.identity_card; //身份证
+	
+	  // if (identity_card!=null && identity_card!=undefined &&  identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) {
+	  //   getApp().my_warnning("身份证号码错误", 0, th);
+	  //   return false;
+	  // }
+	  // var address = th.data.address; //地址
+	 //  var sto_sele_id = self.data.sto_sele_id;
+	 //  var data = {
+	 //    store_id: r.stoid,
+	 //    user_id: app.globalData.user_id,
+		// 	tjrname: self.data.referee,					//推荐人
+		// 	vipname: self.data.name, 						//名称
+		// 	sex: self.data.isGender, 						//性别
+		// 	birthday: self.data.datet,
+		// 	islunar: self.data.isLunar,
+		// 	idcard: self.data.id,
+		// 	address: self.data.address,
+	 //    pickup_id: sto_sele_id ,//自提门店 所属门店 
+	 //  };
+		
+		// console.log('data==>', data);
+	  //往上提交美导的ID
+	  // if(th.data.fir_guide_id!=th.data.user.staffId){
+	  //   datas.staffId=th.data.user.staffId;
+	  // }
+	
+	  // app.request.put("/api/weshop/users/updateInfo", {
+	  //   data: data,
+	  //   success: function(res) {
+	  //     if (res.data.code == 0) {
+	  //       getApp().my_warnning("保存成功", 1, self);
+			// 		getApp().goto("/pages/user/index/index");
+	  //     } else {
+	  //       getApp().my_warnning("系统繁忙,请稍后再试", 0, self);
+	  //     };
+	  //   }
+	  // })
+	},
+	
+	
+	
+	
 });
 \ No newline at end of file
@@ -24,22 +24,32 @@
   <view class="user-container">
     <view class="Bbottom">
-			<view bindtap="editUserInfo1" class="user-name flex-vertical" data-type="nickname">
+		
+		   <!-- 如果需要接骚人信息 -->
+			<view class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.introducer_state}}">
 				<view class="user-name-txt">推荐人:</view>
-				<input bindblur="user_name" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/>
-			  <view class="c-red pdl20 fs24">可获10积分</view>
+				<input bindinput="getReferee" bindblur="" value="{{vip_user['fromuser_id']?vip_user['fromuser_id']:''}}"  data-name="推荐人" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/>
+				
+				<block wx:if="{{!vip_user['fromuser_id']}}">
+			      <view class="c-red pdl20 fs24" wx:if="{{reg_info.introducer && (reg_info.introducer_type == 0)}}">+{{reg_info.introducer}}积分</view>
+				  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.introducer && (reg_info.introducer_type == 1)}}">+{{reg_info.introducer}}成长值</view>
+				</block>  
 			</view>
-			
-      <view bindtap="editUserInfo1" class="user-name flex-vertical" data-type="nickname">
-        <view class="user-name-txt">姓名:</view>
-        <input bindblur="user_name" class="user-txt-right f1 pdl20 t-r" placeholder="请输入您的真实姓名"/>
-				<view class="c-red pdl20 fs24">可获10积分</view>
+		
+		    <!-- 如果需要接姓名信息 -->	
+           <view  class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.name_state}}">
+                 <view class="user-name-txt">姓名:</view>
+                 <input bindinput="getName" bindblur=""  value="{{vip_user['vipname']?vip_user['vipname']:''}}"  data-name="姓名" class="user-txt-right f1 pdl20 t-r" placeholder="请输入您的真实姓名"/>
+				 <block wx:if="{{!vip_user['vipname']}}">
+				   <view class="c-red pdl20 fs24" wx:if="{{reg_info.name && (reg_info.name_val_type == 0)}}">+{{reg_info.name}}积分</view>
+				    <view class="c-red pdl20 fs24" wx:elif="{{reg_info.name && (reg_info.name_val_type == 1)}}">+{{reg_info.name}}成长值</view>
+				 </block>
 			</view>
-			<view bindtap="editUserInfo1" class="user-name flex-vertical" data-type="sex">
+			<view class="user-name flex-vertical" data-type="sex" wx:if="{{reg_info.sex_state }}">
 			  <view>性别:</view>
 			  <view class="flex f1 pdl20 jc_fe">
-			    <view class="flex-center {{isGender==1?'Gendercheck':'Gender'}}" data-sex="1" bindtap="isGender">
+			    <view class="flex-center {{isGender==1?'Gendercheck':'Gender'}}" data-sex="1" bindtap="getGender">
 			      <block wx:if="{{isGender==1}}">
 			        <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/malealready.png"></image>
 			      </block>
@@ -48,7 +58,7 @@
 			      </block>
 			      <view class="fs24">男</view>
 			    </view>
-			    <view class="flex-center {{isGender==2?'Gendercheck':'Gender'}} mgl20" data-sex="2" bindtap="isGender">
+			    <view class="flex-center {{isGender==2?'Gendercheck':'Gender'}} mgl20" data-sex="2" bindtap="getGender">
 			      <block wx:if="{{isGender==2}}">
 			        <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/femalealready.png"></image>
 			      </block>
@@ -58,86 +68,103 @@
 			      <view class="fs26">女</view>
 			    </view>
 			  </view>
-				<view class="c-red pdl20 fs24">可获10积分</view>
+			  
+			    <block wx:if="{{!vip_user['sex']}}">
+				  <view class="c-red pdl20 fs24" wx:if="{{reg_info.sex && (reg_info.sex_state_type == 0)}}">+{{reg_info.sex}}积分</view>
+				  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.sex && (reg_info.sex_state_type == 1)}}">+{{reg_info.sex}}成长值</view>
+				</block>
 			</view>
-			<view bindtap="editUserInfo1" class="user-name flex-vertical" data-type="sex">
+			<view class="user-name flex-vertical" data-type="birthday" wx:if="{{reg_info.birthday_state}}" style="justify-content: space-between;">
 			  <view class="shrink0">出生日期:</view>
 			  <view class="flex fs28 Birth pdl20 jc_fe">
-			    <view class="flex" bindtap="iscalendar">
-			  			  
-			      <block wx:if="{{iscalendar}}">
-			        <view class="flex-center">
-			          <icon size="20" type="success" color="rgb(212,2,31)"></icon>
-			        </view>
-			      </block>
-			      <block wx:else>
-			        <icon size="20" type="success" color="rgb(0, 0, 0, 0.4)"></icon>
-			      </block>
-			
-			
-			      <view class="flex-center">
-			        <view class="Mleft">农历</view>
-			      </view>
-			    </view>
-			    <view class="user-txt-right pdl20">
-			      <!-- 填充数据的时候要判断是否已经有出生日期，有值的话就不可修改 -->
-			      <block wx:if="{{user.birthday==''||user.birthday==null}}">				
-			        <picker bindchange='bindChange' value="{{datet}}" mode="date" start="{{year-70}}-1-1" end="{{year}}-12-31">
-				  {{datet?datet:"请选择时间"}}
+			    <view class="user-txt-right pdl20 flex ai-center">
+							<checkbox-group bindchange="isLunar">
+								<label class="flex ai-center">
+									<checkbox value="{{isLunar}}" checked="{{isLunar}}"/>农历
+								</label>
+							</checkbox-group>
+			        <picker class="pdl20" bindchange='bindChange' mode="date" start="{{year-70}}-1-1" end="{{year}}-12-31">
+								<view class="flex ai-center">{{datet?datet:"请选择时间"}}<view class="angle">∟</view></view>
 			        </picker>
-			      </block>
-			      <block wx:else>
-			        <view>{{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}}</view>
-			      </block>
+
 			    </view>
 			  </view>
-				<view class="c-red pdl20 fs24 shrink0">可获10积分</view>
+			  
+			   <block wx:if="{{!vip_user['birthday']}}">
+				  <view class="c-red pdl20 fs24 shrink0" wx:if="{{reg_info.birthday && (reg_info.birthday_type == 0)}}">+{{reg_info.birthday}}积分</view>
+				  <view class="c-red pdl20 fs24 shrink0" wx:elif="{{reg_info.birthday && (reg_info.birthday_type == 1)}}">+{{reg_info.birthday}}成长值</view>
+				</block>
 			</view>
-      <view bindtap="editUserInfo1" class="user-name flex-vertical" data-type="nickname">
-        <view class="user-name-txt shrink0">身份证号码:</view>
-        <input bindblur="identity_card" class="user-txt-right pdl20 f1 t-r" value="{{user.idcard}}" placeholder="请输入身份证号码"></input>
-				<view class="c-red pdl20 fs24 shrink0">可获10积分</view>
+      <view class="user-name flex-vertical" data-type="nickname" wx:if="{{reg_info.idcard_state}}">
+         <view class="user-name-txt shrink0">身份证:</view>
+         <input bindinput="getId" bindblur="IdentityIDCard" value="{{vip_user.idcard}}"  class="user-txt-right pdl20 f1 t-r" placeholder="请输入身份证号码"></input>
+		 <block wx:if="{{!vip_user.idcard}}">
+				<view class="c-red pdl20 fs24" wx:if="{{reg_info.idcard && (reg_info.idcard_type == 0)}}">+{{reg_info.idcard}}积分</view>
+				<view class="c-red pdl20 fs24" wx:elif="{{reg_info.idcard && (reg_info.idcard_type == 1)}}">+{{reg_info.idcard}}成长值</view>
+		</block>		
       </view>
-      <view class="user-name flex-vertical" data-type="mobile">
+      <view class="user-name flex-vertical" data-type="mobile" wx:if="{{reg_info.address_state}}">
         <view class="user-name-txt">地址:</view>
-        <input bindblur="address" maxlength="30" value="{{user.address}}" class="user-txt-right f1" placeholder="请输入详细地址" style="text-align:right" />
-				<view class="c-red pdl20 fs24">可获10积分</view>
+            <input bindinput="getAddress" bindblur="" value="{{vip_user.address?vip_user.address:''}}"  data-name="姓名" class="user-txt-right f1" placeholder="请输入详细地址" style="text-align:right" />
+			<block wx:if="{{!vip_user.address}}">
+			  <view class="c-red pdl20 fs24" wx:if="{{reg_info.address && (reg_info.address_type == 0)}}">+{{reg_info.address}}积分</view>
+			  <view class="c-red pdl20 fs24" wx:elif="{{reg_info.address && (reg_info.address_type == 1)}}">+{{reg_info.address}}成长值</view>
+			</block>
       </view>
-			
-			<view bindtap="" class="user-name flex-vertical" data-type="mobile">
-			  <view class="user-name-txt">手机:</view>
-			  <input bindblur="" class="user-txt-right f1 pdl20 t-r" placeholder="请输入手机号码"/>
-				<view class="c-red pdl20 fs24">可获10积分</view>
-			</view>
-			
-			<view bindtap="editUserInfo1" class="user-name flex-vertical" data-type="nickname">
-			  <view class="user-name-txt">验证码:</view>
-			  <input bindblur="" class="user-txt-right f1 pdl20 t-r" placeholder="请输入"/>
-				<view class="mgl20 fs24 btn pd10">获取验证码</view>
-			</view>
-			
-
+		
       <!-- 选择门店 -->
-      <view bindtap="onclickstore" class="user-name flex-vertical" data-type="email">
+      <view bindtap="onclickstore" class="user-name flex-vertical" data-type="email"  wx:if="{{reg_info.pick_state}}">
         <view class="user-name-txt">所属门店:</view>
         <view class="user-txt-right f1 flex ai_c jc_fe">
-          <view class="one-line">{{stoname}}</view>
+          <view class="one-line">{{stoname?stoname:'请选择门店'}}</view>
           <view class="angle">∟</view>
         </view>
-				<view class="c-red pdl20 fs24">可获10积分</view>
+		
+		<block wx:if="{{!vip_user.pickup_id}}">
+				<view class="c-red pdl20 fs24" wx:if="{{reg_info.pick && (reg_info.pick_type == 0)}}">+{{reg_info.pick}}积分</view>
+				<view class="c-red pdl20 fs24" wx:elif="{{reg_info.pick && (reg_info.pick_type == 1)}}">+{{reg_info.pick}}成长值</view>
+		</block>		
       </view>
+			<!-- 我的兴趣 -->
+			<view wx:if="{{ isBool==1 && is_lable_set==1}}" class="padding Bbottom">
+			<!-- 我的兴趣 -->
+			<view wx:if="{{is_lable_set!=null && is_lable_set==1}}" class="Bbottom">
+			  <view class="interest fs28">
+			    <view class="flex-vertical-between" bindtap="goto" data-url="/pages/user/labels/labels">
+			      <view class="fs30">我的兴趣</view>
+			      <view class="angle">∟</view>
+			    </view>
+			    <!-- 选中的标签 -->
+			    <view class="lables">
+			      <block wx:if="{{check_label.length>0}}">
+			        <view class="lable" wx:for="{{check_label}}" wx:for-item="label">
+			          <view class="ellipsis-1">{{label}}</view>
+			        </view>
+			      </block>
+			      <!-- 添加标签按钮 -->
+			      <view class="add_lable ib ellipsis-1" bindtap="goto" data-url="/pages/user/labels/labels">
+			        <text class="plus">+</text>
+			        <text>标签</text>
+			      </view>
+			    </view>
+			  </view>
+			</view>
+			</view>
+			
 			<view bindtap="" class="user-name flex-vertical fs24">
-				<checkbox/>
-			  <view class="user-name-txt">我已阅读同意 <text class="red">《用户使用协议》</text>与<text class="red">《隐私政策》</text></view>
+				<checkbox-group bindchange="isAgree">
+					<checkbox value="true"/>
+				</checkbox-group>
+			  <view class="user-name-txt">我已阅读同意 <text class="red" bindtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="red" bindtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view>
 			</view>
     </view>
@@ -145,8 +172,8 @@
 <!-- 保存按钮 -->
 <view class="confirm">
-  <view class="fs30 confirmtext" bindtap="confirm_revision">保存</view>
-	<view class="star fs24 t-c pdt10 c9">保存成功即可获得一张20.00元优惠券</view>
+  <view class="fs30 confirmtext" bindtap="save">保存</view>
+	<view class="star fs24 t-c pdt10 c9" wx:if="{{couponInfo}}">保存成功即可获得一张{{couponInfo}}</view>
 </view>
 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
@@ -623,7 +623,7 @@ input {
 }
 .interest {
-  padding: 0rpx 20rpx;
+  /* padding: 0rpx 20rpx; */
   padding-top: 30rpx;
   padding-bottom: 30rpx;
 }
@@ -145,9 +145,9 @@ Page({
 	  var item=this.data.share_good;
 	  var price = item.money;		
 	  var title= item.serviceName;		
-	  var img=this.data.url+item.original_img;
+	  var img=this.data.url+item.imgUrl;
-	  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+	  var url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + item.id;
 	  if(getApp().globalData.user_id){
 	    url+="&first_leader="+getApp().globalData.user_id;
 	  }	  
@@ -777,7 +777,7 @@ Page({
 	   var ee = this;
 	   //获取商品是分享图信息
 	   wx.getImageInfo({
-	     src: ee.data.url+ee.data.share_good.original_img,
+	     src: ee.data.url+ee.data.share_good.imgUrl,
 	     success: function(res) {
 	       //res.path是网络图片的本地地址
 	       ee.data.share_goods_img = res.path;
@@ -837,7 +837,7 @@ Page({
 	 go_goods:function(e){
 		 var index=e.currentTarget.dataset.index;
 		 var item=this.data.list[index];
-		 var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+		 var url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + item.id;
 		 getApp().goto(url); 
 	 },
@@ -45,7 +45,7 @@
 				</view>
 				<view class="details">
 					<view class="ellipsis-2 fs28 name">{{item.serviceName}}</view>	
-					<view class="fs26 pdt10">有效天数：{{item.validDays}}</view>				
+					<view class="fs26 pdt10">有效天数：{{item.validDays?item.validDays:'不限'}}</view>
 					<view class="flex ai-center pdt14 jc_sb">												
 					   <view class="red fs26">￥{{item.money}}</view>
 						 <view class="gray fs24">已售：<text class="red">{{item.sales_sum}}</text></view>
@@ -20,6 +20,7 @@ Page({
     //------初始化加载----------
     onLoad: function(t) {
+		wx.setNavigationBarTitle({ title: "天天拼单",})
         var  first_leader = t.first_leader;
 		var th=this;
@@ -54,10 +55,10 @@ Page({
     },
     onShow: function(t) {
-
-       wx.setNavigationBarTitle({ title: "天天拼单",})
+     
        this.data.is_timer=1;
        this.data.currentPage=1;
+	   this.data.ismore=1;
        this.setData({goodlist:null});
        var th=this;
        this.requestSalelist();
-<block wx:if="{{isshow}}">
-
 <view class=" body_frame">
 <block wx:if="{{ad_data}}">
@@ -89,6 +87,7 @@
 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
 </view>
-</block>
+
+
 <share_box id="share"></share_box>
 \ No newline at end of file
@@ -16,6 +16,8 @@ Page({
     //------初始化加载----------
     onLoad: function(t) {
+		 wx.setNavigationBarTitle({ title: "商品秒杀",})
+		
         var  first_leader = t.first_leader;
 		var th=this;
@@ -51,10 +53,8 @@ Page({
     },
-    onShow: function(t) {
-
-        wx.setNavigationBarTitle({ title: "商品秒杀",})
-
+    onShow: function(t) {       
+       this.data.ismore=1;
        this.data.is_timer=1;
        this.data.currentPage=1;
        var th=this;th.setData({goodlist:null,})
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
-<block wx:if="{{isshow}}">
+
 <view class=" body_frame">
 <block wx:if="{{ad_data}}">
@@ -76,6 +76,6 @@
 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
 </view>
-</block>
+
 <share_box id="share"></share_box>
@@ -783,7 +783,7 @@ Page({
                         isShowLoading: 0,
                         success: function(res_d) {
-                            if(res_d.data.code==0){
+                            if(res_d.data.code==0 && res_d.data.data){
                                 if (t.goods_num > store_count) {
                                     wx.showModal({
                                         title: '提示',
@@ -1331,10 +1331,9 @@ Page({
         });
     },
     //跳到首页
-    goto: function(e) {
-        navigateTo({
-            url: '/pages/index/index/index',
-        })
+    goto: function(e) {  
+         var  url='/pages/index/index/index';		
+		 getApp().goto(url);
     },
     //---加载更多是靠这个函数----
@@ -2,9 +2,17 @@
 <template is="tabBar" data="{{tabBar}}" />
  -->
 <!-- 广告图片 -->
+
 <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
-  <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
+  <image mode="widthFix" class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
+</navigator>
+
+<navigator bindtap="nav_goto" class="picture" data-url="{{ad_data.ad_weapplink}}" wx:if="{{ad_data}}">
+  <image mode="widthFix" class="picture" src="{{ad_data.ad_code}}"></image>
 </navigator>
+
+
+
 <view class="container" wx:if="{{requestData.length>0}}">
   <!-- 购物车商品框架 -->
   <view class="login-in">
@@ -22,7 +22,6 @@ page {
 .picture {
   width: 100%;
-  height: 220rpx;
 }
 .container {
@@ -671,7 +671,7 @@ Page({
                               ob.buynum=num;
                               ob.weight=data.gift_weight;              //商品的重量
                               ob.exp_sum_type=data.gift_exp_sum_type;  //商品的物流计算方式
-							  ob.uniform_exp_sum=data.uniform_exp_sum  //统一运费的金额
+							  ob.uniform_exp_sum=data.gift_uniform_exp_sum  //统一运费的金额
                               th.setData({buy_now_gift_goods:ob});
                           }
@@ -1541,7 +1541,8 @@ Page({
           //如果有赠品的时候，也要计算赠品的物流费用
           if(th.data.buy_now_gift_goods){
-              shipping_price=th.get_now_gift_goods_wuliu(code, o_shipping_price, th.data.user_addr, gift_freight_free, parseFloat(allpice)-cut_price-quan_price, rs,shipping_price,no_by_data);
+              shipping_price=th.get_now_gift_goods_wuliu(code, o_shipping_price, th.data.user_addr, gift_freight_free, 
+			       parseFloat(allpice)-cut_price-quan_price, rs,shipping_price,no_by_data,goods_weight,goods_piece);
           }
           if(shipping_price<=0){
@@ -3161,7 +3162,7 @@ Page({
                 arr.gift_original_img = get_data.goodsinfo.original_img;
                 arr.gift_weight = get_data.goodsinfo.weight;
                 arr.gift_exp_sum_type = get_data.goodsinfo.exp_sum_type;
-				arr.uniform_exp_sum = get_data.goodsinfo.uniform_exp_sum;
+				arr.gift_uniform_exp_sum = get_data.goodsinfo.uniform_exp_sum;
                 arr.gift_limit_num = get_data.limit_num;
                 arr.gift_storecount = get_data.gift_storecount;
             }
@@ -3239,7 +3240,7 @@ Page({
     },
   //计算立即购买赠品的物流费用
-  get_now_gift_goods_wuliu:function (code, o_shipping_price, user_addr, gift_freight_free,allpice, rs,shipping_price,no_by_data) {
+  get_now_gift_goods_wuliu:function (code, o_shipping_price, user_addr, gift_freight_free,allpice, rs,shipping_price,no_by_data,goods_weight1,goods_piece1) {
         var good=this.data.buy_now_gift_goods;
         var  goods_weight=-1, goods_piece=-1;
         var gift_shipping_price=0;
@@ -3247,17 +3248,28 @@ Page({
         switch (good['exp_sum_type']) {
             case 1:
                 //统一运费
-                gift_shipping_price += good['uniform_exp_sum']; break;
+                gift_shipping_price += good['uniform_exp_sum']; 
+				gift_shipping_price+=o_shipping_price;
+				break;
             case 2:
                 if (goods_weight < 0) goods_weight = 0;
                 //累积商品重量 每种商品的重量 * 数量
-                goods_weight += good['weight'] * good['buynum'];break;
+                goods_weight += good['weight'] * good['buynum'];
+				if(goods_weight1>0){
+					goods_weight+=goods_weight1;
+				}
+				break;			
             case 3:
                 if (goods_piece < 0) goods_piece = 0;
                 //累积商品数量
-                goods_piece += good['buynum']; break;
+                goods_piece += good['buynum']; 
+				if(goods_piece1){
+					goods_piece+=goods_piece1;
+				}		
+				break;
         }
-
+		
+	
         //如果有设置不包邮区域的时候
         if(no_by_data && no_by_data.region_list){
             if(th.check_by_area(no_by_data.region_list)){
@@ -3272,10 +3284,11 @@ Page({
                 //th.data.is_no_by[th.data.bn_pick]=1;
             }
         }
+		
         var t_shipping_price=
             this.calculatewuliu(code, gift_shipping_price, goods_weight,
                 goods_piece, user_addr, gift_freight_free, allpice, rs);
-        return t_shipping_price+shipping_price;
+        return t_shipping_price;
     },
@@ -551,6 +551,7 @@ Page({
   //------调起支付框--------
   weixinPay: function(n, success,fail) {
+	if(!n) return false;  
     var th=this;
     wx.requestPayment({
       timeStamp: String(n.timeStamp),
@@ -6,7 +6,8 @@ Page({
      msg:"",
   },
-  onLoad:function(t){
+  onLoad:function(t){  
+	getApp().err_going=1;    
     var th=this,app = getApp(); 
     app.getConfig(function(e){
         th.setData({ store:e,msg:t.msg});
@@ -104,9 +104,12 @@ Page({
         var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert";
         getApp().request.json_post(url, json,
           function(res) {
-            if (res.data.code == 0) {
-              var order_sn = res.data.data.orderSn;
-              res = res.data.data.result;
+            if (res.data.code == 0 && res.data.data) {
+			   	
+              var order_sn = res.data.data.orderSn;	  
+              res = res.data.data.result;		  
+			  if(!res) return false;
+			  
               var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
                 timeStamp: String(res.timeStamp),
@@ -118,7 +121,7 @@ Page({
                   getApp().goto(url);
                 },
                 fail: function(res) {
-                  getApp().my_confirm("取消支付", 0, th);
+                  getApp().my_warnning("取消支付", 0, th);
                 }
               });
             } else {
@@ -113,6 +113,9 @@ Page({
           function(res) {
             if (res.data.code == 0) {
               var res = res.data.data;
+			  if(!res) return false;
+			  if(!res.result) return false;
+			  			  
               var order_sn = res.orderSn;
               var url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" + order_sn;
               wx.requestPayment({
@@ -1587,11 +1587,10 @@ Page({
           th.setData({goodsInputNum:redis_num})
           return false;
         }
-
       }
-
       var e = th.data.sele_g.store_count;
-      if(th.data.sales_rules==2){
+	  var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4
+      if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){
         if(!th.data.def_pick_store){
           wx.showModal({ title: '请选择门店', });
           return false;
@@ -1599,7 +1598,7 @@ Page({
           e=th.data.def_pick_store.CanOutQty;
         }
       }
-
+	  if(!e) e=0;
       //库存不足，不增加
       if(e<t){ wx.showModal({ title: '库存不足', });
         if(e<0) e=0;
@@ -1669,7 +1668,8 @@ Page({
       }
       var e = th.data.sele_g.store_count;
-      if(th.data.sales_rules==2){
+	  var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4	  
+      if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){
         if(!th.data.def_pick_store){
           wx.showModal({ title: '请选择门店', });
           return false;
@@ -1677,7 +1677,7 @@ Page({
           e=th.data.def_pick_store.CanOutQty;
         }
       }
-  
+	  if(!e) e=0;
       //库存不足，不增加
       if(e<t){ wx.showModal({ title: '库存不足', });
         if(e<0) e=0;
@@ -3228,7 +3228,7 @@ Page({
   openSpecModel_pt: function(e) {
-    this.setData({ open_ind_store: 4});//拼团直接给4
+    this.setData({ open_ind_store: 4,goodsInputNum:1});//拼团直接给4
     //--先判断会员状态--
@@ -5137,7 +5137,7 @@ Page({
 	 //-- 积分购 --
 	 go_pay_integral:function(){
 		this.get_sto(0)
-		this.setData({openSpecModal_inte:1}); 
+		this.setData({openSpecModal_inte:1,goodsInputNum:1}); 
 	 },
 	  //-- 积分购普通购买 --
 	 go_pay_integral_normal:function(){
+ module.exports = {
+	//判断要不要显示全屏广告 
+	get_the_full_screen(th){	
+		var stoid=getApp().globalData.setting.stoid;	
+		if(th.data.full_ad) {			
+			return false;		
+		}
+		//获取全屏的广告
+		getApp().promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + stoid,{
+			data: { enabled: 1 }
+		}).then(res=>{
+			 //判断是不是有全屏广告 	
+			 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
+				 th.setData({
+					 is_full_screen_show:1,
+					 full_ad:res.data.data.pageData[0],		 
+				 })				 
+				 //--定时关闭--
+				 th.data.full_screen=setInterval(function(){
+					 if(!th.data.sec_show) {
+						  clearInterval(th.data.full_screen);
+						  th.close_full_screen();
+						  return false;
+					 }
+					 th.data.sec_show--;
+					 th.setData({sec_show:th.data.sec_show});		 
+				 },1000)						
+			 }	
+		})
+	}
+}
 \ No newline at end of file
@@ -15,6 +15,7 @@ var regeneratorRuntime = require(&#39;../../../utils/runtime.js&#39;);
 var api = require('../../../api/api.js');
 var d = getApp().globalData;
+var full_screen = require('full_screen.js');
 Page({
   data: {
@@ -75,18 +76,82 @@ Page({
 	showHongbao: false,
 	showHongbaoSmall: false,
-
+	
+	is_full_screen_show:0,  //全屏显示
+	sec_show:3,    //倒计时的秒数
+	full_ad:null,  //全屏广告
+	full_screen:0, //全屏广告
+	
   },
   onLoad: async function(tt) {
     console.log("进入首页-------------");  
-	console.log(tt);  
-	 	    
+	console.log(tt);   	    
     var th = this;	
 	var first_leader=tt.first_leader;
 	if(!first_leader && tt.scene){	
 		first_leader= decodeURIComponent(tt.scene); 		
 	}
+
+	getApp().getConfig(function(e){
+		//--首页的问题--
+		if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
+		  wx.setNavigationBarTitle({
+		    title: getApp().globalData.config.store_name,
+		  });
+		} else {
+		  wx.setNavigationBarTitle({
+		    title: getApp().globalData.setting.appName,
+		  });
+		};
+	});
+	
+	
+	var th = this;
+	
+	getApp().getConfig2(function(config2){
+		if(config2 && config2.is_overdue==1){
+			  getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{	  
+				 var o=res;
+				 if (o.data.code == 0) {
+				    var ob = { isout: 0, isbuy: 1 };
+				    var arr = o.data.data.pageData;
+				    var isbuy = 0;
+				    //----如果数组不为空----
+				    if (arr.length > 0) {
+				      arr.forEach(function (val, ind) {
+				        if (val.is_sy == 0 && val.type == 5) {
+				          isbuy = 1;
+				          var now = ut.gettimestamp();
+				          if (now > val.end_time) ob.isout = 1;
+				          return false;
+				        }
+				      })
+				    }
+				    ob.isbuy = isbuy;	   
+					
+					var pages = getCurrentPages();             //获取加载的页面
+					var currentPage = pages[pages.length - 1];  //获取当前页面的对象
+					
+					console.log("当前路由");
+					console.log(currentPage.route);
+					
+					
+				    th.setappdata(ob);
+					
+					if(ob.isbuy && !ob.isout){
+						th.onload_init();
+					}				
+				 }else{
+					 th.onload_init();
+				 }				   
+			})		  			 
+		}
+	
+	    else{
+			 th.onload_init();
+		}
+	})
 	if(first_leader){
 		 //--  user_id代过来免登录 --
@@ -97,7 +162,7 @@ Page({
 	             getApp().globalData.guide_id=res.data.data.id;
 	         }
 	     })
-	 }
+	}
 	// 判断是否有红包活动 
 	getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/'+getApp().globalData.setting.stoid, {
@@ -144,72 +209,74 @@ Page({
     //getApp().globalData.url=th.data.url
     //t.editTabBar(th,o.stoid,th.data.url);
-    await this.init_load();
-
-
-    //显示的时候要开启计时器
-    this.data.is_timer = 1;
-    //如果是自定义模板
-    if (this.data.isTemplate) {
-      //---先获取会员---
-      t.getUserFir(function() {
-        th.is_festival();
-        var new_nav = th.data.new_nav;
-        if (new_nav == "") {
-          th.is_new();
-        }
-        setTimeout(function () {
-          if (getApp().globalData.user_id) getApp().requestCardNum(th);
-        },500)
-
-      });
-    } else {
-      await this.init_fir();
-      wx.setNavigationBarColor({
-        frontColor: '#ffffff', // 必写项
-        backgroundColor: '#ff7295', // 必写项
-      })
-    }
-
-    //--正再拼团中的处理--
-    var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
-    await getApp().request.promiseGet(url, {}).then(res => {
-      if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
-        th.data.pt_timer_arr = res.data.data.pageData;
-      }
-    })
-    if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) {
-      for (var i in th.data.pt_timer_arr) {
-        var p_item = th.data.pt_timer_arr[i];
-        await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {
-          1: 1
-        }).then(res => {
-          th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
-          th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
-        })
-      }
-      th.Interval_pt();
-    }
-
-    //---处理正在6个分类----
-    await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
-      data: {
-        store_id: os.stoid,
-        pageSize: 5,
-        is_show: 1,
-        level:1
-      }
-    }).then(res => {
-      if (res.data.data) {
-        var gd_category = res.data.data.pageData;
-        th.setData({
-          gd_category: gd_category
-        });
-      }
-    })
-
-   		
   },
+  
+  async onload_init(){	
+	  var th=this;
+	  await this.init_load();  
+	  //显示的时候要开启计时器
+	  this.data.is_timer = 1;
+	  //如果是自定义模板
+	  if (this.data.isTemplate) {
+	    //---先获取会员---
+	    t.getUserFir(function() {
+	      th.is_festival();
+	      var new_nav = th.data.new_nav;
+	      if (new_nav == "") {
+	        th.is_new();
+	      }
+	      setTimeout(function () {
+	        if (getApp().globalData.user_id) getApp().requestCardNum(th);
+	      },500)
+	  
+	    });
+	  } else {
+	    await this.init_fir();
+	    wx.setNavigationBarColor({
+	      frontColor: '#ffffff', // 必写项
+	      backgroundColor: '#ff7295', // 必写项
+	    })
+	  }
+	  
+	  //--正再拼团中的处理--
+	  var url = "/api/weshop/order/pageTuan?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
+	  await getApp().request.promiseGet(url, {}).then(res => {
+	    if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+	      th.data.pt_timer_arr = res.data.data.pageData;
+	    }
+	  })
+	  if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) {
+	    for (var i in th.data.pt_timer_arr) {
+	      var p_item = th.data.pt_timer_arr[i];
+	      await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {
+	        1: 1
+	      }).then(res => {
+	        th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
+	        th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
+	      })
+	    }
+	    th.Interval_pt();
+	  }
+	  
+	  //---处理正在6个分类----
+	  await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
+	    data: {
+	      store_id: os.stoid,
+	      pageSize: 5,
+	      is_show: 1,
+	      level:1
+	    }
+	  }).then(res => {
+	    if (res.data.data) {
+	      var gd_category = res.data.data.pageData;
+	      th.setData({
+	        gd_category: gd_category
+	      });
+	    }
+	  }) 		
+  },
+  
+ 
   //关闭新用户领取广告
   close_disgraceful: function() {
     var th = this;
@@ -255,9 +322,8 @@ Page({
 			if(!userInfo || !userInfo.user_id) userInfo=null;
 			//有加载过一次首页，就显示
 			if(show || userInfo || getApp().globalData.user_id){
-			            setTimeout(function(){
-			   			   var full_screen = th.selectComponent("#full_screen"); //组件的id
-			   			   full_screen.get_the_full_screen();
+			            setTimeout(function(){			
+			   			   full_screen.get_the_full_screen(th);
 			   		    },800)	
 			   			//动画效果
 			   			if(!th.data.f_hidden){
@@ -282,25 +348,18 @@ Page({
     this.data.is_timer = 0;
     clearInterval(this.data.pt_timer);
 	clearInterval(this.data.w_holiday_pop);
+	clearInterval(this.data.full_screen);
+	
 	this.data.w_holiday_pop=0;
     for(var i = 1; i < 100; i++) {
       clearInterval(i);
     }
-
   },
   //同步初始加载
   async init_load() {
-    await getApp().getConfig_ays();
-    var th = this;
-	if(getApp().globalData.config2.is_overdue==1){
-		  await getApp().get_isbuy();
-		  this.setappdata(getApp().globalData.wxapp_buy_obj);
-	}
-   
-
-
+    var th=this;
     //因为营销版本的功能包含了自定义模板的功能，是同时的
     //读取全局是否有弄自定义模板
     await api.get_template_fir(o.stoid).then(res => {
@@ -327,16 +386,7 @@ Page({
-    //--首页的问题--
-    if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
-      wx.setNavigationBarTitle({
-        title: getApp().globalData.config.store_name,
-      });
-    } else {
-      wx.setNavigationBarTitle({
-        title: getApp().globalData.setting.appName,
-      });
-    };
+   
@@ -1005,5 +1055,17 @@ Page({
 			showHongbaoSmall: true, //显示抢红包小图标
 		});
 	},
+	
+	/*-- 全屏广告 --*/
+	close_full_screen(){
+		this.setData({is_full_screen_show:0,sec_show:0});
+	},
+	//-- 跳转到满屏广告的链接 --
+	go_full_ad(){
+		if(!this.data.full_ad) return false;
+		if(!this.data.full_ad.ad_weapplink) return false;
+		getApp().goto(this.data.full_ad.ad_weapplink);
+		this.close_full_screen();
+	},   
 });
 \ No newline at end of file
@@ -18,7 +18,6 @@
         "mvideo": "/components/diy_video/diy_video",    
         "service": "/components/diy_service/diy_service",
 		"scan": "/components/diy_scan/diy_scan",
-		"full_screen": "/components/full_screen/full_screen",
 		"store_select": "/components/diy_store_select/diy_store_select"
     },
 	"enablePullDownRefresh": false
 <!-- <view hidden="{{f_hidden}}" class="full_screen" style="background-color: #fff;"></view> -->
-<full_screen id="full_screen"></full_screen>
+<!-- <full_screen id="full_screen"></full_screen> -->
+
+<!-- 全屏控制 -->
+<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
+	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
+</view>
+
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
@@ -106,14 +112,12 @@
     </view>
   </view>
-
-  
-
-  <!---大分类--->
+  <!-- 大分类 -->
   <view class="flex-center-around">
     <view wx:for="{{gd_category}}" bindtap="go_cate2" data-cid="{{item.id}}" data-pid="0">
       <view class="circle  xc-class-frame t-c">
-        <image class="xc-class-img" src="{{item.icoimg==null||item.icoimg==''?url+item.icon:item.icoimg}}" binderror="bind_bnerr_icon" data-err="gd_category[{{index}}].icon"></image>
+        <image class="xc-class-img" src="{{item.icoimg==null||item.icoimg==''?(item.image?url+item.image:url+'/miniapp/images/no_cate_def.png'):item.icoimg}}" 
+		   binderror="bind_bnerr_icon" data-err="gd_category[{{index}}].icon"></image>
         <view class="fs24 gonju ellipsis-1">{{item.name}}</view>
       </view>
     </view>
@@ -977,3 +977,9 @@ page {
 	background-size: 100% 100%;
 	background-repeat: no-repeat;
 }
+.skip_box{
+        float: right;  margin-top: 10rpx;  margin-right: 10rpx;
+        background-color: gainsboro;  width: 120rpx;
+        height: 48rpx;  font-size: 28rpx;  line-height: 48rpx;
+        text-align: center;  border-radius: 20rpx;
+ }
@@ -721,11 +721,12 @@ Page({
   go_pay:function () {
       var th=this;
 	  var def_pick_store=this.data.def_pick_store;
-	  if(def_pick_store) {
+	  if(def_pick_store && def_pick_store.pickup_id) {
 		  th.data.pick_id=def_pick_store.pickup_id;  //选择门店	 
 		  th.data.end_name=def_pick_store.pickup_name; 
 	  } 	  
-      if (th.data.pick_id == 0) return s.my_warnning("请选择门店", 0, th);
+      if (!th.data.pick_id) return s.my_warnning("请选择门店", 0, th);
+	  if (th.data.pick_id==0) return s.my_warnning("请选择门店", 0, th);
       //----判断起购数----
       var qnum=parseFloat(th.data.teamlist.minbuynum);
@@ -215,26 +215,29 @@
 				<view style="margin-top: 20rpx">
 					<view class="flex-space-between address ai_end xc-width ">
-						<view class="flex ai_end" wx:if="{{def_pick_store}}">
+						<view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 							<text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
 							<view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
 								距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
 							</view>
 						</view>
-						<view class="red-co fs28" bindtap="choice_store" wx:if="{{def_pick_store}}">
-							更多门店
-							<text class="right-arrow"></text>
-						</view>						
+						
+										
 						<view class="flex" bindtap="choice_store" wx:else>
 								<image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
 								<view class="fs28 xc-ash-9f">选择门店</view>
 					    </view>
+						
+						<view class="red-co fs28" bindtap="choice_store">
+							更多门店
+							<text class="right-arrow"></text>
+						</view>		
 					</view>
 					<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
-					<view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store}}">地址:5{{def_pick_store.fulladdress}}</view>
+					<view class="fs24 xc-ash-9f xc-distance-top " wx:elif="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
 				</view>
 				<!-- 商品的属性项目 -->
@@ -10,21 +10,41 @@ Page({
 	imghots: os.imghost,
 	store_logo:'',
 	first_leader:'',   //-- 邀请人 --
+	config2:null,
   },
   onLoad: function (options) {
+	  if (wx.getUserProfile) {
+	        this.setData({
+	          canIUseGetUserProfile: true
+	        })
+	  }
+	  
 	   getApp().globalData.isLoad_ad=1;	
 	   //--判断是否有接受到邀请人的ID--
 	   if(options.first_leader){
-	      this.setData({first_leader:options.first_leader});
+	       this.setData({first_leader:options.first_leader});
 	   }else if(getApp().globalData.first_leader){
-		   this.setData({first_leader:getApp().globalData.first_leader});
-		   
+		   this.setData({first_leader:getApp().globalData.first_leader});	   
 	   } 	  
 	   var th=this;
 	   app.getConfig(function (e) {
 		    var logo=th.data.imghots+e.store_logo;		   
 	        th.setData({ store: e,store_logo:logo});
-	   })	  
+	   })	
+	  
+	   //判断注册的条件	   
+	   app.getConfig2(function (e) {
+	   		if(e.reg_type==1){			
+				var arr=JSON.parse(e.reg_info);		
+				if(arr['name_state']==1) th.data.name_need_go=1;
+				if(arr['birthday_state']==1) th.data.birth_need_go=1;
+				if(arr['idcard_state']==1) th.data.idcard_need_go=1;
+				if(arr['address_state']==1) th.data.address_need_go=1;
+				if(arr['pick_state']==1) th.data.pick_need_go=1;
+				if(arr['sex_state']==1) th.data.sex_need_go=1;
+				if(arr['introducer_state']==1) th.data.introducer_need_go=1;	
+			}         
+	   },1)	 
   },
   //绑定手机号
   getphone:function (e) {
@@ -38,8 +58,7 @@ Page({
     var th=this;  
     var sessionKey = getApp().globalData.sessionKey;
     var openid = getApp().globalData.openid;
-	var r=getApp().globalData.getu;
-  
+	var r=getApp().globalData.getu; 
 	th.save_the_data(r,e,sessionKey,openid)
   },
@@ -92,6 +111,7 @@ Page({
 		    });
 		  }
 		})	  
+	
 	})		
   },
@@ -163,11 +183,52 @@ Page({
         } else {
           return app.showWarning("授权登入失败！"+e.data.msg);
         }
-		 
-        wx.setStorageSync("userinfo",e.data.data);
+
+		var need_go=0; 
+		var tuser=e.data.data;
+		wx.setStorageSync("userinfo",e.data.data);
         wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
-        wx.navigateBack({ delta: 1})
-  
+        //获取一下线下的真实资料
+		let url3 = '/api/weshop/users/getERPUser/';
+		url3 += os.stoid + "/" +tuser.user_id;
+		getApp().promiseGet(url3,{}).then(res=>{
+
+			if(res.data.code == 0) {
+				let t_user = res.data.data;
+				//如果有需要完善的信息没有完善，就需要跳转
+				if (!t_user['vipname'] && th.data.name_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['birthday'] && th.data.birth_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['idcard'] && th.data.idcard_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['address'] && th.data.address_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['pickup_id'] && th.data.pick_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['sex'] && th.data.sex_need_go) {
+					need_go = 1;
+				}
+				if (!t_user['fromuser_id'] && th.data.introducer_need_go) {
+					need_go = 1;
+				}
+
+				if (need_go) {
+					getApp().goto("/packageA/pages/profile/profile");
+				} else {
+					wx.navigateBack({delta: 1})
+				}
+			}
+		})
+
+		
+
+      
       },
       failStatus: function (t) {      
         return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
@@ -183,6 +244,63 @@ Page({
 	  var _errObj = {};
 	  _errObj[_errImg] = this.data.imghots+"/miniapp/images/logo.png";
 	  this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+  },
+  
+  //-- 会员授权 --
+  bindUserInfo: function(ee) {
+      var that = this;
+      var user=ee.detail.userInfo;
+      //此处授权得到userInfo
+      getApp().globalData.getu = user;
+    
+	  //--拿下code--
+	  wx.login({
+	    success: function (o) {
+	      var dd = {
+	      js_code:o.code,
+	  	  store_id: os.stoid,
+	  	  nickname: app.clear_word(app.globalData.getu.nickName),
+	  	  head_pic: app.clear_word(app.globalData.getu.avatarUrl)      
+	      };		
+	  	//-- 导购会员ID --
+	  	if(getApp().globalData.guide_id){
+	  		dd.guide_id=getApp().globalData.guide_id;
+	  	}
+	  			
+	      getApp().request.get("/api/weshop/users/openidandkey", {
+	        data: dd,
+	        success: function (e) {
+	           if(e.data.code==0){				 
+	  			 that.setData({user:user})				 
+	               //如果有会员的话,没有sessionKey
+	               if(!e.data.data.sessionKey){
+	  				 getApp().showWarning("登录成功");
+	                   getApp().globalData.userInfo=e.data.data;
+	  				 getApp().globalData.user_id=e.data.data.user_id;
+	  				 getApp().globalData.openid = e.data.data.weapp_openid;
+	  				 //把会员的信息存在内存 
+	  				 wx.setStorageSync("userinfo",e.data.data);
+	  								 			 
+	                   setTimeout(function () {
+	                     wx.navigateBack({ delta: 1})  //返回上一页
+	                   },1000)
+	               }else{
+	                  getApp().globalData.sessionKey=e.data.data.sessionKey;
+	                  getApp().globalData.openid=e.data.data.openid;
+	  				that.setData({show_bind:1});			
+	               }
+	           }else{
+	  			   getApp().confirmBox(e.data.msg); 
+	  		 }
+	        }
+	      });
+	    }
+	  })	  
+	  	
+        
   }
-
+	
+  
+ 
+ 
 })
@@ -14,13 +14,27 @@
   <!-- 登录按钮 -->
   <view>
     <view class="phones">
-	  <!-- 授权获取基础信息 -->	
-      <button hidden="{{user}}"  class="getPhoneNumber" bindtap="bindGetUserInfo">
-        <view class="flex flex-center2 ali-c">
-          <image class="we_chat" src="{{imghots}}/miniapp/images/we_chat.png"></image>
-          <view>微信账号快捷登录</view>
-        </view>
-      </button>  
+	
+	 <!-- 授权获取基础信息 -->
+	 <block wx:if="{{canIUseGetUserProfile}}">  
+	 		  <button hidden="{{user}}"  class="getPhoneNumber" bindtap="bindGetUserInfo">
+	 			<view class="flex flex-center ali-c">
+	 			  <image class="we_chat" src="/images/we_chat.png"></image>
+	 			  <view>微信账号快捷登录</view>
+	 			</view>
+	 		  </button>	
+	 </block> 	 
+
+	 <block wx:else> 	
+		  <!-- 授权获取基础信息 -->	
+		  <button hidden="{{user}}"  class="getPhoneNumber" open-type="getUserInfo" bindgetuserinfo="bindUserInfo">
+		  		<view class="flex flex-center ali-c">
+		  			   <image class="we_chat" src="/images/we_chat.png"></image>
+		  			   <view>微信账号快捷登录</view>
+		  		</view>
+		  </button>	
+	  </block>	
+	  
 	  <!-- 点击显示绑定手机的对话框 -->	
 	  <button  hidden="{{!user}}" class="getPhoneNumber" bindtap="show_bind_mobile">
 		  <view  class="flex flex-center2 ali-c" >
@@ -51,5 +65,5 @@
 		 </view>
     </view>
 </view>
-
 <warn id="warn"></warn>
+
@@ -22,9 +22,14 @@
 <view class='noCoupons' wx:if='{{details.length==0 && isset}}'>
   <image src='{{iurl}}miniapp/images/user/wqnone.png'></image>
-  <view class='no_wz1'>没有微券？</view>
-  <view class='no_wz2'>快去兑换吧</view>
-  <view class='no_btn' bindtap='exchange'>立即兑换</view>
+  <block wx:if="{{is_show_dhwz}}">
+	  <view class='no_wz1'>没有微券？</view>
+	  <view class='no_wz2'>快去兑换吧</view>
+	  <view class='no_btn' bindtap='exchange'>立即兑换</view>
+  </block>
+  <block wx:else>
+	   <view class='no_wz1'>暂无数据</view>
+  </block>  
 </view>
 <view wx:else>
   <block wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
@@ -159,6 +159,8 @@ Page({
   //------调起支付框--------
   weixinPay: function (n, success, fail) {
+	if(!n) return false;  
+	  
     wx.requestPayment({
       timeStamp: String(n.timeStamp),
       nonceStr: n.nonceStr,
@@ -112,10 +112,33 @@ Page({
       need_money = 0,
       cur_g_num = 0;
-	if(getApp().globalData.config2.is_overdue==1){ 
-       //调用底部导航
-       getApp().get_isbuy(th.setappdata);
-	}
+	getApp().getConfig2(function(config2){
+		if(config2 && config2.is_overdue==1){
+			  getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{
+				   var o=res;
+				   if (o.data.code == 0) {
+						var ob = { isout: 0, isbuy: 1 };
+						var arr = o.data.data.pageData;
+						var isbuy = 0;
+						//----如果数组不为空----
+						if (arr.length > 0) {
+						  arr.forEach(function (val, ind) {
+							if (val.is_sy == 0 && val.type == 5) {
+							  isbuy = 1;
+							  var now = ut.gettimestamp();
+							  if (now > val.end_time) ob.isout = 1;
+							  return false;
+							}
+						  })
+						}
+						ob.isbuy = isbuy;	   				      
+						th.setappdata(ob);
+					}
+			  })
+		}
+	})	
+					
+	
     setTimeout(function () {
         if (getApp().globalData.user_id) getApp().requestCardNum(th);
     },500)
@@ -317,6 +340,11 @@ Page({
           if (t_swi) t_swi = JSON.parse(t_swi)
           if(t_swi){			  	   
              th.setData({sys_switch:t_swi});
+			 
+			 var user_tool=[];
+			 if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
+			 th.setData({c_list:user_tool})		
+			 
           }
@@ -345,15 +373,16 @@ Page({
           }
         })
         //th.requestRecommend();
-      }
-	  
+     }
+	   
+	 /*-- 
 	 var t_swi= getApp().globalData.config2.switch_list
 	 if (t_swi){
 		 t_swi = JSON.parse(t_swi);
 		 var user_tool=[];
 		 if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
 	     th.setData({c_list:user_tool})		  
-	 } 
+	 } --*/
     var goods_list = this.selectComponent("#goods_recommend"); //组件的id
@@ -704,7 +733,9 @@ Page({
    //添加卡包
    addcard:function(){	   
-	   var res=this.data.add_card_data;	 
+	   var res=this.data.add_card_data;	
+	   if(!res) return false;	
+		
 	   var arr = new Array(6)
 	   arr[0] = res.code;
 	   arr[1] = res.timestamp;
@@ -283,6 +283,7 @@ Page({
   //------调起支付框--------
   weixinPay: function (n, success, fail) {
+	if(!n) return false;  
     wx.requestPayment({
       timeStamp: String(n.timeStamp),
       nonceStr: n.nonceStr,
 <!-- 背景图片 -->
 <view catchtap="close">
-  <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image>
-	<!-- <view> -->
-		<navigator class="History fs26" url="/packageA/pages/service_record/service_record" style="left:10px;right:auto;">服务记录</navigator>
-		<navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator>
-	<!-- </view> -->
-  <!-- <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator> -->
+  <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/>
+	<view class="flex jc_sb pd20">
+		<navigator class="fs26 white" url="/packageA/pages/service_record/service_record">服务记录</navigator>
+		<navigator class="fs26 white" url="/pages/user/my_service/hist_service">历史预约</navigator>
+	</view>
+	
 </view>
 <!-- 预约内容 -->
 <!-- 项目框架 -->
 <view class="Serviceitems" catchtap="close">
-  <!-- 单个项目 -->
-  <view class="rel" wx:for="{{service_List}}">
-    <view class="abs">
-      <!-- 皇冠log -->
-      <block wx:if="{{item.BuyType==4}}">
-        <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image>
-      </block>
-      <!-- 金钱log -->
-      <block wx:if="{{item.BuyType==1 || item.BuyType==2 }}">
-        <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image>
-      </block>
-      <!-- 礼包log -->
-      <block wx:if="{{item.BuyType==3}}">
-        <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image>
-      </block>
-    </view>
-    <view>
-      <view class="flex-center">
-        <image class="itemimage" src="{{item.ImageUrl==''?iurl+defimgurl:item.ImageUrl}}" lazy-load="true" data-errorimg="service_List[{{index}}].ImageUrl" binderror="bind_bnerr1" data-img="{{item.ImageUrl}}"></image>
-      </view>
-
-      <view class="flex-center itemName">
-        <view class="fs32 Name ellipsis-1">{{item.ServiceName}}</view>
-      </view>
-
-      <view class="flex-center fs24 itemCount">
-        <view>剩余次数：</view>
-        <view>{{item.ObtainTimes}}</view>
-      </view>
-
-      <view class="flex-center fs24 itemEffective">
-        <view>有效期至</view>
-        <view class="Date">{{item.Validay==""?"长期有效":item.Validay}}</view>
-      </view>
-
-    </view>
-
-    <view class="flex-center fs28 functionMax">
-      <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
-        <view>立即使用</view>
-      </view>
-      <!-- 可预约 -->
-      <view wx:if="{{item.State>0}}" class="flex-level appointment yellow-b" data-url="/pages/user/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
-        <view>预约</view>
-      </view>
-    </view>
-  </view>
+	<view class="flex jc_sb flex-wrap">
+		<!-- 单个项目 -->
+		<view class="rel" wx:for="{{service_List}}">
+		  <view class="abs">
+		    <!-- 皇冠log -->
+		    <block wx:if="{{item.BuyType==4}}">
+		      <image class="equity_money" src="{{iurl}}/miniapp/images//yyservice/equity.png" lazy-load="true"></image>
+		    </block>
+		    <!-- 金钱log -->
+		    <block wx:if="{{item.BuyType==1 || item.BuyType==2 }}">
+		      <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/money.png" lazy-load="true"></image>
+		    </block>
+		    <!-- 礼包log -->
+		    <block wx:if="{{item.BuyType==3}}">
+		      <image class="equity_money" src="{{iurl}}/miniapp/images/yyservice/giftpackage.png" lazy-load="true"></image>
+		    </block>
+		  </view>
+		  <view>
+		    <view class="flex-center">
+		      <image class="itemimage" src="{{item.ImageUrl==''?iurl+defimgurl:item.ImageUrl}}" lazy-load="true" data-errorimg="service_List[{{index}}].ImageUrl" binderror="bind_bnerr1" data-img="{{item.ImageUrl}}"></image>
+		    </view>
+		
+		    <view class="flex-center itemName">
+		      <view class="fs32 Name ellipsis-1">{{item.ServiceName}}</view>
+		    </view>
+		
+		    <view class="flex-center fs24 itemCount">
+		      <view>剩余次数：</view>
+		      <view>{{item.ObtainTimes}}</view>
+		    </view>
+		
+		    <view class="flex-center fs24 itemEffective">
+		      <view>有效期至</view>
+		      <view class="Date">{{item.Validay==""?"长期有效":item.Validay}}</view>
+		    </view>
+		
+		  </view>
+		
+		  <view class="flex-center fs28 functionMax">
+		    <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
+		      <view>立即使用</view>
+		    </view>
+		    <!-- 可预约 -->
+		    <view wx:if="{{item.State>0}}" class="flex-level appointment yellow-b" data-url="/pages/user/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
+		      <view>预约</view>
+		    </view>
+		  </view>
+		</view>
+	</view>
+  
+	
+<view class="fs26 t-c" style="line-height: 80rpx;">选择更多服务卡项，<text class="ctb" data-url="/packageA/pages/cardList/cardList" bindtap="goto">立即购买！</text></view>
   <!-- 没有数据 -->
   <!-- 加载完毕并且数据大于=页大小 -->
   <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}">
     <view class="Line"></view>
-    <view class="end fs26 xc-black">到底了</view>
+    <view class="end fs24 xc-black">到底了</view>
     <view class="Line"></view>
   </view>
 	<!-- <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}">选择更多服务卡项，</view> -->
 </view>
+
 <!-- 无服务项目 -->
 <view wx:if="{{service_List.length<1 && is_service_read}}">
   <!-- 遮住 -->
@@ -8,9 +8,8 @@ page {
   position: absolute;
   top: 0rpx;
   left: 0rpx;
-  z-index: 0;
+  z-index: -1;
   width: 100%;
-  /* height: 100%; */
 }
 /* 历史服务定位 */
@@ -25,11 +24,11 @@ page {
 .rel {
   background-color: rgb(255, 255, 255);
-  width: 350rpx;
+  width: 346rpx;
   height: 430rpx;
   border-radius: 20rpx;
   display: inline-block;
-  margin-right: 15rpx;
+  /* margin-right: 15rpx; */
   margin-bottom: 20rpx;
   box-shadow: 0rpx 3rpx 3rpx 3rpx rgb(233, 233, 233);
 }
@@ -45,12 +44,13 @@ page {
 }
 .Serviceitems {
-  position: absolute;
-  top: 370rpx;
-  left: 0rpx;
+  /* position: absolute; */
+  /* top: 370rpx;
+  left: 0rpx; */
+	padding: 300rpx 20rpx 0;
   z-index: 2;
-  padding-left: 18rpx;
-  padding-bottom: 20rpx;
+  /* padding-left: 18rpx;
+  padding-bottom: 20rpx; */
 }
 .itemimage {
@@ -158,10 +158,11 @@ page {
 }
 .After_all .Line {
-  border-top: 3rpx solid rgb(0, 0, 0);
-  width: 130rpx;
+  border-top: 3rpx solid #ccc;
+  width: 50rpx;
 }
 .After_all .end {
   margin: 0rpx 15rpx;
+	color: #ccc;
 }
@@ -68,6 +68,7 @@ Page({
     is_lable_set: "", //是否启用我的兴趣标签
     check_label: [], //我选择的兴趣标签
     fir_guide_id:null,  //存储会员详情接口出来的美导ID
+	reg_info:null
   },
   //通过路径跳转到其他页面
@@ -86,6 +87,18 @@ Page({
         guide_title:sms_conf.guide_consultant,  //系统参数  导购标题
         guide_change_time:sms_conf.guide_change_time     //每月能修改几次
       })
+	  
+	  let reg_type = ee.reg_type;
+	  let reg_info = ee.reg_info;
+	  if(reg_type) {	//reg_type为1才显示积分信息
+	  	if(reg_info) {
+	  		reg_info = JSON.parse(reg_info);	
+	  		th.setData({reg_info:reg_info});
+	      }
+	  }
+	  
+	  
+	 
       if (sms_conf.user_label_set) {
         th.query_checklabels();
       }
@@ -185,9 +198,20 @@ Page({
     }
   },
   bindChange: function(e) {
-    this.setData({
-      datet: e.detail.value,
-    });
+	  
+	let strBirthday = e.detail.value;
+	let age = this.verifyBirthday(strBirthday);
+	
+	if(age <= 10) {
+		getApp().my_warnning("会员年龄不能小于10岁(含10岁)", 0, this);
+	} else if(age >= 70) {
+		getApp().my_warnning("会员年龄不能超过70岁(含70岁)", 0, this);
+	} else {
+		this.setData({
+		  datet: e.detail.value,
+		});
+	};  
+	 
   },
   //---点击二级之后的选择---
   choose_for_store: function(e) {
@@ -564,6 +588,7 @@ Page({
   },
   //------初始化加载----------
   onLoad: function(t) {
+	var th=this;  
     var user = getApp().globalData.userInfo;
     if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) {
       var now = ut.gettimestamp();
@@ -575,6 +600,9 @@ Page({
       }
     }
     this.initial_user();
+	
+	
+	
   },
   //-----------会员是否初始化---------------------
   initial_user: function() {
@@ -665,8 +693,7 @@ Page({
           a.staffName=choice_guide.StaffName;
           a.staffId=choice_guide.Id;
         }
-
-
+			
         e.setData({
           phone: a.mobile,
           user: a,
@@ -677,7 +704,9 @@ Page({
           address: a.address,
           isGender: a.sex,
           isstcsp: a.vipnopwd,
-		  iscalendar:a.islunar
+		  iscalendar:a.islunar,
+		  user2:a,
+		  datet:a.birthday
         });
       }
@@ -802,7 +831,9 @@ Page({
   },
   //点击确认修改信息
-  confirm_revision: function() {
+  confirm_revision: function() {	  
+	  
+	  
     var th = this;
     var isstcsp = th.data.isstcsp; //是否启用消费密码
     var phone = th.data.phone; //手机号码
@@ -810,6 +841,9 @@ Page({
       getApp().my_warnning("手机不能为空", 0, th);
       return false;
     }
+	var address = th.data.address; //地址
+	var sto_sele_id = th.data.sto_sele_id;
+	
     var consumption = th.data.consumption; //消费密码    
     var isstcsp = th.data.isstcsp;
     if (isstcsp == 1) {
@@ -824,7 +858,6 @@ Page({
       }
     }
     var sex = th.data.isGender; //性别
-
     if (sex != "1" && sex != "2") {
       getApp().my_warnning("请选择性别", 0, th);
       return false;
@@ -834,14 +867,34 @@ Page({
       getApp().my_warnning("请输入名字", 0, th);
       return false;
     }
+	
     var identity_card = th.data.identity_card; //身份证
-
     if (identity_card!=null && identity_card!=undefined &&  identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) {
       getApp().my_warnning("身份证号码错误", 0, th);
       return false;
-    }
-    var address = th.data.address; //地址
-    var sto_sele_id = th.data.sto_sele_id;
+    }	
+	if(th.data.user2.idcard && (!identity_card || identity_card=='') ){
+		getApp().my_warnning("身份证不能为空", 0, th);
+		return false;
+	}	
+	if(th.data.user2.address && (!address || address=='') ){
+		getApp().my_warnning("地址不能为空", 0, th);
+		return false;
+	}	
+	if(th.data.user2.pickup_id && (!sto_sele_id || sto_sele_id=='') ){
+		getApp().my_warnning("门店不能为空", 0, th);
+		return false;
+	}
+	if(th.data.user2.birthday && (!th.data.datet   || th.data.datet  =='') ){
+		getApp().my_warnning("生日不能为空", 0, th);
+		return false;
+	}
+		
+	if(this.data.confirmed) return false;
+	this.data.confirmed=1; 
+	
+
+   
     var datas = {
       mobile: phone, //手机号码
       store_id: r.stoid,
@@ -864,6 +917,9 @@ Page({
     getApp().request.put("/api/weshop/users/updateUserInfo", {
       data: datas,
       success: function(res) {
+		  
+		th.data.confirmed=0;  
+		  
         if (res.data.code == 0) {
           getApp().my_warnning("修改成功", 1, th);
 		  getApp().goto("/pages/user/index/index");
@@ -911,7 +967,58 @@ Page({
 				}
 			}
 	   });
-  }
+  },
+  
+  // 生日判断
+  verifyBirthday(strBirthday) {
+  	var returnAge;  
+  	var strBirthdayArr = strBirthday.split("-");  
+  	var birthYear = strBirthdayArr[0];  
+  	var birthMonth = strBirthdayArr[1];  
+  	var birthDay = strBirthdayArr[2];  
+  		
+  	d = new Date();  
+  	var nowYear = d.getFullYear();  
+  	var nowMonth = d.getMonth() + 1;  
+  	var nowDay = d.getDate();  
+  	      
+  	if(nowYear == birthYear){  
+  			returnAge = 0;//同年 则为0岁  
+  	} else {  
+  		var ageDiff = nowYear - birthYear ; //年之差  
+  		if(ageDiff > 0){  
+  			if(nowMonth == birthMonth) {  
+  					var dayDiff = nowDay - birthDay;//日之差  
+  					if(dayDiff < 0)  
+  					{  
+  							returnAge = ageDiff - 1;  
+  					}  
+  					else  
+  					{  
+  							returnAge = ageDiff ;  
+  					}  
+  			}  
+  				else  
+  				{  
+  						var monthDiff = nowMonth - birthMonth;//月之差  
+  						if(monthDiff < 0)  
+  						{  
+  								returnAge = ageDiff - 1;  
+  						}  
+  						else  
+  						{  
+  								returnAge = ageDiff ;  
+  						}  
+  				}  
+  		}  
+  		else  
+  		{  
+  				returnAge = -1;//返回-1 表示出生日期输入错误 晚于今天  
+  		}  
+  }     
+  	  return returnAge;//返回周岁年龄  
+  },
+  
 });
 \ No newline at end of file
@@ -108,8 +108,15 @@
             </block>
             <view class="fs26">女</view>
           </view>
+	  
+	      <block wx:if="{{reg_info && reg_info.sex_state && reg_info.sex}}"> 
+		     <view wx:if="{{!user.sex}}" class="fs28 co-red show_jf_val">+{{reg_info.sex}}
+			    <text wx:if="{{reg_info.sex_state_type == 0}}">积分</text>
+				<text wx:if="{{reg_info.sex_state_type == 1}}">成长值</text> 
+			 </view> 
+		  </block>	 
         </view>
-
+        
       </view>
       <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="sex">
@@ -144,27 +151,47 @@
             </block>
             <block wx:else>
               <view>{{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}}</view>
-            </block>
-			
+            </block>		
           </view>
+		  
+		  
+		  <block wx:if="{{reg_info && reg_info.birthday_state && reg_info.birthday}}">
+		     <view wx:if="{{!user.birthday}}" class="fs28 co-red show_jf_val">+{{reg_info.birthday}}
+		  			    <text wx:if="{{reg_info.birthday_type == 0}}">积分</text>
+		  				<text wx:if="{{reg_info.birthday_type == 1}}">成长值</text> 
+		  			 </view> 
+		  </block>	
+		  
         </view>
-      </view>
+       
+	  </view>
     </view>
     <view class="Bbottom">
       <view bindtap="editUserInfo1" class="user-name mt flex-vertical-between" data-type="nickname">
         <view class="user-name-txt">姓名</view>
-        <input bindblur="user_name" class="user-txt-right t-r" placeholder="*姓名" value='{{user.vipname}}' />
+		<view class="flex ai-center">
+           <input bindblur="user_name" class="user-txt-right t-r" placeholder="*姓名" value='{{user.vipname}}' />
+		   
+		   <block wx:if="{{reg_info && reg_info.name_state && reg_info.name}}">
+			   <view wx:if="{{!user2.vipname}}" class="fs28 co-red show_jf_val">+{{reg_info.name}}  
+				  <text wx:if="{{reg_info.name_val_type == 0}}">积分</text>
+				  <text wx:if="{{reg_info.name_val_type == 1}}">成长值</text> 
+			   </view> 
+		   </block>	   
+		 </view>
       </view>
       <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="nickname">
         <view class="user-name-txt">身份证</view>
-
-        <input bindblur="identity_card" class="user-txt-right t-r" value="{{user.idcard}}" placeholder="*身份证"></input>
-
-
-        <!-- <block wx:else>
-          <input class="user-txt-right" bindblur="IdentityIDCard" value="" type="idcard" maxlength="18" placeholder="*身份证" />
-        </block> -->
+        <view class="flex ai-center">
+           <input bindblur="identity_card" class="user-txt-right t-r" value="{{user.idcard}}" placeholder="*身份证"></input>
+           <block wx:if="{{reg_info && reg_info.idcard_state && reg_info.idcard}}">
+			   <view wx:if="{{!user2.idcard}}" class="fs28 co-red show_jf_val" >+{{reg_info.idcard}}
+				  <text wx:if="{{reg_info.idcard_type == 0}}">积分</text>
+				  <text wx:if="{{reg_info.idcard_type == 1}}">成长值</text> 	   
+			   </view> 
+		    </block>	  	   
+		</view>   
       </view>
       <view data-url="/pages/user/Change_phone/Change_phone" bindtap="go_phone" class="user-name flex-vertical-between" data-type="mobile">
         <view class="user-name-txt">更换手机</view>
@@ -180,8 +207,16 @@
           <view>{{user.address}}</view>
         </block>
         <block wx:else> -->
-        <input bindblur="address" maxlength="30" value="{{user.address}}" class="user-txt-right" placeholder="*地址" style="text-align:right" />
-        <!-- </block> -->
+		<view class="flex ai-center">
+            <input bindblur="address" maxlength="30" value="{{user.address}}" class="user-txt-right" placeholder="*地址" style="text-align:right" />
+            <!-- </block> -->		   
+		    <block wx:if="{{reg_info && reg_info.address_state && reg_info.address}}">
+			   <view wx:if="{{!user2.address}}" class="fs28 co-red show_jf_val" >+{{reg_info.address}}		   
+				  <text wx:if="{{reg_info.address_type == 0}}">积分</text>
+				  <text wx:if="{{reg_info.address_type == 1}}">成长值</text> 	  
+			   </view> 
+		    </block>	   
+		 </view>
       </view>
       <!-- 选择门店 -->
@@ -190,7 +225,14 @@
         <view class="flex-center user-txt-right">
           <view class="one-line">{{stoname}}</view>
           <view class="angle">∟</view>
+		  <block wx:if="{{reg_info && reg_info.pick_state && reg_info.pick}}">
+			  <view wx:if="{{!user.pickup_id}}" class="fs28 co-red show_jf_val">+{{reg_info.pick}}
+				   <text wx:if="{{reg_info.pick_type == 0}}">积分</text>
+				   <text wx:if="{{reg_info.pick_type == 1}}">成长值</text> 
+			  </view> 
+		 </block> 
         </view>
+		 
       </view>
       <!-- 美容顾问 -->
@@ -662,3 +662,5 @@ input {
   height: 46rpx;
   line-height: 46rpx;
 }
+
+.show_jf_val{ margin-left: 5rpx;}
@@ -52,6 +52,7 @@ module.exports = {
         });
     },
     weixinPay: function(n, e, a) {
+		if(!n) return false;
         wx.requestPayment({
             timeStamp: String(n.timeStamp),
             nonceStr: n.nonceStr,
@@ -27,6 +27,7 @@ module.exports = {
         });
     },
     weixinPay: function(n, succ,fail) {
+		if(!n) return false;
         wx.requestPayment({
             timeStamp: String(n.timeStamp),
             nonceStr: n.nonceStr,