幸运购修改4

taiyuan
1 parent 8b0cc8ca
Showing 8 changed files with 95 additions and 35 deletions
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
pages/index/index/index.wxml
pages/index/index/index.wxss
pages/user/order_list/order_list.wxml
@@ -26,7 +26,8 @@
 							</view>
 							<view class="flex jc_sb">
 								<progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
-								<view class="btn fs26">去参团</view>
+								<view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view>
+								<view class="btn fs26" wx:else>去参团</view>
 							</view>
 						</view>
  
@@ -92,3 +92,7 @@ page {
 	color: white;
 	text-align: center;
 }
+
+.btn.gray {
+	background-color: #ccc;
+}
@@ -306,16 +306,18 @@ Page({
     //     if(ct_price==0)  ct_price=min_price;
     // }
  
+
     //获取大家都在团信息
-    getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , {
-      data:{page:1,pageSize:2}
-    }).then(res => {
-		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-			pageteam = res.data.data.pageData;
-			ee.setData({pageteam: pageteam,})  
-		}
+  //   getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , {
+  //     data:{page:1,pageSize:2}
+  //   }).then(res => {
+		// if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+		// 	pageteam = res.data.data.pageData;
+		// 	ee.setData({pageteam: pageteam,})  
+		// }
  
-    })
+  //   })
+
  
     //--当是成团的时候的操作--
     // if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){
