Merge branch 'dev' of yuanyuan/nanjing_nft_front into master

.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://www.adcs.vip
+VUE_APP_BASE_URL=https://test.adcs.vip
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

src/views/Discover.vue

@@ -129,10 +129,10 @@ export default {
                     titleone: '精选推荐'
                     // titletwo: '介绍介绍介绍介绍'
                 },
-                // {
-                //     img: require('@assets/icon-zhanlan.png'),
-                //     titleone: '藏品展览'
-                // }
+                {
+                    img: require('@assets/icon-zhanlan.png'),
+                    titleone: '藏品展览'
+                }
             ],
             // 商品展示列表
             commodityDisplayList: [],

src/views/Submit.vue

@@ -104,6 +104,11 @@ export default {
                     icon: require('@assets/svgs/zhifubao.svg'),
                     name: '支付宝',
                     type: 'ALIPAY'
+                },
+                {
+                    icon: require('@assets/icon_yinlian.png'),
+                    name: '银联快捷付',
+                    type: 'H5PAY'
                 }
             ],
             icons: [require('@assets/svgs/icon_gouxuan_huise.svg'), require('@assets/icon_gouxuan_pre.png')],
@@ -161,27 +166,27 @@ export default {
                 }
                 return Promise.resolve();
             }),
-            this.$http.get('/sysConfig/get/enable_H5').then(res => {
-                if (!res.value) {
-                    this.payType = 'H5PAY';
-                    this.payInfos = [
-                        {
-                            icon: require('@assets/icon_yinlian.png'),
-                            name: '银联快捷付',
-                            type: 'H5PAY'
-                        }
-                    ];
-                } else {
-                    this.payType = 'ALIPAY';
-                    this.payInfos = [
-                        {
-                            icon: require('@assets/svgs/zhifubao.svg'),
-                            name: '支付宝',
-                            type: 'ALIPAY'
-                        }
-                    ];
-                }
-            }),
+            // this.$http.get('/sysConfig/get/enable_H5').then(res => {
+            //     if (!res.value) {
+            //         this.payType = 'H5PAY';
+            //         this.payInfos = [
+            //             {
+            //                 icon: require('@assets/icon_yinlian.png'),
+            //                 name: '银联快捷付',
+            //                 type: 'H5PAY'
+            //             }
+            //         ];
+            //     } else {
+            //         this.payType = 'ALIPAY';
+            //         this.payInfos = [
+            //             {
+            //                 icon: require('@assets/svgs/zhifubao.svg'),
+            //                 name: '支付宝',
+            //                 type: 'ALIPAY'
+            //             }
+            //         ];
+            //     }
+            // }),
             inWeixin
                 ? this.$http.get('/sysConfig/get/enable_wx_pub').then(res => {
                       this.enable_wx_pub = res.value.split(',').findIndex(i => i === this.$route.query.id) > -1;