jufubao-base 1.0.118 → 1.0.119

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -3,309 +3,402 @@
 export default {
   style: [],
   advanced: [],
-  content: [
-    {
-      label: "票券布局",
-      ele: "xd-radio",
-      valueKey: "cardLayout",
-      value: "1",
-      list: [
-        {label: "布局1", value: "1"},
-        {label: "布局2", value: "2"},
-      ]
-    },
-    {
-      label: '票券登陆文案:',
-      ele: 'el-input',
-      type: 'text',
-      valueKey: 'login_name',
-      value: '',
-      placeholder: '请输入票券登陆文案',
-      className: 'input80',
-      inline: false,
-      notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
-    },
-    {
-      label: '失效卡列表地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'disabled_url', //form[valueKey]
-      placeholder: '请选择失效卡列表地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+  content: (data) => {
+    return [
+      {
+        label: "票券布局",
+        ele: "xd-radio",
+        valueKey: "cardLayout",
+        value: data.cardLayout || "1",
+        list: [
+          {label: "布局1", value: "1"},
+          {label: "布局2", value: "2"},
+        ]
       },
-      inline: false,
-    },
-    {
-      label: '卡券详情地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'detail_url', //form[valueKey]
-      placeholder: '请选择卡券详情地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+      {
+        label: '票券登陆文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'login_name',
+        value: data.login_name || '',
+        placeholder: '请输入票券登陆文案',
+        className: 'input80',
+        inline: false,
+        notice: '当未设置文案时候，前台页面显示为"<span style="color:red">登录</span>"'
       },
-      inline: false,
-    },
-    {
-      label: '卡券转换地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'change_url', //form[valueKey]
-      placeholder: '请选择卡券转换地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+      {
+        label: "登录文字大小",
+        ele: "el-input",
+        type: "number",
+        valueKey: "login_text_size",
+        value: data.login_text_size || 24,
+        placeholder: "请输入登录文字大小",
+        className: "input80",
+        inline: false,
       },
-      inline: false,
-    },
-    {
-      label: '卡券密码绑定地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'bind_url', //form[valueKey]
-      placeholder: '请选择卡券密码绑定地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+      {
+        label: "登录字体颜色配置",
+        ele: 'xd-color',
+        valueKey: "login_text_color",
+        value: data.login_text_color || '',
+        className: "input80",
+        inline: false,
       },
-      inline: false,
-    },
-    {
-      label: '扫码绑定卡券确认地址:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'confirm_url', //form[valueKey]
-      placeholder: '请选择扫码绑定卡券确认地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
+      {
+        label: "登录背景颜色配置",
+        ele: 'xd-color',
+        valueKey: "login_text_bg_color",
+        value: data.login_text_bg_color || '',
+        className: "input80",
+        inline: false,
       },
-      inline: false,
-    },
-    {
-      label: '综合福利入口页:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'allEntryPath',
-      placeholder: '请选择综合福利入口页',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '提示内容:',
-      ele: 'xd-site-news',
-      valueKey: 'notice',
-      value: null,
-      className: 'input70',
-      setting: {
-        config: {
-          sort: true,
-          maxlen: 100,
-          action: 'aliyun',
-          size: 5,
-          tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-          uploadType: 'aliyun',
-          type: ['jpg', 'png', 'jpeg']
-        },
-      },
-      handleCustom({action, data}) {
-        if (data && data.params) {
-          //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
-          //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
-        }
-
-        //获取返回参数(场景类型名称为必填)
-        let loading = XdBus.getParentApi('loading')({});
-
-        //获取显示内容
-        if (action === 'screen') {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
-            .then(res => {
-              loading.close();
-              data.cb(res['list'])
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-            });
-
-        }
-
-        //获取返回参数(广告位高度必选项)
-        if (action === 'getNewsInfo') {
-          XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-            .then(res => {
-              loading.close()
-              data.cb({list: res.list, selectId: res.selected})
-            })
-            .catch(error => {
-              loading.close()
-              console.error(error);
-            });
-        }
-
-        //获取产品业务线列表
-        if (action === 'namespace') {
-          XdBus.getParentApi('getOptionsNamespaces')({})
-            .then(res => {
-              loading.close()
-              data.cb(res['list'])
-            })
-            .catch(error => {
-              loading.close()
-              console.error(error);
-            });
-        }
-
-        //使用内容分类
-        if (action === 'cmsPublishEditxContent') {
-          XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+      {
+        label: "登录按钮圆角配置",
+        ele: 'xd-site-select-list',
+        valueKey: "login_text_radius",
+        value: data.login_text_radius || '',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
             .then(res => {
-              console.log('cmsPublishEditxContent', res)
-              loading.close();
-              data.cb(res)
+              data.cb(res.list)
             })
             .catch(error => {
-              loading.close();
               console.error(error);
             });
-        }
-
-        //位置列表
-        if (action === 'getListPostion') {
-          XdBus.getParentApi('getListNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //位置创建
-        if (action === 'addPostion') {
-          XdBus.getParentApi('addNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //位置编辑
-        if (action === 'editPostion') {
-          XdBus.getParentApi('updateNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //位置删除
-        if (action === 'deleltePostion') {
-          XdBus.getParentApi('deleteNewsPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //获取广告位内容列表
-        if (action === 'getListContent') {
-          XdBus.getParentApi('getListNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //广告内容创建
-        if (action === 'addContent') {
-          XdBus.getParentApi('addNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //广告内容编辑
-        if (action === 'editContent') {
-          XdBus.getParentApi('updateNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //广告内容删除
-        if (action === 'deleteContent') {
-          XdBus.getParentApi('deleteNewsContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
+        },
+      },
 
-        //内容发布
-        if (action === 'publish') {
-          console.log('publish', data.params)
-          XdBus.getParentApi('cmsPublishContent')(data.params)
+      {
+        label: "查看文字大小",
+        ele: "el-input",
+        type: "number",
+        valueKey: "look_text_size",
+        value: data.look_text_size || 24,
+        placeholder: "请输入登录文字大小",
+        className: "input80",
+        inline: false,
+      },
+      {
+        label: "查看字体颜色配置",
+        ele: 'xd-color',
+        valueKey: "look_text_color",
+        value: data.look_text_color || '',
+        className: "input80",
+        inline: false,
+      },
+      {
+        label: "查看背景颜色配置",
+        ele: 'xd-color',
+        valueKey: "look_text_bg_color",
+        value: data.look_text_bg_color || '',
+        className: "input80",
+        inline: false,
+      },
+      {
+        label: "查看按钮圆角配置",
+        ele: 'xd-site-select-list',
+        valueKey: "look_text_radius",
+        value: data.look_text_radius || '',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
             .then(res => {
-              loading.close();
-              data.cb(res)
+              data.cb(res.list)
             })
             .catch(error => {
-              loading.close();
               console.error(error);
             });
-        }
+        },
+      },
 
-        //通知页面进行刷新
-        if (action === 'update') {
-          XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-          loading.close()
-        }
+      
+      {
+        label: '失效卡列表地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'disabled_url', //form[valueKey]
+        placeholder: '请选择失效卡列表地址',
+        value: data.disabled_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '卡券详情地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'detail_url', //form[valueKey]
+        placeholder: '请选择卡券详情地址',
+        value: data.detail_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '卡券转换地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'change_url', //form[valueKey]
+        placeholder: '请选择卡券转换地址',
+        value: data.change_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '卡券密码绑定地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'bind_url', //form[valueKey]
+        placeholder: '请选择卡券密码绑定地址',
+        value: data.bind_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '扫码绑定卡券确认地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'confirm_url', //form[valueKey]
+        placeholder: '请选择扫码绑定卡券确认地址',
+        value: data.confirm_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '综合福利入口页:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'allEntryPath',
+        placeholder: '请选择综合福利入口页',
+        value: null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '提示内容:',
+        ele: 'xd-site-news',
+        valueKey: 'notice',
+        value: data.notice || null,
+        className: 'input70',
+        setting: {
+          config: {
+            sort: true,
+            maxlen: 100,
+            action: 'aliyun',
+            size: 5,
+            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+            uploadType: 'aliyun',
+            type: ['jpg', 'png', 'jpeg']
+          },
+        },
+        handleCustom({action, data}) {
+          if (data && data.params) {
+            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
+            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
+          }
+  
+          //获取返回参数(场景类型名称为必填)
+          let loading = XdBus.getParentApi('loading')({});
+  
+          //获取显示内容
+          if (action === 'screen') {
+            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
+              .then(res => {
+                loading.close();
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+              });
+  
+          }
+  
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getNewsInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                loading.close()
+                data.cb({list: res.list, selectId: res.selected})
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+  
+          //获取产品业务线列表
+          if (action === 'namespace') {
+            XdBus.getParentApi('getOptionsNamespaces')({})
+              .then(res => {
+                loading.close()
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+  
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                console.log('cmsPublishEditxContent', res)
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //位置列表
+          if (action === 'getListPostion') {
+            XdBus.getParentApi('getListNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //位置创建
+          if (action === 'addPostion') {
+            XdBus.getParentApi('addNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //位置编辑
+          if (action === 'editPostion') {
+            XdBus.getParentApi('updateNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //位置删除
+          if (action === 'deleltePostion') {
+            XdBus.getParentApi('deleteNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            XdBus.getParentApi('getListNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //广告内容创建
+          if (action === 'addContent') {
+            XdBus.getParentApi('addNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //广告内容编辑
+          if (action === 'editContent') {
+            XdBus.getParentApi('updateNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //广告内容删除
+          if (action === 'deleteContent') {
+            XdBus.getParentApi('deleteNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+  
+          //内容发布
+          if (action === 'publish') {
+            console.log('publish', data.params)
+            XdBus.getParentApi('cmsPublishContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+  
+          //通知页面进行刷新
+          if (action === 'update') {
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            loading.close()
+          }
+        },
+        inline: false,
+        notice: '',
+        rules: [
+          {required: true, message: '请配置温馨提示内容', trigger: 'change'},
+        ],
       },
-      inline: false,
-      notice: '',
-      rules: [
-        {required: true, message: '请配置温馨提示内容', trigger: 'change'},
-      ],
-    },
-  ],
+    ].filter(i => i)
+  },
 };

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -145,7 +145,10 @@
                   :color="mainColor"
                   icon="iconyouhuiquan1-011"
                 ></xd-font-icon>
-                <view>{{ tabIndex === 1 ? login_name : "转换" }}</view>
+                <view class="login_style" :style="{
+                  backgroundColor: '#FFFFFF',
+                  ...loginStyle
+                }">{{ tabIndex === 1 ? login_name : "转换" }}</view>
               </view>
               <view class="jfb-base-card__body-card-item-right">
                 <view class="jfb-base-card__body-card-item-right-top">
@@ -179,7 +182,10 @@
                   </view>
                   <view
                     @click.stop="toDetail(item)"
-                    :style="{ background: mainColor }"
+                    :style="{
+                      backgroundColor: mainColor,
+                      ...lookStyle
+                    }"
                     >查看</view
                   >
                 </view>
@@ -194,6 +200,8 @@
               :key="index"
               :cardInfo="item"
               :tabIndex="tabIndex"
+              :loginStyle="loginStyle"
+              :lookStyle="lookStyle"
               @toDetail="toDetail(item)"
               @bindLogin="handleBindLogin(item)">
             </xd-card-v2>
@@ -254,6 +262,22 @@ export default {
       jwxSDK: (state) => state.jwxSDK,
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
+    loginStyle(){
+      let style = {};
+      if(this.login_text_size) style['fontSize'] = this.login_text_size + 'rpx';
+      if(this.login_text_color) style['color'] = this.login_text_color;
+      if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
+      if(this.login_text_radius) style['borderRadius'] = this.login_text_radius + 'rpx'
+      return style;
+    },
+    lookStyle(){
+      let style = {};
+      if(this.look_text_size) style['fontSize'] = this.look_text_size + 'rpx';
+      if(this.look_text_color) style['color'] = this.look_text_color;
+      if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
+      if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx'
+      return style;
+    }
   },
   watch: {
     tabIndex(newVal, oldVal) {
@@ -297,6 +321,16 @@ export default {
       allEntryPath: "", //综合福利入口页
       disabledUrl: "",
       cardLayout: "1",  //票券布局
+      
+      //样式
+      login_text_size: "",
+      login_text_color: "",
+      login_text_bg_color: "",
+      login_text_radius: "",
+      look_text_size: "",
+      look_text_color: "",
+      look_text_bg_color: "",
+      look_text_radius: "",
 
       showDisabled: 'Y',
 
@@ -342,6 +376,16 @@ export default {
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
       this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
+      //样式
+      this.login_text_size = getContainerPropsValue(container, 'content.login_text_size', 24);
+      this.login_text_color = getContainerPropsValue(container, 'content.login_text_color', '');
+      this.login_text_bg_color = getContainerPropsValue(container, 'content.login_text_bg_color', '');
+      this.login_text_radius = getContainerPropsValue(container, 'content.login_text_radius', '');
+
+      this.look_text_size = getContainerPropsValue(container, 'content.look_text_size', 24);
+      this.look_text_color = getContainerPropsValue(container, 'content.look_text_color', '');
+      this.look_text_bg_color = getContainerPropsValue(container, 'content.look_text_bg_color', '');
+      this.look_text_radius = getContainerPropsValue(container, 'content.look_text_radius', '');
     },
 
     handleToLink(path) {
@@ -701,6 +745,11 @@ export default {
           align-items: center;
           justify-content: center;
           font-size: unit(24, rpx);
+          .login_style{
+            min-width: 80rpx;
+            padding: 4rpx 16rpx;
+            text-align: center;
+          }
         }
 
         &-right {

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -43,10 +43,6 @@
         </view> -->
       <view class="qrcode_card">
         <view class="jfb-base-card-detail-entry__body-qrcode">
-          <view class="qrcode_card-title">
-            <xd-font-icon style="margin-right: 24rpx;" icon="iconsaoma-02" size="32"></xd-font-icon>
-            向商家付款
-          </view>
           <view class="barcode_wrap">
             <view>
               <image mode="aspectFit" :src="info.barcode"></image>

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -321,9 +321,14 @@ export default {
           otherParams = this.$xdUniHelper.jsonToParams(this.dispatchData);
         }
       } catch (error) {}
+      let curCoup = this.list[this.currentIndex];
+      let linkUrl = this.list_url;
+      if(curCoup.show_url){
+        linkUrl = curCoup.show_url
+      }
 
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
+        url: `${linkUrl}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
       });
     },
     handleClose() {

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -153,6 +153,7 @@ export default {
       done: false,
       message: "",
       options: {},
+      next_url: "",
 
       collectedPath: "",
     };
@@ -197,6 +198,7 @@ export default {
           this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
           this.can_take = res.can_take;
           this.has_times = res.has_times;
+          this.next_url = res.next_url;
           
           this.couponList =
             res.list &&
@@ -258,7 +260,7 @@ export default {
             });
           console.log("couponList", this.couponList);
           this.message = res.message;
-          this.notice = res.rule;
+          this.notice = res.about;
           this.done = true;
         })
         .catch((err) => {
@@ -267,7 +269,7 @@ export default {
     },
     toCoupon(){
       this.$xdUniHelper.navigateTo({
-        url: this.collectedPath,
+        url: this.next_url || this.collectedPath,
       });
     },
     getCoupont(item) {

package/src/components/JfbBaseMySetting/JfbBaseMySetting.vue

@@ -17,7 +17,7 @@
       minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'
     }">
       <view class="setting_list">
-        <xd-list-item label="已绑实体卡是否失效" :showRight="!showSwitch"
+        <xd-list-item label="已绑实体票券是否失效" :showRight="!showSwitch"
           paddingLR="50rpx" paddingTB="32rpx"
           style="margin-bottom: 8rpx;"
           @click="handleToShowSwitch"
@@ -32,7 +32,7 @@
         </xd-list-item>
         <view class="switch_tip">
           <xd-font-icon size="24" icon="iconmingchengtubiao" style="margin-right: 8rpx;"></xd-font-icon>
-          <view>当卡被绑定后，实体卡的卡密与二维码都失效</view>
+          <view>当票券被绑定后，实体票券的密码与二维码都失效</view>
         </view>
         <xd-list-item :showRight="!phone_number" label="绑定手机号"
           paddingLR="50rpx" paddingTB="32rpx"