Merge branch 'yuan' of panhui/lasuo_nft_front into master

src/views/Givesubmit.vue

@@ -116,7 +116,7 @@ export default {
             password: '',
             enable_wx_lite: false,
             enable_wx_pub: false,
-            payType: inWeixin ? 'WEIXIN' : 'ALIPAY',
+            payType: 'ALIPAY',
             // payType: 'ALIPAY',
             payInfos: [
                 {
@@ -174,27 +174,27 @@ export default {
                 this.gas = res.value;
                 return Promise.resolve();
             }),
-            inWeixin
-                ? this.$http.get('/sysConfig/get/enable_wx_pub').then(res => {
-                      this.enable_wx_pub = res.value === '1';
-                      return Promise.resolve();
-                  })
-                : Promise.resolve(),
-            this.$http.get('/sysConfig/get/enable_wx_lite').then(res => {
-                this.enable_wx_lite = res.value === '1';
-                return Promise.resolve();
-            })
+            // inWeixin
+            //     ? this.$http.get('/sysConfig/get/enable_wx_pub').then(res => {
+            //           this.enable_wx_pub = res.value === '1';
+            //           return Promise.resolve();
+            //       })
+            //     : Promise.resolve(),
+            // this.$http.get('/sysConfig/get/enable_wx_lite').then(res => {
+            //     this.enable_wx_lite = res.value === '1';
+            //     return Promise.resolve();
+            // })
         ]).then(() => {
-            if (!(this.enable_wx_lite || this.enable_wx_pub)) {
-                this.payInfos.splice(1, 1);
-                this.payType = 'ALIPAY';
-            } else if (this.enable_wx_pub) {
-                this.payChannel = 'wx_pub';
-            } else {
-                this.payChannel = 'wx_lite';
-            }
+            // if (!(this.enable_wx_lite || this.enable_wx_pub)) {
+            //     this.payInfos.splice(1, 1);
+            //     this.payType = 'ALIPAY';
+            // } else if (this.enable_wx_pub) {
+            //     this.payChannel = 'wx_pub';
+            // } else {
+            //     this.payChannel = 'wx_lite';
+            // }
 
-            this.passFn();
+            // this.passFn();
         });
     },
     methods: {
@@ -253,6 +253,7 @@ export default {
             });
         },
         submit() {
+            console.log("sasdas",this.payType)
             // this.$router.push({ path: '/assetDetail', query: { id: this.info.id, collectionStatus: 'CANCELLED'} })
             if (this.orderId) {
                 return;
@@ -274,11 +275,13 @@ export default {
                         })
                         .then(res => {
                             this.orderId = res.id;
+                            console.log("sasdas",this.payType)
                             this.$nextTick(() => {
                                 if (this.payType === 'ALIPAY') {
                                     // document.location.replace(
                                     //     resolveUrl(this.$baseUrl, 'payOrder/gift/alipay?id=' + res.id)
                                     // );
+                                    console.log("sasda11eeeers",this.inWeixin)
                                     if (this.inWeixin) {
                                         if (this.gas === '0') {
                                             this.$http