jufubao-third 1.0.23-beta3 → 1.0.23-beta4

package/.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(node -e ' *)",
+      "Bash(npx esbuild *)",
+      "Bash(npx vue-template-compiler *)",
+      "Bash(node -e \"const fs=require\\('fs'\\);const compiler=require\\('/Users/zxd/Workspaces/jufubao-third/node_modules/@vue/compiler-sfc'\\);const {parse,compileTemplate}=compiler;const r=parse\\(fs.readFileSync\\('/Users/zxd/Workspaces/jufubao-third/src/components/JfbThirdRideLand/JfbThirdRideLand.vue','utf8'\\)\\);const t=compileTemplate\\({source:r.descriptor.template.content,filename:'x.vue'}\\);console.log\\(t.errors.length===0?'Vue template OK':'ERR '+JSON.stringify\\(t.errors\\)\\)\")",
+      "Bash(node *)",
+      "Bash(grep -i \"^vue$\")"
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.23-beta3",
+  "version": "1.0.23-beta4",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdOpenEmbeddedMp/Attr.js

@@ -22,20 +22,17 @@ export default {
         ele: 'xd-site-select-list',
         labelInline: true,
         valueKey: 'channelApi',
-        value: dataVal({data, key:'channelApi', dValue:'10', gValue}),
+        value: dataVal({data, key:'channelApi', dValue:'', gValue}),
         placeholder: '请选择渠道配置',
         multiple: false,
         className: 'input100',
         groupKey:'content',
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'edtix_style_radius1',
+            setting_id: 'third_channels_webhook',
             key: Date.now()
           })
             .then(res => {
-              res.list = res.list.filter(item=>{
-                return item.label !== '无';
-              });
               data.cb(res.list)
             })
             .catch(error => {
@@ -46,25 +43,7 @@ export default {
           {
             required: false,
             validator: (rule, value, callback) => {
-              let setTpl = dataVal({data, key:'footerTpl', dValue:'normal', gValue});
-              if(setTpl === 'itemCenterBig') {
-                if(value && value.length === 0) callback('请设置菜单');
-                else {
-                  let errorStr = '';
-                  if(value && value.length > 0) {
-                    let len = value.length;
-                    for(let i = 0; i < len; i++) {
-                      if(value[i].name.length > 5) {
-                        errorStr = `菜单${i}最大长度不能超过5个汉字`;
-                        break
-                      }
-                    }
-                  }
-                  if(errorStr) {
-                    callback(errorStr)
-                  }else callback();
-                }
-              }
+              if(!value) callback('请选择渠道配置')
               else callback()
             },
             trigger: 'blur'

package/src/components/JfbThirdOpenEmbeddedMp/JfbThirdOpenEmbeddedMp.vue

@@ -16,7 +16,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-third-open-embedded-mp__body">
-      <view class="pop" :style="[noDataStyleComp]">弹窗模式方便编辑(占位)，在线上此模块不显</view>
+      <view class="pop" :style="[noDataStyleComp]">开启半屏小程序中转组件便编辑(占位)，在线上此模块不显</view>
     </view>
   </view>
 </template>
@@ -27,7 +27,7 @@
   import { gCPVal } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
-  import {mapState} from "vuex";
+  import {mapState,mapMutations} from "vuex";
   import {getNoUrl} from "@/utils/nourl";
   import Color from "color";
 
@@ -56,7 +56,7 @@
       ...mapState(['extraData']),
 
       noDataStyleComp(){
-        let height = '60rpx';
+        let height = '66rpx';
         if(!this.isPreview) height = 0;
         return {
           backgroundColor:this.backgroundColor,
@@ -69,6 +69,13 @@
           overflow: 'hidden'
         }
       },
+
+      apiUrlComp(){
+        let urlObj = this.channelApi.split('@@');
+        let url = urlObj[0];
+        let method = urlObj[1] || 'get';
+        return {url,method}
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -89,17 +96,30 @@
       this.init(this.container);
     },
     methods: {
+      ...mapMutations(['setExtraData']),
+
       /**
        * @description 请求三方接口
        */
       requestApi(params){
+        //if(this.isPreview ) return;
         this.$xdShowLoading({});
+        let {url ,method} = this.apiUrlComp;
+        let apiParams = { url };
+        if(method === 'get') apiParams.params = params;
+        else apiParams.data = params;
+
         //打包模式
-        getNoUrl(params)
+        getNoUrl(apiParams)
           .then(res => {
-
+            //处理返回数据
+            // debugger
+            this.$xdUniHelper.navigateTo({
+              url: this.cashierURL + `?main_order_id=${res.main_order_id}`
+            })
           })
           .catch(error => {
+            debugger
             console.log(error)
           });
 
@@ -114,6 +134,12 @@
         this.cashierURL = gCPVal(container, 'cashierURL', {value: 'cashierURL'}).value;
       },
 
+      onJfbLoad(){
+        // setTimeout(()=>{
+        //   this.setExtraData({a:1,b:2});
+        // }, 2000)
+      }
+
     }
   }