Merge branch 'dev_oa_fu3' into dev

WXD-SEASON\season
2 parents 211c4d80 a1e0891e
Showing 8 changed files with 23 additions and 10 deletions
components/diy_pregoods/diy_pregoods.js
components/diy_pregoods/diy_pregoods.wxml
components/diy_pregoods/diy_pregoods.wxss
packageA/pages/distribution/commision/commision.js
packageA/pages/distribution/commision/commision.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
utils/filter.wxs
@@ -55,7 +55,7 @@ Component({
 			  goodsidlist=ut.sub_last(goodsidlist);
  
               var user_id=getApp().globalData.user_id;
-              var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1};
+              var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1};
               if(user_id){
                   pre_data.user_id=user_id;
 			  }
@@ -30,6 +30,13 @@
 					     <span class='s_top_kill'>火热进行</span>
 					   </view>
 					 </block>
+
+                    <block wx:if="{{aitem.start_time>newTime}}">
+                        <view class="rob">
+                            <span class='s_top_kill' style="background-color: #ffe718">即将开始</span>
+                        </view>
+                    </block>
+
 					 <block wx:if="{{aitem.buy_goodnum>=aitem.presell_sumqty}}">
 					   <view class="rob">
 					     <span class='s_top_kill gray'>已抢光</span>
@@ -57,6 +57,7 @@ swiper {
 .sp .sp_top {
   height: 220rpx;
   min-width: 30%;
+  position: relative;
 }
  
 .sp .sp_top .s_img {
@@ -76,7 +77,7 @@ swiper {
   font-size: 24rpx;
   height: 38rpx;
   line-height: 38rpx;
-  left: 6rpx;
+  left: 2rpx;
   padding: 4rpx 10rpx;
   border-radius: 10rpx;
   z-index: 999;
@@ -10,7 +10,7 @@ Page({
   data: {
 		isHiddenDropdown: true,//控制下拉菜单显隐
 		dropdownArr: ['综合','未付款','已付款','待分成','已分成','已取消'],
-		statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消'],
+		statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消','已退款'],
 		currentSelect: '',//记录当前下拉菜单选中项
 		isInputFocus: false,//记录搜索输入框是否聚焦
 		inputVal: '',//记录搜索输入框的内容
@@ -31,7 +31,7 @@
 		<view class="item fs26" wx:for="{{list.pageData}}">
 			<view class="flex jc_sb pd20 bdb">
 				<view class="time">{{filter.format_time(item.create_time, 1)}}</view>
-				<view class="c-red">{{filter.status(item.status, statusArr)}}</view>
+				<view class="c-red">{{filter.status(item.status, statusArr,item.order_status)}}</view>
 			</view>
 			<view class="pd20"><text class="c-a fs24">订单号：</text>{{item.order_sn}}</view>
 			<view class="flex t-c">
@@ -255,6 +255,8 @@ Page({
     pre_arr: null,
  
     hiddenCS: true,
+
+    is_retail_price: 0,
   },
  
   //------初始化加载----------
@@ -391,7 +393,8 @@ Page({
         store_config: e,
         sys_switch: json_d,
         is_closecoupon: json_d.is_closecoupon,
-        is_newsales_rules: json_d.is_newsales_rules
+        is_newsales_rules: json_d.is_newsales_rules,
+        is_retail_price: json_d.is_retail_price || 0,
       });
       // ee.init(gid);
       //------几人评价-------
@@ -80,10 +80,10 @@
           <!-- <view class="flex" style='height:40rpx; margin-top:5rpx;'> -->
           <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
           <view class="abs flex presell_price">
-            <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
-<!--            <view class="word-line fs26 xc-qtunit-price">-->
-<!--              零售价￥{{filters.toFix(data.market_price,2)}}-->
-<!--            </view>--> 
+            <view class="fs28 val" style="margin-right:60rpx">￥{{presellList.presell_price}}</view>
+            <view wx:if="{{is_retail_price}}" class="word-line fs26 xc-qtunit-price">
+               零售价￥{{filters.toFix(data.market_price,2)}}
+            </view>
           </view>
  
  
@@ -115,7 +115,7 @@ var filters = {
 	// num:状态数值,
 	// arr: 状态文字数组,
 	// 文字顺序必须跟状态数值对应
-	status: function (num, arr) {
+	status: function (num, arr,order_status) {
 		// var text = '';
 		// if(num == 0) {
 		// 	text = '未付款';
@@ -126,6 +126,8 @@ var filters = {
 		// } else if(num == 3) {
 		// 	text = '已完成';
 		// };
+
+		if(order_status==6) return '已退款';
 		return arr[num];
 	},