@@ -467,8 +469,10 @@ Page({
       scene += "_" + getApp().globalData.room_id;
     };
     ///二微码
-    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-      os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
+    // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+    //   os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
+			var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+			  os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
  
  
     // 读取文件成功则OK--
@@ -955,7 +959,8 @@ Page({
     //------ 分享配置 --------
     onShareAppMessage: function (e) {
         var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url
-				// console.log('pagePath=====>', pagePath);
+				console.log('pagePath=====xxxxxx>', pagePath);
+				var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img;
         if (pagePath.indexOf('/') != 0) {
             pagePath = '/' + pagePath;
         }
@@ -968,24 +973,25 @@ Page({
             }
         }
         return {
-            title: "幸运购",
+            title: "邀你一起参加幸运购",
             path: pagePath,
+						imageUrl: imgPath,
         }
     },
  
-		onShareTimeline() {
-			// var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
-			// var pagePath = this.route; //当前页面url
+		// onShareTimeline() {
+		// 	// var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
+		// 	// var pagePath = this.route; //当前页面url
  
-			// if(!store_name) store_name = getApp().globalData.setting.appName;
-			// if (pagePath.indexOf('/') != 0) {
-			//   pagePath = '/' + pagePath;
-			// }
-			// return {
-			//   title: store_name + '-幸运购活动列表',
-			//   path: pagePath,
-			// }
-		},
+		// 	// if(!store_name) store_name = getApp().globalData.setting.appName;
+		// 	// if (pagePath.indexOf('/') != 0) {
+		// 	//   pagePath = '/' + pagePath;
+		// 	// }
+		// 	// return {
+		// 	//   title: store_name + '-幸运购活动列表',
+		// 	//   path: pagePath,
+		// 	// }
+		// },
  
 		clickShare() {
 			this.setData({
@@ -274,7 +274,7 @@ Page({
  
  
 		luckGoInfo: {},
-		
+		showDetails: false,
  
   },
  
@@ -306,6 +306,40 @@ Page({
 					prom_id,
 				});
       }
+			
+			
+			// 检查是否已经购买参团
+			getApp().request.get("/api/weshop/prom/luckyOrder/getUserOrderInfo/" + o.stoid + "/" + oo.user_id + "/" + prom_id, {
+				success: function(res) {
+					console.log('505=====>', res.data.data);
+					if(res.data.code == 0) {
+						th.setData({
+							showDetails: true,
+							buyInfo: res.data.data,
+						});
+					} else {
+						th.setData({
+							showDetails: false,
+						});
+					};
+				}
+			});
+			// api/weshop/prom/luckyOrder/getUserOrderInfo/{store_id}/{user_id}/{aid}
+			// getApp().request.promiseGet("/api/weshop/pickup/list", {
+			//   data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 },
+			// }).then(res => {
+			//   if (res.data.code == 0) {
+			//     e = res.data.data.pageData[0];
+			//     if (e) {
+			//       e.is_no_dis = ee.is_no_dis;
+			//       appd.pk_store = e;
+			//       that.set_def_storage(e);
+			//     }
+			
+			//   }
+			// })
+			
+			
 			// console.log('type********>>',this.data.prom_type);
     //-- 自定义海报 --
     // getApp().request.promiseGet("/api/weshop/goods/poster/page", {
@@ -4519,8 +4553,10 @@ Page({
       scene += "_" + getApp().globalData.room_id;
     }
     ///二微码
-    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
-      os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
+		var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+		  os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+    // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+    //   os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo";
  
     console.log(path3);
  
@@ -5209,7 +5245,7 @@ Page({
         tt();
       },
       fail: function (res) {
-        ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
+        ee.data.share_goods_img = "../../../../images/share/default_g_img.gif"; //分享的图片不能用网络的
         tt();
       }
     });
@@ -273,7 +273,7 @@
  
  
             <view class="goods-num">
-							<view class="sales">已拼成功：{{data.sales_sum}}件</view>
+							<view class="sales">已售：{{data.sales_sum}}件</view>
               <!-- <view class="sales">销量：{{data.sales_sum}}件</view> -->
               <!-- <view class="stock">折扣：{{data.disc}}折</view> -->
               <view class="stock">{{categories3[0].num}}人评价</view>
@@ -920,7 +920,9 @@
 				</view>
 				<!-- data-ind="2" -->
 				<!-- openSpecModel_pt -->
-				<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt"data-it="0">立即参团</view>
+				<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}&&from=list" wx:if="{{showDetails}}">查看详情</view>
+				<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && (luckGoInfo.goods_num != 0)}}">立即参团</view>
+				<view class="btn-red f1 flex ai-center jc-center" wx:else>已经抢光</view>
 				<!-- <view class="btn-red f1 flex ai-center jc-center" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy">立即参团</view> -->
 			</view>
         <!-- <view bindtap="openSpecModel" data-ind="1" class="btn-buy flex fdc jc-center">
@@ -257,7 +257,8 @@
 								</view>
 								<view class="flex jc_sb">
 									<progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
-									<view class="btn fs26">去参团</view>
+									<view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view>
+									<view class="btn fs26" wx:else>去参团</view>
 									<!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 -->
 								</view>
 							</view>
@@ -1195,3 +1195,7 @@ page {
 	text-align: center;
 }
  
+.luck .btn.gray {
+	background-color: #ccc;
+}
+
@@ -91,7 +91,9 @@
 	    <!-- 单个商品 -->
 	    <!-- wx:if="{{goods.return_btn!=4}}" -->
 	    <view>
-	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods"  wx:for-index="pinx" url="{{item.ord_url}}?order_id={{item.order_id}}">
+				 <!-- url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}"
+				{{item.ord_url}}?order_id={{item.order_id}} -->
+	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods"  wx:for-index="pinx" url="{{item.order_goods[0].prom_type==9 ? ('/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=' + item.order_id):(item.ord_url + '?order_id=' + item.order_id)}}">
 	        <!-- 商品图片 -->
 	        <navigator class="rel">
 	          <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
@@ -128,7 +130,10 @@
 	            <!-- 商品价格 -->
 	            <view class="flex-vertical c-tb baseline">
 	              <view class="fs24">￥</view>
-	              <view class="fs26">{{filters.toFix(goods.member_goods_price,2)}}</view>
+								<!-- 幸运购prom_type等于9 -->
+								<!-- 如果是幸运购就显示幸运购参团价格 -->
+								<view class="fs26" wx:if="{{goods.prom_type == 9}}">{{filters.toFix(goods.goods_price,2)}}</view>
+	              <view class="fs26" wx:else>{{filters.toFix(goods.member_goods_price,2)}}</view>
 	            </view>
 	            <view class="fs26 c-a9">x{{goods.goods_num}}</view>
 	          </view>
@@ -162,7 +167,8 @@
 	                <view class="commodity_money flex baseline" wx:else>
 	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
 	                  <view class="fs24 c-r">￥</view>
-	                     <view class="c-r">{{filters.toFix(item.order_amount+item.user_money,2)}}
+	                     <view class="c-r">
+											 {{filters.toFix(item.order_amount+item.user_money,2)}}
 	                     <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
 	                     <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
 	                  </view>