jufubao-admin-library 1.1.155 → 1.1.156

package/library/viewModules/viewWalking/viewWalking/jbz/XdJbzItemScale.vue

@@ -347,6 +347,7 @@ export default {
           value: params.sms_activity_list||[], 
           className: 'input40',
           placeholder: `请选择关联营销活动`,
+          notice: '活动参与次数，以关联活动设置为准',
           multiple: false,
           collapseTags: false,
           remoteSearch: (query, resolve) => {
@@ -588,8 +589,8 @@ export default {
         point_position:point_position,
         // #ifdef sms-walking saas-admin
         sms_activity_type: type==='normal'?this.formValue.sms_activity_type || this.orgFormValue.sms_activity_type:this.orgFormValue.sms_activity_type,
-        sms_activity_id: type==='normal'?this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length?this.formValue.sms_activity_list[0]['value'] || this.orgFormValue.sms_activity_list[0]['value']:this.orgFormValue.sms_activity_list[0]['value']:'',
-        sms_activity_name: type==='normal'?this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length?this.formValue.sms_activity_list[0]['label'] || this.orgFormValue.sms_activity_list[0]['label']:this.orgFormValue.sms_activity_list[0]['label']:'',
+        sms_activity_id: type==='normal'?(this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length)?this.formValue.sms_activity_list[0]['value']:'':this.orgFormValue.sms_activity_list[0]['value'],
+        sms_activity_name: type==='normal'?(this.formValue.sms_activity_list&&this.formValue.sms_activity_list.length)?this.formValue.sms_activity_list[0]['label']:'':this.orgFormValue.sms_activity_list[0]['label'],
         sms_activity_status: type==='normal'?this.formValue.sms_activity_status || this.orgFormValue.sms_activity_status:this.orgFormValue.sms_activity_status,
         // #endif
         // #ifdef sms-walking

package/library/viewModules/viewWalkingActivity/viewWalkingActivity/stepBase.vue

@@ -338,6 +338,7 @@ export default {
           className: "input100",
           valueKey: "activity_url_config",
           value: params.activity_url_config || null,
+          placeholder: "请选择健步走活动列表页面",
           setting:{
             site_id:params.site_id,
             hiddenSite:true

package/library/viewModules/viewsDynamicForm/viewsDynamicForm/create.vue

@@ -297,8 +297,9 @@ export default {
           valueKey: "site_id",
           value: params.site_id || "",
           list: this.siteList,
+          placeholder: "请选择站点",
           rules: [
-            { required: true, message: "请选择活动地址-站点", trigger: "change" },
+            { required: true, message: "请选择站点", trigger: "change" },
           ],
         },
         params.site_id && {
@@ -307,6 +308,7 @@ export default {
           className: "input100",
           valueKey: "page_url",
           value: params.page_url || null,
+          placeholder: "请选择表单页面",
           setting: {
             site_id: params.site_id
           },
@@ -413,7 +415,7 @@ export default {
             { required: true, message: "请选择参与用户范围", trigger: "change" },
           ]
         },
-        params.is_need_login !== "all" && params.form_type === 'form' && {
+        params.is_need_login !== "all" &&  {
           label: "提交后参与活动:",
           ele: "xd-radio",
           valueKey: "participate_after_submit",
@@ -423,7 +425,7 @@ export default {
             { required: true, message: "请选择提交后参与活动", trigger: "change" },
           ]
         },
-        params.participate_after_submit === 'Y' && params.form_type === 'form' && {
+        params.participate_after_submit === 'Y'  && {
           label: "营销工具类型:",
           ele: "xd-select-list",
           valueKey: "marketing_tool",
@@ -439,6 +441,7 @@ export default {
           valueKey: 'activity_id',
           value: params.activity_id || null,
           placeholder: '请选择关联活动',
+          notice: params.marketing_tool!=='code'?'活动参与次数，以关联活动设置为准':'',
           setting: {
             multiple: false,
           },
@@ -463,13 +466,13 @@ export default {
             { required: true, message: "请选择关联活动", trigger: "change" },
           ]
         },
-        params.participate_after_submit === 'Y' && params.form_type === 'form' &&  {
-          label: "每用户发放张数:",
+        params.participate_after_submit === 'Y' && params.marketing_tool === 'code' &&  {
+          label: "每用户发放数量:",
           ele: "el-input",
           type: "number",
           valueKey: "code_count",
           value: params.code_count || "",
-          placeholder: "请输入每用户发放张数",
+          placeholder: "请输入每用户发放数量",
           className: "input20",
           inline: true,
           notice: "注：请输入1~10之间的数值，包含1和10；并且仅首次提交成功后一次性发放",

package/library/viewModules/viewsPrize/viewsPrize/create.vue

@@ -334,6 +334,7 @@ export default {
           ele: "xd-select-site-path",
           className: "input100",
           valueKey: "activity_url_config",
+          placeholder: "请选择抽奖活动页面",
           value: params.activity_url_config || null,
           setting:{
             site_id:params.site_id,
@@ -558,7 +559,7 @@ export default {
           ],
         },
         //#endif
-        params.activity_use_scene==='prize'&&{
+        {
           label: "最多参与次数:",
           ele: "xd-input-unit",
           valueKey: "max_attend_number",
@@ -590,7 +591,7 @@ export default {
             }
           ],
         },
-        params.activity_use_scene==='prize'&&{
+        {
           label: "每天参与次数:",
           ele: "xd-input-unit",
           valueKey: "everyday_max_attend_number",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.155",
+  "version": "1.1.156",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {