jufubao-admin-library 1.1.84 → 1.1.86

package/library/viewModules/viewWalking/router/walking_config.js

@@ -20,12 +20,12 @@ const walkingConfigRouter = {
   },
   children: [
     {
-      // #ifdef saas-admin admin
+      // #ifdef admin saas-admin
       path: 'config/:map_id?/:activity_id?',
-      // endif
+      // #endif
       // #ifdef sms-walking
       path: 'config/:map_id?/:activity_id?/:site_id?',
-      // endif
+      // #endif
       name: 'ConfigMap',
       hidden: true,
       component: () => setModuleName(import('@/viewWalking/config.vue'),'ConfigMap'),

package/library/viewModules/viewWalking/viewWalking/config.vue

@@ -81,6 +81,7 @@
           :radius-num="radius"
           :circle-color="color"
           :site_id="siteId"
+          :typeData="typeData"
           @onDelete="handleItemDelete"
           @onSubmit="handleItemSubmit"
           v-model="item.model"
@@ -99,6 +100,7 @@
 import XdJbzItem from "./jbz/XdJbzItemScale.vue";
 import {Loading} from "element-ui";
 import {mapActions} from "vuex";
+import { getOptions } from "@/utils/options";
 
 export default {
   components: {
@@ -147,6 +149,7 @@ export default {
       yLeft:15.2,
       yHeight: 15.2,
       siteId:'',
+      typeData:[],
 
     };
   },
@@ -171,6 +174,21 @@ export default {
     },
   },
   created() {
+    getOptions([{
+      // #ifdef sms-walking
+      server:'saas-app-partner',
+      // #endif
+      // #ifndef sms-walking
+      server:'saas-app-public',
+      // #endif
+      fn:'sms-activity-type',
+      path:'p1',
+    },]).then(res=>{
+      this.typeData = res[0]['data']['list']
+    })
+    .catch(err=>{
+
+    })
     if(this.$route.params.map_id) this.map_id = Number(this.$route.params.map_id);
     if(this.$route.params.activity_id) this.activity_id = Number(this.$route.params.activity_id);
     // #ifdef sms-walking

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

@@ -58,7 +58,6 @@
 <script>
 import XdDialog from "@/components/XdDialog.vue";
 import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
-import { getOptions } from "@/utils/options";
 import {mapActions} from "vuex";
 
 //背景放大坐标不放大
@@ -116,6 +115,12 @@ export default {
       type: String,
       default: ''
     },
+    typeData: {
+      type: Array,
+      default(){
+        return []
+      }
+    },
   },
   data(){
     return {
@@ -162,7 +167,6 @@ export default {
       formListKey:'formListKey',
       formList: [],
       formValue: {},
-      typeData:[],
     }
   },
   watch:{
@@ -226,21 +230,6 @@ export default {
     },
   },
   created(){
-     getOptions([{
-      // #ifdef sms-walking
-      server:'saas-app-partner',
-      // #endif
-      // #ifndef sms-walking
-      server:'saas-app-public',
-      // #endif
-      fn:'sms-activity-type',
-      path:'p1',
-    },]).then(res=>{
-      this.typeData = res[0]['data']['list']
-    })
-    .catch(err=>{
-
-    })
     this.id = `circle_${this.$xdHelper.randomChar(20)}`;
     this.init('init');
     this.$nextTick(() => {

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/list.vue

@@ -94,6 +94,7 @@ import checkPermission from "@/utils/permission"
 import permissions from "@/constant/permissions"
 import PeopleManage from './components/PeopleManage'
 import XdDialog from "@/components/XdDialog.vue";
+import { getOptions } from "@/utils/options";
 import {
   mapActions,
   mapState,
@@ -176,11 +177,19 @@ export default {
       tables: [],
       showPeopleManage:false,
       clickId:null,
+      sourceFromData:[],
     }
   },
   
   created() {
-    this.initSearchForm();
+    getOptions({
+      server: 'saas-app-public',
+      fn: 'source-from',
+      path: 'p1',
+    },).then(res => {
+      this.sourceFromData = res.data.list
+      this.initSearchForm()
+    })
   },
   methods: {
     ...mapActions('activity_manage', [
@@ -291,7 +300,24 @@ export default {
             }
           ]
         },
-
+        {
+          label: '活动类型:',
+          ele: 'xd-select-list',
+          valueKey: 'activity_type',
+          value: '',
+          placeholder: '请选择活动类型',
+          list: [{ value: 'sign_up', label: '企业报名' }, { value: 'activity', label: '企业活动' }]
+        },
+        // #ifdef saas-admin
+        {
+          label: '活动来源:',
+          ele: 'xd-select-list',
+          valueKey: 'activity_type',
+          value: '',
+          placeholder: '请选择活动类型',
+          list: this.sourceFromData
+        },
+        // #endif
       ];
     },
     /**

package/package.json

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