jufubao-base 1.0.237-beta16 → 1.0.237-beta18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.237-beta16",
+  "version": "1.0.237-beta18",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -54,7 +54,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
-  import { mapState } from "vuex";
+  import { mapState, mapMutations } from "vuex";
   export default {
     name: "JfbBaseShare",
     components: {
@@ -74,6 +74,7 @@
     },
     computed: {
       ...mapState(["shareInfo"]),
+      ...mapMutations(["setShareInfo"]),
       showShare(){
         if(this.isPreview) return true;
         // #ifdef MP-WEIXIN

package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgain.vue

@@ -20,7 +20,8 @@
         提现至{{channel_name}}
       </view>
       <view v-if="info.status==='N'" class="fixe_bottom" :style="prod_bottom">
-        <XdButton fontSize="32" type="primary" @click="handleWithDraw">确认提现</XdButton>
+        <XdButton v-if="showDisabled" disabled fontSize="32" type="primary">确认提现</XdButton>
+        <XdButton v-else fontSize="32" type="primary" @click="handleWithDraw">确认提现</XdButton>
         <view @click="handleCancelWithDraw">取消提现</view>
       </view>
       <XdDailog :radius="30" :showClose="false" :show.sync="showSuccess">
@@ -77,7 +78,8 @@
         channel_name: '',
         logo: '',
         withDrawSuccessPath: '',
-        jwxSDK: null
+        jwxSDK: null,
+        showDisabled: false
       }
     },
     computed: {
@@ -101,6 +103,8 @@
       },
     },
     created() {
+      console.log(this.$configProject,this.settings.index,'apapapa');
+      
       this.init(this.container);
     },
     methods: {
@@ -157,6 +161,7 @@
         this.withDrawSuccessPath = getContainerPropsValue(container, 'content.withDrawSuccessPath', { value: '' }).value;
       },
       handleWithDraw() {
+        this.showDisabled = true
         jfbRootExec("getWithdrawThirdPlaceOrderList", {
           vm: this,
           data: {
@@ -168,18 +173,24 @@
           //#ifdef MP-WEIXIN
           if (wx.canIUse('requestMerchantTransfer')) {
             wx.requestMerchantTransfer({
-              mchId: mch_id,
-              appId: app_id,
-              package: channel_data,
+              mchId: res.mch_id,
+              appId: res.app_id,
+              package: res.channel_data,
               success: (request) => {
                 console.log('success:', request);
-                that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
+                if(that.withDrawSuccessPath){
+                  that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
+                } else {
+                  that.$xdUniHelper.navigateTo({ url: that.settings.index })
+                }
               },
               fail: (request) => {
+                this.showDisabled = false
                 console.log('fail:', request);
               },
             });
           } else {
+            this.showDisabled = false
             wx.showModal({
               content: '你的微信版本过低，请更新至最新版本。',
               showCancel: false,
@@ -199,16 +210,23 @@
                   function (request) {
                     if (request.err_msg === 'requestMerchantTransfer:ok') {
                       console.log(request,that.withDrawSuccessPath,'requestrequestrequest');
-                      that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
+                      if(that.withDrawSuccessPath){
+                        that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
+                      } else {
+                        that.$xdUniHelper.navigateTo({ url: that.settings.index })
+                      }
                     }
                   }
                 );
               } else {
+                this.showDisabled = false
                 alert('你的微信版本过低，请更新至最新版本。');
               }
             }
           })
           //#endif
+        }).catch(err=>{
+          this.showDisabled = false
         })
       },
       handleCancelWithDraw() {