Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents a43724e7 8889361b
Showing 20 changed files with 225 additions and 69 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
components/goods_list/goods_list.wxml
packageA/pages/activity_share/activity_share.js
packageA/pages/distribution/goods/goods.wxml
packageA/pages/distribution/shop/shop.wxml
packageB/pages/user/collect_list/collect_list.wxml
packageC/pages/presell/cart/cart.js
pages/activity/seckill_list/seckill_list.js
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/goods/categoryList/categoryList.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.wxml
pages/goods/search/search.wxml
pages/user/order_detail/order_detail.js
pages/user/order_detail/order_detail.wxml
@@ -151,6 +151,9 @@ Component({
           index = 0,
           gdata = [];
+        var user_id=getApp().globalData.user_id;
+        if(!user_id) user_id=0;
+
       //--初始化卡类--
       th.card_init();
       var os=getApp().globalData.setting;
@@ -162,8 +165,10 @@ Component({
           for (var i = 0; i < g_id.length; i++) {
             str += g_id[i].goodsid + ",";           
           }
-          str=str.substring(0, str.length - 1);     
+          str=str.substring(0, str.length - 1);
+
           await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str,  {
+          	    data:{user_id:user_id},
 			    isShowLoading:false,  
 			    success: function(res) {
                      th.data.loading=0;
@@ -218,6 +223,10 @@ Component({
            if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
            if(th.data.is_new) r_data.is_new=th.data.is_new;
+            var user_id=getApp().globalData.user_id;
+            if(!user_id) user_id=0;
+            r_data.user_id=user_id;
+
          await app.request.promiseGet("/api/weshop/goods/page", {
               data:r_data
           }).then(res => {
@@ -245,6 +254,7 @@ Component({
 			  isonsale: 1,
 			  orderField: "sort",
 			  orderType: 'asc',
+			  user_id:user_id
             }
           }).then(res => {
             th.data.loading=0;
@@ -17,10 +17,18 @@
             <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
                 <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
                     <view class='zs_top rel'>
-                        <image class='zs_t_img' src="{{item.goods_img}}"
-                               data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3" lazy-load="true" 
-                        ></image>
+
+                        <block wx:if="{{object.big_order_type==3}}">
+                            <view style="position: relative; width: 100%; height: 100%">
+                                <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                       binderror="bind_bnerr3"></image>
+                                <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"  binderror="bind_bnerr3"></image>
+                            </view>
+                        </block>
+                        <block wx:else>
+                            <image class='zs_t_img' src="{{item.goods_img}}"  data-errorimg="goods_array[{{index}}].goods_img"
+                                   binderror="bind_bnerr3" lazy-load="true" ></image>
+                        </block>
                         <block wx:if="{{object.goodicon==3}}">
                             <image class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image>
@@ -166,8 +174,20 @@
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
                     <view class='zs_top_2l rel'>
-                        <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" 
+
+                        <block wx:if="{{object.big_order_type==3}}">
+                            <view style="position: relative; width: 100%; height: 100%">
+                                <image class='zs_t_img_2l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                       binderror="bind_bnerr3"></image>
+                                <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
+                                       binderror="bind_bnerr3"></image>
+                            </view>
+                        </block>
+                        <block wx:else>
+                          <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
                                    binderror="bind_bnerr3"></image>
+                        </block>
+
                         <block wx:if="{{object.goodicon==3}}">
                             <image class='{{g_filter.get_class(object.column,object.position)}}'
                                    src='{{object.customicon}}'></image>
@@ -312,9 +332,20 @@
             <view class="zs_goods_wai_san" >
                 <view class="zs_goods_san">
                     <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'>
-                        <view class='zs_top_3l rel'>                       
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" 
+                        <view class='zs_top_3l rel'>
+                            <block wx:if="{{object.big_order_type==3}}">
+                                <view style="position: relative; width: 100%; height: 100%">
+                                    <image class='zs_t_img_3l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                           binderror="bind_bnerr3"></image>
+                                    <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
+                                           binderror="bind_bnerr3"></image>
+                                </view>
+                            </block>
+                            <block wx:else>
+                                <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
                                        binderror="bind_bnerr3"></image>
+                            </block>
+
                             <block wx:if="{{object.goodicon==3}}">
                                 <image class='{{g_filter.get_class(object.column,object.position)}}'
                                        src='{{object.customicon}}'></image>
@@ -457,9 +488,18 @@
         <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
             <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
                 <view class='zs_top_x'>
-                    <!--<image class='zs_t_img_x'></image>-->
-                    <block>
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"  lazy-load="true" 
+                    <block wx:if="{{object.big_order_type==3}}">
+                        <view style="position: relative; width: 100%; height: 100%">
+                            <image class='zs_t_img_x' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                   binderror="bind_bnerr3"></image>
+                            <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"
+                                   binderror="bind_bnerr3"></image>
+                        </view>
+                    </block>
+
+                    <block wx:else>
+                        <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}"
+                               src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"  lazy-load="true"
                                binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
                     </block>
@@ -587,12 +627,8 @@
 							   <view class='wz_red'>￥{{item.shop_price}}</view>
 							   <view class='del'>￥{{item.market_price}}</view>
 							</block>
-							
-							
+
 						</block>
-						
-						
-						
                     </view>
                     <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
                 </view>
@@ -622,17 +658,30 @@
 <!--商品展示-->
-  <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;">
+<swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;">
     <view class="sp">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
           <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" style="width: 32%" >
-            <view class='one' style="margin-left: 10rpx">
+            <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx">
               <view class='sp_top'>
                 <view class='s_img' style="position: relative; width: 100%">
-                  <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img"
+
+                  <block wx:if="{{object.big_order_type==3}}">
+                        <view style="position: relative; width: 100%; height: 100%">
+                            <image  src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
+                                   binderror="bind_bnerr3"></image>
+
+                            <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"  binderror="bind_bnerr3"></image>
+                        </view>
+                  </block>
+
+                  <block wx:else>
+                    <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img"
                          binderror="bind_bnerr3" lazy-load="true" style="width: 100%"></image>
-				  				  
+                  </block>
+
+
 				  <block wx:if="{{object.goodicon==3}}">
 				      <image class='{{g_filter.get_class(object.column,object.position)}}'
 				             src='{{object.customicon}}'></image>
@@ -154,6 +154,10 @@
   margin-left: 20rpx;
 }
+.zs_t_img_x.zj{ border: 1rpx solid #eee;} 
+.zs_t_img_x.yj{ border: 1rpx solid #eee;border-radius: 18rpx;} 
+
+
 .zs_center_x {
   width: 100%;
   min-height: 200rpx;
@@ -727,8 +731,13 @@ swiper {
 .one {
   margin-left: 14rpx;
+  overflow: hidden;
 }
+.one.zj{ border: 1rpx solid #eee;}
+.one.yj{ border: 1rpx solid #eee; border-radius: 18rpx;}
+
+
 .sp .sp_top .s_top1_kill {
   position: absolute;
   background-color: #c4182e;
@@ -814,5 +823,6 @@ top: 10rpx;
 	position: absolute;
 	right: 0rpx;
 	bottom: 10rpx;
+}
-}
 \ No newline at end of file
+.n_box{ position: absolute !important;z-index: 10}
 \ No newline at end of file
@@ -4,15 +4,15 @@
 <view class="collects">
   <view class="hang ">
     <!-- 商品详情 -->
-    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}">
-      <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}" hover-class="none">
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
+      <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none">
         <!-- 商品图⽚ -->
         <image class="sp" src="{{url+item.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
         <view class="bottom">
           <!-- 商品名称 -->
           <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
           <!-- 判断是否有活动价 -->
-          <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
 						<view class="pdt10">
 							<view class="money flex xc-wc" >
 							<text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
@@ -167,10 +167,22 @@ Page({
 		  if(item){
 			  var price = item.price;
 			  if(!price) price=item.shop_price;
-			  			  
+			  switch(th.data.currentIndex){
+				  case 0: item.prom_type=1;break;
+				  case 1: item.prom_type=6;break;
+                  case 2:
+                      if(th.data.currentIndex2==1) item.prom_type = 5;
+                      if(th.data.currentIndex2==2) {
+                          item.prom_type = 3;
+                          item.id=item.prom_id;
+					  }
+                      break;
+			  }
+              item.prom_id=item.id;
+
 			  var title= item.goods_name;		
 			  var img=this.data.url+item.original_img;		  
-			  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id;
+			  var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + item.goods_id+"&prom_type="+item.prom_type+"&prom_id="+item.prom_id;
 			  if(getApp().globalData.user_id){
 			     url+="&first_leader="+getApp().globalData.user_id;
 			  }	  
@@ -547,7 +559,26 @@ Page({
 	  var app = getApp();
 	  var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
+
+        var prom_type=0;
+        var prom_id=th.data.share_good.id;
+        switch(th.data.currentIndex){
+            case 0: prom_type=1;break;
+            case 1: prom_type=6;break;
+            case 2:
+                if(th.data.currentIndex2==1) prom_type = 5;
+                if(th.data.currentIndex2==2){
+                    prom_type = 3;
+                    prom_id=th.data.share_good.prom_id;
+				}
+                break;
+        }
+
+
+
 	  var scene = th.data.share_good.goods_id+"";
+      scene+="."+prom_type+"."+prom_id;
+
 	  var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
 	  if(user_id>0){
 	    scene+="_"+user_id;
@@ -1129,14 +1160,27 @@ Page({
 	 		 this.data.currentPage=1;	
 	 		 this.requestGoodsList();	
 	 },
-	 
-	 
-	 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;
-	 		 getApp().goto(url); 
-	 },
+
+
+    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;
+
+        switch(this.data.currentIndex){
+			case 0:  item.prom_type = 1;break;
+			case 1:  item.prom_type = 6;break;
+			case 2:
+				if(th.data.currentIndex2==1) item.prom_type = 5;
+				if(th.data.currentIndex2==2) item.prom_type = 3;
+				break;
+		}
+
+        item.prom_id = item.id;
+        url+="&prom_type="+item.prom_type+"&prom_id="+item.prom_id
+
+        getApp().goto(url);
+    },
 	 go_coll_good:function(e){
 		 var gid=e.currentTarget.dataset.gid;		
@@ -75,13 +75,13 @@
 				</label> -->
 				<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
-				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
 					<view class="pdr20"><image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load/></view>
 					<view class="flex fdc jc_sb">
 						<view class="ellipsis-2">{{item.goods_name}}</view>
 						<view>
 							<!-- 判断是否有活动价 -->
-							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
 							  <view class="flex xc-wc ai-center" >
 										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
 										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
@@ -214,7 +214,7 @@
 		</checkbox-group>
 		<checkbox-group class="fs26 flex pd16 wrap"  catchchange="checkboxChange" wx:else>
-			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
 				<image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load/>
 				<view class="pd20 fs26 flex jc_sb fdc f1">
 					<view class="ellipsis-2">{{item.goods_name}}</view>
@@ -222,7 +222,7 @@
 						<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
 						<view>
 							<!-- 判断是否有活动价 -->
-							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0 }}">
 							  <view class="flex xc-wc ai-center" >
 										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
 										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
@@ -69,14 +69,14 @@
   <view class="content">
     <view class="fs26" wx:if="{{isShowRow}}">
       <view class="item bg-white flex ai-center pd20" wx:for="{{list}}">
-        <view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+        <view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
           <view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}">
             <image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load mode="aspectFit" />
           </view>
           <view class="flex fdc jc_sb">
             <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
             <!-- 判断是否有活动价 -->
-            <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+            <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
               <view class="flex xc-wc pdt20">
                 <text wx:if="{{item.prom_integral}}">
                   <text class="fs30">{{item.prom_integral}}</text>
@@ -213,14 +213,14 @@
       </view>
     </view>
     <view class="fs26 flex pd20 wrap" wx:else>
-      <view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+      <view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
         <view class="img-container" data-txt="已售:{{item.sales_sum}}">
           <image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load="true" />
         </view>
         <view class="pd20 fs26">
           <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
           <!-- 判断是否有活动价 -->
-          <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
             <view class="flex xc-wc">
               <text wx:if="{{item.prom_integral}}">
                 <text class="fs30" style="font-weight: bold;">{{item.prom_integral}}</text>
@@ -22,7 +22,7 @@
     <!-- 商品集合 -->
     <view class="{{editEd?'collects_max colls_max':'collects_max'}}">
       <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}"
-                 data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id:''}}">
+                 data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:''}}">
         <view class="radioCheck iconClick" wx:if="{{editEd}}">
           <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
@@ -46,7 +46,7 @@
                 <!-- 优惠价 -->
                 <view class="price flex xc-wc">
                   <view class="fs24">￥</view>
-                  <view class="fs40">{{item.shop_price}}</view>
+                  <view class="fs40">{{item.prom_price?item.prom_price:item.final_price}}</view>
                 </view>
                 <!-- 原价 -->
                 <view class="flex fs24 line through xc-ash">
@@ -656,7 +656,7 @@ Page({
                 })
             }else{
                 th.setData({quan_price:0});
-                if(th.data.using_quan[bn_pick].isby==1){
+                if(th.data.using_quan && th.data.using_quan[bn_pick] && th.data.using_quan[bn_pick].isby==1){
                     var txt="using_quan["+bn_pick+"]";
                     th.setData({[txt]:{}});
                 }
@@ -76,7 +76,7 @@ Page({
     },
     onHide:function(){
       //--清理定时器--
-      clearInterval(this.timer);
+      clearInterval(this.data.timer);
       this.setData({isshow:0});
     },
    //---小于10的格式化函数----
@@ -2395,6 +2395,28 @@ Page({
     go_url(e){
         var url=e.currentTarget.dataset.url;
         getApp().goto(url);
+    },
+
+    //跳转到商品
+    go_gd:function (e) {
+        var gd= e.currentTarget.dataset.gd;
+        var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
+        var url="/api/weshop/activitylist/getGoodActInfo";
+        var req_data={
+            store_id:os.stoid,goodsidlist:gd,is_detail:1
+        };
+        //获取秒杀的多规格
+        getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+            if(res.data.code==0 && res.data.data){
+                if(res.data.data.length==1){
+                    good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id;
+                }
+                getApp().goto(good_url);
+
+            }else{
+               getApp().goto(good_url);
+            }
+        })
     }
 });
 \ No newline at end of file
@@ -56,7 +56,6 @@
         <view class="shmd_m">
           <!-- 门店 -->
           <!--<radio color="red" bindtap="check_th_all_item" class="order-raido flex-center" checked="{{checkAllToggle||item.selected}}" data-pitems="{{pidx}}"></radio>-->
-
           <icon wx:if="{{checkAllToggle||item.selected}}" class="order-raido flex-center"  bindtap="check_th_all_item" data-pitems="{{pidx}}"
                   color="red" size="20" type="success"></icon>
           <view  wx:else class="icon_no_sele2" bindtap="check_th_all_item" data-pitems="{{pidx}}"></view>
@@ -77,7 +76,7 @@
           </block>
           <block wx:else><view class="order-raido flex-vertical " style="width: 45rpx"></view></block>
-          <navigator class="goods-img rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
+          <navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}">
             <image class="wh100" src="{{items.original_img}}" binderror="bind_bnerr2" data-errorimg="requestData[{{pidx}}].goods[{{idx}}].original_img" data-url="{{items.original_img}}"></image>
             <block wx:if="{{items.is_gift}}">
                <view style="background-color:red" class="abs flex-center fs26" wx:if="{{items.is_gift==1}}">赠品</view>
@@ -102,7 +101,7 @@
           </navigator>
           <view class="goods-cont">
             <view class="goods-name">
-              <navigator class="ellipsis-2 fs30" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">{{items.goods_name}}</navigator>
+              <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
               <view class="specifications  ellipsis-1">
                 <view  wx:if="{{items.goods_color || items.goods_spec}}">
@@ -289,7 +289,6 @@ Page({
             }
         }, 1);
-
         //值在这里换
         getApp().globalData.plus_buy_back = 0;
     },
@@ -3815,6 +3814,11 @@ Page({
         var index = e.currentTarget.dataset.index;
         var txt = "cartlist[" + index + "].focus";
         this.setData({[txt]:0})
+    },
+
+    go_url:function (e) {
+        var url = e.currentTarget.dataset.url;
+        getApp().goto(url);
     }
@@ -78,15 +78,13 @@
 				</view>
 				<view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items">
 					<!----商品图片----->
-					<view class="goods-img" style="position: relative; overflow: hidden">
+					<view class="goods-img" style="position: relative; overflow: hidden" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
 						<image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image>
 						<text class="zuhe" wx:if="{{items.prom_type==7}}">组合购</text>
-
-
 						<image class="wh100 bdr14" src="{{items.original_img}}" binderror='cart_set_err' data-err='cartlist[{{pidx}}].goods[{{idx}}].original_img'></image>
 					</view>
 					<!----商品名称规格---->
-					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}">
+					<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{items.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}" >
 						<view class="goods-name ellipsis-2">{{items.goods_name}}</view>
 						<!-- 商品属性 -->
 						<view class="flex-vertical fs28 color-gray n_guige">
@@ -252,10 +250,10 @@
 				<!-- <view>门店：{{bn_pickname}}</view> -->
 			</view>
 			<view class="order-detail">
-				<view class="goods-img">
+				<view class="goods-img" bindtap="go_url" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{bn_goods.prom_type}}&prom_id={{bn_goods.prom_id}}">
 					<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="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
+				<navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}&prom_type={{items.prom_type}}&prom_id={{items.prom_id}}">
 					<view class="goods-name ellipsis-2">{{bn_goods.goods_name}}</view>
 					<!-- 商品属性 -->
 					<view class="flex-vertical fs28 xc-ash color-gray n_guige">
@@ -52,7 +52,7 @@ Page({
     currentPage: 1,
     allData: null,
     openFilterModal: !1,
-    baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=goods_id&orderType=desc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
+    baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=sort&orderType=asc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
     requestUrl: "",
     tabname: "goods_id",   //排序的字段
     adname: "desc",        //升降的字段
@@ -791,7 +791,7 @@ Page({
     var that = this;
     that.data.requestUrl = t;
     e.get("/api/weshop/goods/page?1=1", {
-      data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+      data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
       success: function (data) {
         console.log(data.data.data.pageData)
         that.setData({
@@ -853,7 +853,7 @@ Page({
     console.log("page:=" + page)
     var s = this
     e.get("/api/weshop/goods/page?1=1", {
-      data: { page: page, cat_id: cid, parent_id: 0, orderField: 'goods_id', orderType: 'desc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
+      data: { page: page, cat_id: cid, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
       success: function (e) {
         console.log(e.data.data.pageData)
         s.setData({
@@ -605,7 +605,7 @@ Page({
     }).then(res => {
       var t = res;
       var data = t.data.data.pageData;
-      if (data.length > 0) {
+      if (data && data.length > 0) {
         //ee.setData({ is_collect: 1, collect_id: data[0].collect_id, });
         is_collect = 1;
         collect_id = data[0].collect_id;
@@ -2135,7 +2135,7 @@ Page({
     var url = "/pages/goods/goodsInfo/goodsInfo?goods_id="
-        + th.data.sele_g.gid+"&prom_type="+th.data.sele_g.prom_type+"&prom_id="+th.data.sele_g.prom_id;
+        + th.data.sele_g.goods_id+"&prom_type="+th.data.sele_g.prom_type+"&prom_id="+th.data.sele_g.prom_id;
     if (getApp().globalData.user_id) {
       url += "&first_leader=" + getApp().globalData.user_id;
     }
@@ -4308,10 +4308,8 @@ Page({
     var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
     var path2 = that.data.data.original_img;
     var scene = th.data.gid + "";
+    scene+="."+th.data.sele_g.prom_type+"."+th.data.sele_g.prom_id;
-    if(th.data.sele_g.prom_type==1){
-        scene+="."+th.data.sele_g.prom_type+"."+th.data.sele_g.prom_id;
-    }
     var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
     if (user_id > 0) {
       scene += "_" + user_id;
@@ -177,7 +177,7 @@
 		    <view class="item-cont">
 		      <view class="title ellipsis-2">{{item.goods_name}}</view>
 		      <!-- 判断是否有活动价 -->
-		      <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2}}">
+		      <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
 					<view class="flex on">
 						<!-- 活动价 -->
 						<view class="price">
@@ -35,7 +35,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价，小程序没有有团购和拼单 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_type!=2}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_type!=2 && item.prom_id>0}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
@@ -1441,6 +1441,28 @@ Page({
             corpId: id,
             success(res) {}
         })
+    },
+
+    //跳转到商品
+    go_gd:function (e) {
+        var gd= e.currentTarget.dataset.gd;
+        var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
+        var url="/api/weshop/activitylist/getGoodActInfo";
+        var req_data={
+            store_id:os.stoid,goodsidlist:gd,is_detail:1
+        };
+        //获取秒杀的多规格
+        getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+            if(res.data.code==0 && res.data.data){
+                if(res.data.data.length==1){
+                    good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id;
+                }
+                getApp().goto(good_url);
+
+            }else{
+                getApp().goto(good_url);
+            }
+        })
     }
@@ -20,12 +20,12 @@
         </view>
         <!--wx:if="{{item.return_btn!=4}}" -->
         <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}" >
-            <view class="goods-img">
+            <view class="goods-img"  bindtap="go_gd" data-gd="{{item.goods_id}}">
                 <image class="wh100" src="{{resourceUrl+item.original_img}}"  binderror="bind_bnerr" lazy-load="true"
                         data-errorimg="order.order_goods[{{index}}].original_img"></image>
             </view>
-
-            <navigator class="order-cont" openType="navigate" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+            <!-- 跳转到商品 -->
+            <navigator class="order-cont"  bindtap="go_gd" data-gd="{{item.goods_id}}">
                 <view class="goods-name">{{item.goods_name}}</view>
                 <!--<view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view>-->
                 <view class="goods-color">{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</view>