Merge branch 'test' into 'qa'

Test See merge request !875

Merge branch 'test' into 'qa'
Test See merge request !875
后端研发-苏明海
2 parents 140d5fea c44fa002
Showing 8 changed files with 29 additions and 83 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.js
pages/team/team_show/team_show.js
pages/team/team_show/team_show.wxml
pages/user/coupons/coupons.js
pages/user/coupons/coupons.wxml
pages/user/coupons/coupons.wxss
pages/user/order_list/order_list.wxml
@@ -1061,7 +1061,7 @@ Page({
     if (this.data.prom_type == 1 || this.data.prom_type == 2) {
       this.getactLen(function (num) {
         if (num < th.data.goodsInputNum) {
-          getApp().my_warnning("秒杀库存不足!", 0, th);
+          getApp().my_warnning("活动库存不足!", 0, th);
           return false;
         } else {
           th.add_cart_func(t);
@@ -233,7 +233,7 @@ Page({
                           var rd= {
                               store_id: oo.stoid,
                               presell_id: presell_id,
-                              goods_id: val.goods_id
+                              goods_id: item.goods_id
                           }
                           //------获取预售从表----------
                           await getApp().request.promiseGet(url1, {
@@ -270,14 +270,11 @@ Page({
     var num = this.data.num;
     var ii = this.data.ii;
     var minusStatus = num > 1 ? 'normal' : 'disable';
-    if (ii == 0) {
-      getApp().showWarning("请选择门店"); return false;
-    }
-    if (ii == 1) {
+
       num++;
       //要判断库存数量，限购数量
       th.check_num(num,minusStatus);
-    }
+
   },
   async check_num(num,minusStatus){
@@ -255,7 +255,7 @@
 						<view class="count">
 							<view bindtap="{{num <= 1 ? '':'bindMinus'}}" class="sub {{num <= 1 ? 'active':''}}">-</view>
 							<!-- <view class='{{minusStatus}}' bindtap="bindMinus" class="sub">-</view> -->
-							<input bindblur="bindManual" class="xc-val-fream" type="number" value="1">1</input>
+							<input bindblur="bindManual" class="xc-val-fream" type="number" value="{{num}}">1</input>
 							<view bindtap="bindPlus" class="add">+</view>
 						</view>
 					</view>
@@ -188,7 +188,7 @@ Page({
 	 */
 	qrcode:function(val){
 	  // console.log(val);
-	  // barcode('barcode', val, 600,160);
+	  barcode('barcode', val, 600,160);
 	  qrcode('qrcode', val, 300, 300);
 	},
@@ -165,14 +165,18 @@
 				{{filter.getNum(details[useIndex].Sum)}}元微券
 			</block>
 		</view>
-		<view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view>
-		<!-- <img src="" alt="" class="img-qr"/> -->
+		<!-- <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view> -->
+		<!-- 条形码 -->
+		<view class="bar-container">
+			<canvas class="barcode" canvas-id="barcode"/>
+			<view class="pdt20 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
+			<view class="pdt20 fs26" wx:else>{{details[useIndex].no}}</view>
+		</view>
+		<!-- 二维码 -->
 		<view class="qr-container">
 		  <canvas class="qrcode" canvas-id="qrcode"/>
 		</view>
-		<view class="pdt20 pdb10 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
-		<view class="pdt20 pdb10 fs26" wx:else>{{details[useIndex].no}}</view>
-		<view class="pdv30 c-7b fs26 bdt">
+		<view class="pdb30 c-7b fs26 bdt">
 			<text  wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
 			<text  wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
 			<text wx:else>有效期:不限</text>
@@ -181,62 +185,5 @@
 </view>
-<!-- <block wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
-	
-	<block wx:if="{{detail.isby}}"> -->
-		<!-- 判断有没有数据有显示没有不显示 -->
-		 <!-- <view class="data" data-cashrepno='{{detail.no}}' bindtap='click'>
-		   <view class="code_rim">
-		    <canvas class="code" canvas-id="qrcode{{idx}}" />
-		    <view class="code_val">{{detail.no}}</view>
-		  </view>
-		 
-		  <view class="moneys">包邮券</view>
-		   <view class="car-rim">
-		  <view class="text">微券来源: 微信商城</view>
-		  <view wx:if="{{detail.use_end_time!=null}}"> -->
-		    <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 -->
-		    <!-- <view class="text">有效期:
-		     {{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}
-		     至 {{  time.format_time(detail.use_end_time)}}</view>
-		  </view>
-		  <view wx:else>
-		    <view class="text">有效期: 不限</view>
-		  </view>
-		  <view class="textss">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?",不包邮地区:"+detail.title:""}}
-		  </view>
-		</view>
-		</view>
-		
-		
-		
-	</block>
-	<block wx:else> -->
-     <!-- 判断有没有数据有显示没有不显示 -->
-     <!-- <view class="data" data-cashrepno='{{detail.CashRepNo}}' bindtap='click'>
-       <view class="code_rim">
-        <canvas class="code" canvas-id="qrcode{{idx}}" />
-        <view class="code_val">{{detail.CashRepNo}}</view>
-      </view>
-     
-      <view class="moneys">{{filter.getNum(detail.Sum)}}元微券</view>
-       <view class="car-rim">
-      <view class="text">
-       微券来源:  {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
-      <view wx:if="{{detail.ValidDate!=null}}"> -->
-        <!-- 不指定格式则默认输出：yyyy-MM-dd hh:mm:ss 格式 -->
-        <!-- <view class="text">有效期:
-         {{detail.BeginDate==null?" " : time.replace_time2(detail.BeginDate)}}
-         至 {{  time.replace_time2(detail.ValidDate)}}</view>
-      </view>
-      <view wx:else>
-        <view class="text">有效期: 不限</view>
-      </view>
-      <view wx:if="{{detail.Remark1}}" class="textss"> {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</view>	
-      <view wx:else class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
-      </view>
-    </view>
-    </view>
-	</block>
-</block> -->
+
@@ -322,12 +322,12 @@ color:#999999;
   font-family:'SimHei',Arial;
 }
 /* 点击条形 */
+.bar-container {
+	padding: 40rpx 20rpx 20rpx 20rpx;
+}
 .barcode {
-    height: 320rpx;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    margin-left: 30rpx;
+	width: 100%;
+	height: 100rpx;
 }
 /* 二维码边框*/
 .qrcode_rim {
@@ -97,6 +97,7 @@
 	          <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
 	          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
 	          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
+						<view class="abs flex-center fs26" wx:if="{{goods.prom_type==9}}">幸运购</view>
 	        </navigator>
 	        <!-- 商品内容 -->
 	        <view class="Commodity_content">
@@ -179,11 +180,11 @@
 	          </view>
 	        </view>
 	        <view class="links flex-right-vertical fs24 padding">
-	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
+	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
 	          <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
 	          <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
 	          <!---has_rt部分退---->
-	          <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
+	          <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1 && !(item.order_goods[0].prom_type==9)}}">
 	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
 	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
 	          </block>
@@ -194,8 +195,9 @@
 	          </block>
 	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
 	          <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
-	         
-			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}">订单详情</navigator>
+	      
+				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}">订单详情</navigator>	 
+			  <navigator class="commodity_To_evaluate flex-level View_evaluation" url="{{item.ord_url}}?order_id={{item.order_id}}" wx:else>订单详情</navigator>
 	          <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
 	            <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
@@ -221,9 +223,9 @@
 	          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
 			  <!-- 积分购  拼团 搭配购没有有再来一单 -->
-			  <block wx:if="{{(item.pay_status==1 || item.order_status==3) && !item.presell && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 }}">
+			  <block wx:if="{{(item.pay_status==1 || item.order_status==3) && !item.presell && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 && !(item.order_goods[0].prom_type==9)}}">
 			  			  <view bindtap="moreOrder"  class="commodity_To_evaluate flex-level comment_go"
-			  			   data-index="{{index}}" >再来一单</view>			  
+			  			   data-index="{{index}}">再来一单</view>			  
 			  </block>