Merge branch 'v4.7.0dev' into v5.0.0dev

crmeb/app/dao/activity/bargain/StoreBargainUserDao.php

@@ -106,7 +106,7 @@ class StoreBargainUserDao extends BaseDao
     {
         return $this->search($where)->with(['getBargain', 'getUser'])
             ->when(isset($where['real_name']) && $where['real_name'] != '', function ($query) use ($where) {
-                $query->where('uid|nickname', 'like', '%' . $where['keyword'] . '%');
+                $query->where('uid', $where['real_name']);
             })->when($page != 0, function ($query) use ($page, $limit) {
                 $query->page($page, $limit);
             })->order('add_time desc')->select()->toArray();

crmeb/app/dao/order/StoreOrderDao.php

@@ -933,7 +933,7 @@ class StoreOrderDao extends BaseDao
         return $this->search($where)->where('seckill_id', $id)
             ->when($page && $limit, function ($query) use ($page, $limit) {
                 $query->page($page, $limit);
-            })->field(['order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->select()->toArray();
+            })->field(['order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->order('add_time desc')->select()->toArray();
     }
 
     /**
@@ -952,7 +952,7 @@ class StoreOrderDao extends BaseDao
         return $this->search($where)->where('bargain_id', $id)
             ->when($page && $limit, function ($query) use ($page, $limit) {
                 $query->page($page, $limit);
-            })->field(['uid', 'order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->select()->toArray();
+            })->field(['uid', 'order_id', 'real_name', 'status', 'pay_price', 'total_num', 'add_time', 'pay_time', 'paid'])->order('add_time desc')->select()->toArray();
     }
 
     /**

crmeb/app/services/activity/bargain/StoreBargainServices.php

@@ -996,8 +996,8 @@ class StoreBargainServices extends BaseServices
         $spread_count = $bargainUserHelp->count(['bargain_id' => $id, 'type' => 0]);
         $start_count = $bargainUser->count(['bargain_id' => $id]);
         $success_count = $bargainUser->count(['bargain_id' => $id, 'status' => 3]);
-        $pay_price = $orderServices->sum(['bargain_id' => $id, 'paid' => 1], 'pay_price', true);
-        $pay_count = $orderServices->count(['bargain_id' => $id, 'paid' => 1]);
+        $pay_price = $orderServices->sum([['bargain_id', '=', $id], ['paid', '=', 1], ['refund_type', 'in', [0, 3]], ['is_del', '=', 0]], 'pay_price', false);
+        $pay_count = $orderServices->getDistinctCount([['bargain_id', '=', $id], ['paid', '=', 1], ['refund_type', 'in', [0, 3]], ['is_del', '=', 0]], 'uid', false);
         $pay_rate = $start_count > 0 ? bcmul(bcdiv((string)$pay_count, (string)$start_count, 2), '100', 2) : 0;
         return compact('people_count', 'spread_count', 'start_count', 'success_count', 'pay_price', 'pay_count', 'pay_rate');
     }

crmeb/app/services/activity/live/LiveRoomServices.php

@@ -242,6 +242,7 @@ class LiveRoomServices extends BaseServices
     /**
      * 同步直播间状态
      * @return bool
+     * @throws \Exception
      */
     public function syncRoomStatus()
     {
@@ -249,7 +250,6 @@ class LiveRoomServices extends BaseServices
         $limit = 50;
         $data = $dataAll = [];
         $rooms = $this->dao->getColumn([], 'id,room_id,live_status', 'room_id');
-//        if (!$rooms) return true;
         do {
             $wxRooms = MiniProgramService::getLiveInfo($start, $limit);
             foreach ($wxRooms as $room) {

crmeb/app/services/order/StoreOrderServices.php

@@ -2566,12 +2566,12 @@ HTML;
     public function autoComment()
     {
         //自动评价天数
-        $systemCommentTime = (int)sys_config('system_comment_time', 0);
+        $systemCommentTime = sys_config('system_comment_time', 0);
         //0为取消自动默认好评功能
         if ($systemCommentTime == 0) {
             return true;
         }
-        $sevenDay = strtotime(date('Y-m-d H:i:s', strtotime('-' . $systemCommentTime . ' day')));
+        $sevenDay = bcsub((string)time(), bcmul((string)$systemCommentTime, '86400'));
         /** @var StoreOrderStoreOrderStatusServices $service */
         $service = app()->make(StoreOrderStoreOrderStatusServices::class);
         $orderList = $service->getTakeOrderIds([
@@ -2579,7 +2579,7 @@ HTML;
             'is_del' => 0,
             'paid' => 1,
             'status' => 2,
-            'change_type' => ['take_delivery']
+            'change_type' => ['take_delivery','user_take_delivery']
         ], 30);
         foreach ($orderList as $item) {
             AutoCommentJob::dispatch([$item['id'], $item['cart_id']]);

crmeb/app/services/order/StoreOrderTakeServices.php

@@ -522,12 +522,12 @@ class StoreOrderTakeServices extends BaseServices
     public function autoTakeOrder()
     {
         //7天前时间戳
-        $systemDeliveryTime = (int)sys_config('system_delivery_time', 0);
+        $systemDeliveryTime = sys_config('system_delivery_time', 0);
         //0为取消自动收货功能
         if ($systemDeliveryTime == 0) {
             return true;
         }
-        $sevenDay = strtotime(date('Y-m-d H:i:s', strtotime('-' . $systemDeliveryTime . ' day')));
+        $sevenDay = bcsub((string)time(), bcmul((string)$systemDeliveryTime, '86400'));
         /** @var StoreOrderStoreOrderStatusServices $service */
         $service = app()->make(StoreOrderStoreOrderStatusServices::class);
         $orderList = $service->getTakeOrderIds([

template/admin/src/pages/marketing/storeBargain/statistics.vue

@@ -26,8 +26,7 @@
         <Row type="flex" :gutter="24">
           <Col span="6" v-if="type == 1">
             <FormItem label="订单状态：" label-for="status">
-              <Select v-model="pagination.status" placeholder="请选择订单状态">
-                <Option value="">全部</Option>
+              <Select v-model="pagination.status" placeholder="请选择订单状态" clearable @on-change="searchList">
                 <Option value="0">未支付</Option>
                 <Option value="1">待发货</Option>
                 <Option value="2">待收货</Option>

template/admin/src/pages/marketing/storeCombination/statistics.vue

@@ -26,8 +26,7 @@
         <Row type="flex" :gutter="24">
           <Col span="6" v-if="type == 1">
             <FormItem label="订单状态：" label-for="status">
-              <Select v-model="pagination.status" placeholder="请选择订单状态">
-                <Option value="">全部</Option>
+              <Select v-model="pagination.status" placeholder="请选择订单状态" clearable  @on-change="searchList">
                 <Option value="0">未支付</Option>
                 <Option value="1">待发货</Option>
                 <Option value="2">待收货</Option>

template/uni-app/components/pageFooter/index.vue

@@ -58,8 +58,7 @@
 		computed: mapGetters(['isLogin', 'cartNum', 'activityTab']),
 		watch: {
 			activityTab: {
-				handler(nVal, oVal) {
-				},
+				handler(nVal, oVal) {},
 				deep: true
 			},
 			configData: {
@@ -83,6 +82,14 @@
 			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			let curRoute = routes[routes.length - 1].route //获取当前页面路由
 			this.$store.commit('ACTIVITYTAB', '/' + curRoute);
+			uni.$on('uploadFooter', () => {
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].route //获取当前页面路由
+				this.$store.commit('ACTIVITYTAB', '/' + curRoute);
+			})
+		},
+		onShow() {
+
 		},
 		mounted() {
 			getNavigation().then(res => {
@@ -97,7 +104,9 @@
 				this.getCartNum()
 			}
 		},
-
+		onHide() {
+			uni.$off(['uploadFooter'])
+		},
 		methods: {
 			goRouter(item) {
 				var pages = getCurrentPages();

template/uni-app/pages/goods_cate/goods_cate.vue

@@ -49,7 +49,7 @@
 				getCategoryVersion().then(res => {
 					if (!uni.getStorageSync('CAT_VERSION') || res.data.version != uni.getStorageSync(
 							'CAT_VERSION')) {
-						this.isNew = !this.isNew
+						this.isNew = !this.isNew
 						uni.setStorageSync('CAT_VERSION', res.data.version)
 					} else {
 						// this.isNew = false
@@ -58,7 +58,9 @@
 				})
 			},
 			jumpIndex() {
-				if (this.is_diy) {}
+				// uni.reLaunch({
+				// 	url: '/pages/index/index'
+				// })
 			},
 			classStyle() {
 				colorChange('category').then(res => {

template/uni-app/pages/goods_cate/goods_cate3.vue

@@ -564,7 +564,6 @@
 						title: that.$t(`不能输入0喔`)
 					});
 				}
-				console.log(that.attr.productSelect.cart_num, 'that.attr.productSelect.cart_num')
 				let q = {
 					product_id: id,
 					num: duo ? that.attr.productSelect.cart_num : 1,

template/uni-app/pages/index/diy/index.vue

@@ -13,7 +13,8 @@
 						:isSortType="isSortType" @bindSortId="bindSortId" @bindHeight="bindHeight" :isFixed="isFixed">
 					</component>
 				</view>
-				<!-- #endif -->
+				<!-- #endif -->
+				
 				<!-- #ifdef MP || APP-PLUS -->
 				<block v-for="(item, index) in styleConfig" :key="index">
 					<activeParty v-if="item.name == 'activeParty'" :dataConfig="item" :isSortType="isSortType">
@@ -141,7 +142,9 @@
 				<view v-if="site_config" class="site-config" @click="goICP">{{ site_config }}</view>
 				<!-- #endif -->
 				<view class="uni-p-b-98"></view>
+				<!-- #ifndef H5 -->
 				<pageFoot></pageFoot>
+				<!-- #endif -->
 			</view>
 		</view>
 		<view v-else>
@@ -460,7 +463,6 @@
 				uni.showLoading({
 					title: this.$t(`加载中`)
 				})
-				console.log('1111')
 				this.diyData();
 				this.getIndexData();
 				getShare().then(res => {
@@ -659,7 +661,7 @@
 			},
 			diyData() {
 				let that = this;
-				getDiy(0).then(res => {
+				getDiy(0).then(res => {
 					uni.hideLoading()
 					uni.setStorageSync('DIY_DATA', res.data)
 					setTimeout(() => {

template/uni-app/pages/index/index.vue

@@ -39,6 +39,7 @@
 		},
 		methods: {
 			getVersion(name) {
+				uni.$emit('uploadFooter')
 				getVersion(name).then(res => {
 					this.version = res.data.version
 					this.isDiy = res.data.is_diy