Merge branch 'dev' of xiongzhu/raex_front into master

src/views/asset/Detail.vue

@@ -923,20 +923,34 @@ export default {
                             holdDays = Number(res.value);
                             return Promise.resolve();
                         });
-                    } else if (_this.info.source === 'GIFT' && _this.info.type === 'PICTURE') {
-                        return _this.$http
-                            .get('/sysConfig/get/pic_gift_days')
-                            .catch(e => {
-                                return _this.$http.get('/sysConfig/get/gift_days');
-                            })
-                            .then(res => {
-                                holdDays = Number(res.value);
-                                return Promise.resolve();
-                            });
                     } else if (_this.info.source === 'GIFT') {
-                        return _this.$http.get('/sysConfig/get/gift_days').then(res => {
-                            holdDays = Number(res.value);
-                            return Promise.resolve();
+                        return _this.$http.get('/sysConfig/get/gift_change_time,git_pre_days').then(res => {
+                            if (res.gift_change_time) {
+                                if (
+                                    _this
+                                        .dayjs(_this.info.createdAt)
+                                        .isSameOrBefore(_this.dayjs(res.gift_change_time.value))
+                                ) {
+                                    let _days = res.git_pre_days.value.split(',');
+                                    if (_this.info.type === 'PICTURE') {
+                                        holdDays = Number(_days[1]);
+                                    } else {
+                                        holdDays = Number(_days[0]);
+                                    }
+                                    return Promise.resolve();
+                                }
+                            }
+                            if (_this.info.type === 'PICTURE') {
+                                return _this.$http.get('/sysConfig/get/pic_gift_days').then(res => {
+                                    holdDays = Number(res.value);
+                                    return Promise.resolve();
+                                });
+                            } else {
+                                return _this.$http.get('/sysConfig/get/gift_days').then(res => {
+                                    holdDays = Number(res.value);
+                                    return Promise.resolve();
+                                });
+                            }
                         });
                     } else {
                         return Promise.resolve();