Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/Home.vue

@@ -407,8 +407,14 @@ export default {
             this.showTips().then(() => {
                 let showMMC = window.sessionStorage.getItem('showMMC');
                 if (!showMMC) {
-                    this.$http.get('sysConfig/get/MMC_video_url,MMC_show').then(res => {
-                        if (res.MMC_show) {
+                    this.$http.get('sysConfig/get/MMC_video_url,MMC_show,MMC_show_time').then(res => {
+                        if (res.MMC_show_time) {
+                            let date1 = dayjs(res.MMC_show_time.value);
+                            let date2 = dayjs(res.MMC_show_time.value).add(1, 'days');
+                            if (date1.isSameOrBefore(dayjs(), 'day') && date2.isAfter(dayjs(), 'day')) {
+                                this.showMMC = true;
+                            }
+                        } else if (res.MMC_show) {
                             this.showMMC = res.MMC_show.value === '1';
                         }
                         if (res.MMC_video_url) {

src/views/asset/Detail.vue

@@ -1245,12 +1245,8 @@ export default {
                             message: '加载中...',
                             forbidClick: true
                         });
-                        return this.$http.post('/domainOrder/addHyperLinkWithld', {
-                            collectionld: this.assetId,
-                            openHyperLink: 0,
-                            hyperLinkType: this.info.hyperLinkType,
-                            address: '',
-                            publicCollectionId: ''
+                        return this.$http.post('/domainOrder/closeHyperLink', {
+                            assetId: this.assetId
                         });
                     })
                     .then(res => {

src/views/domain/ProductChoose.vue

@@ -95,12 +95,12 @@ export default {
                 });
         },
         addHyperLink(address) {
-            return this.$http.post('/domainOrder/addHyperLinkWithld', {
-                collectionld: this.assetId,
-                openHyperLink: 1,
+            return this.$http.post('/domainOrder/addId', {
+                assetId: this.assetId,
+                openHyperLink: true,
                 hyperLinkType: 'COLLECTION',
                 address: address,
-                publicCollectionld: this.chooseId
+                publicCollectionId: this.chooseId
             });
         }
     }