From ef713bf55df8c1653192acf44f61d24038ca3e7f Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 9 May 2023 16:53:15 +0800
Subject: [PATCH] 1、Oa 单 2、日常问题排查

---
 components/diy_pregoods/diy_pregoods.js      | 2 +-
 packageA/pages/distribution/order/order.wxml | 2 +-
 packageE/pages/cart/cart2/cart2.js           | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/diy_pregoods/diy_pregoods.js b/components/diy_pregoods/diy_pregoods.js
index 4eb3d21..69a55f8 100644
--- a/components/diy_pregoods/diy_pregoods.js
+++ b/components/diy_pregoods/diy_pregoods.js
@@ -89,7 +89,7 @@ Component({
 	no_gid_set(){
     	var th=this;
         var user_id=getApp().globalData.user_id;
-        var pre_data={store_id:os.stoid,is_end:0,timetype:1,isuse:1,page:1,pageSize:9};
+        var pre_data={store_id:os.stoid,is_end:0,timetype:3,isuse:1,page:1,pageSize:9};
         if(user_id){
             pre_data.user_id=user_id;
         }
diff --git a/packageA/pages/distribution/order/order.wxml b/packageA/pages/distribution/order/order.wxml
index a199bce..91e1f42 100644
--- a/packageA/pages/distribution/order/order.wxml
+++ b/packageA/pages/distribution/order/order.wxml
@@ -12,7 +12,7 @@
 					<text class="iconfont icon-ren" wx:else></text>
 					<text class="pdl10">{{item.nickname}}</text>
 				</view>
-				<view class="c-a">{{filter.status(item.status, statusArr)}}</view>
+				<view class="c-a">{{filter.status(item.status, statusArr,item.order_status)}}</view>
 			</view>
 			<view class="flex jc_sb ai-center pd20" wx:for="{{item.goods}}" wx:for-item="it" bindtap="goto" data-url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id=' + it.goods_id}}">
 				<view class="flex pdr20">
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 60447e6..6f81160 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -6797,6 +6797,7 @@ Page({
       item.goods_price = item.price;
       item.is_collocation = 1;
       item.prom_type = 5;
+      item.is_post_temp = 1;
 
 
       th.setData({is_coupon:item.is_coupon})
@@ -6914,6 +6915,7 @@ Page({
       item.goods_price = item.price;
       item.prom_type = 5;
       item.is_collocation = 1;
+      item.is_post_temp = 1;
 
       goods.push(item);
 
@@ -6946,6 +6948,8 @@ Page({
     var et = 1;
     var distr_t = 0; // 配送方式 0=用户自选 1=自提 2=物流
     for (var hi in narr) {
+
+      narr[hi].is_post_temp=1;  //-- 固定都是参与包邮模板 --
       var dis_t = narr[hi].distr_type;
       if (dis_t == 2) {
         th.setData({ is_all_zt: 0 });
--
libgit2 0.21.4