jufubao-admin-library 1.1.91-beta1 → 1.1.92

package/library/viewModules/viewsCorporateActivities/schemas/activity_manage.js

@@ -265,6 +265,7 @@ module.exports = {
     data: {
       id: ['id', 'String', '必填'],
     },
+    method:'delete',
     disabled: true,
   },
   {

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/components/CommentBox.vue

@@ -9,7 +9,7 @@
         <img :src="item.user_avatar" alt="">
       </div>
       <div class="app-container-card-right">
-        <div><div>{{item.username}}</div><div v-if="isShow"><i @click="handleShow(item.id,item.is_show,true)" v-if="item.is_show==='Y'" class="xd_admin_iconfont xdicon_chakan"></i><i @click="handleShow(item.id,item.is_show,true)" v-else class="xd_admin_iconfont xdicon_biyan"></i></div></div>
+        <div><div>{{item.username}}</div><div v-if="isShow"><i @click="handleShow(item.id,item.is_show,true,index)" v-if="item.is_show==='Y'" class="xd_admin_iconfont xdicon_chakan cuspoint"></i><i @click="handleShow(item.id,item.is_show,true,index)" v-else class="xd_admin_iconfont xdicon_biyan cuspoint"></i></div></div>
         <div>{{item.comment_content}}</div>
       </div>
     </div>
@@ -27,7 +27,7 @@
         <img :src="item.user_avatar" alt="">
       </div>
       <div class="app-container-card-right">
-        <div><div>{{item.username}}</div><div v-if="isShow"><i @click="handleShow(item.id,item.is_show,false)" v-if="item.is_show==='Y'" class="xd_admin_iconfont xdicon_chakan"></i><i @click="handleShow(item.id,item.is_show,false)" v-else class="xd_admin_iconfont xdicon_biyan"></i></div></div>
+        <div><div>{{item.username}}</div><div v-if="isShow"><i @click="handleShow(item.id,item.is_show,false,index)" v-if="item.is_show==='Y'" class="xd_admin_iconfont xdicon_chakan cuspoint"></i><i @click="handleShow(item.id,item.is_show,false,index)" v-else class="xd_admin_iconfont xdicon_biyan cuspoint"></i></div></div>
         <div>{{item.comment_content}}</div>
       </div>
     </div>
@@ -36,7 +36,7 @@
       <xd-pagination
         :total="total"
         :limit.sync="limit"
-        :page="page_size"
+        :page="page_token"
         :auto-scroll="false"
         @onPagination="handlePagination"
       ></xd-pagination>
@@ -147,9 +147,10 @@ export default {
       this.getList(false);
       this.showDialog = true;
     },
-    handleShow(id,is_show,isFirst){
+    handleShow(id,is_show,isFirst,index){
       this.companyCommentIsShow({id:id,is_show:is_show==='Y'?'N':'Y'})
       .then(res=>{
+        this.$set(this.commentData['comments'][index],'is_show',is_show==='Y'?'N':'Y')
         this.$message.success('操作成功')
         this.getList(isFirst)
       })
@@ -205,5 +206,8 @@ export default {
       }
     }
   }
+  .cuspoint{
+    cursor: pointer;
+  }
 </style>
 

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/components/ContentBox.vue

@@ -5,11 +5,16 @@
     </div>
     <div class="app-container-right">
       <div class="app-container-right-title">
-        <div class="app-container-right-title-name">{{contentData['username']}}</div>
+        <!-- #ifdef saas-admin -->
+        <div class="app-container-right-title-name">{{contentData['username']}} {ID:{{contentData['user_id']}}}</div>
+        <!-- #endif -->
+        <!-- #ifdef app-activity -->
+        <div class="app-container-right-title-name">{{contentData['username']}} {ID:{{contentData['passport_user_id']}}}</div>
+        <!-- #endif -->      
         <div class="app-container-right-title-time">{{contentData['created_time']}}</div>
       </div>
       <div class="app-container-right-img" v-if="contentData['work_ext_content']['type']==='image'">
-        <img v-for="(item,index) in contentData['work_ext_content']['mediaList_list']" :key="index" :src="item" alt="">
+        <img v-for="(item,index) in contentData['work_ext_content']['media_list']" :key="index" :src="item.url" alt="">
       </div>
       <div class="app-container-right-video" v-if="contentData['work_ext_content']['type']==='video'">
         <video ref="videoPlayer" :src="contentData['work_ext_content']['media_list'][0]['url']" controls></video>
@@ -66,59 +71,7 @@ export default {
     this.contentData = this.$xdHelper.cloneDeep(this.list)
   },
   methods: {
-    ...mapActions('activity_manage', [
-      'getCompanyEligibleUserItems',
-      'deleteCompanyEligibleUser',
-      'createAsyncTask',
-      'getAsyncTask'
-    ]),
-    onJfbTagForReload () {
-      this.getList()
-    },
-    getList () {
-      // //请求数据
-      // let params = {
-      //   filters:{
-      //     prize_activity_id:this.activityId.toString(),
-      //     ...this.searchParams,
-      //   },
-      //   page_token: this.page_token.toString(),
-      //   page_size: this.page_size
-      // }
-      // let loading = Loading.service({})
-      // this.getCompanyEligibleUserItems(params).then((res) => {
-      //   loading.close();
-      //   this.tables = res.data.list.map(item => {
-      //     item['created_time'] = window['getTimeFormat'](item.created_time);
-      //     return item;
-      //   });
-      //   this.total = res.data.total_size;
-      // }).catch(err => {
-      //   loading.close()
-      // })
-    },
-    /**
-     * @description 点击搜索进行搜索操作
-     * @param action 动作
-     * @param form 搜索请求参数
-     */
-    handleSearch ({ action, form }) {
-      console.log(action,'aaa')
-      this.page_token = 1
-      this.hasNextPage = true
-      this.getList()
-    },
-    /**
-     * @description 翻页处理方法
-     * @param page {Number} 访问页面页码数
-     */
-    handlePagination (page) {
-      this.page_token = page
-      this.getList()
-    },
-    onJfbTagForReload () {
-      this.getList()
-    },
+   
   }
 }
 

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/create.vue

@@ -20,10 +20,10 @@
               <div v-for="(item,index) in contentList" :key="index" style="display:flex;width:100%">
                 <div style="width:60%">
                    <el-form-item label="标题:">
-                    <el-input v-model="contentList[index].title" placeholder="" style="width:60%"></el-input>
+                    <el-input v-model="contentList[index].title" placeholder="活动内容" style="width:60%"></el-input>
                   </el-form-item>
                   <el-form-item label=" " required>
-                    <el-input v-model="contentList[index].rule" type="textarea" placeholder="" style="width:80%"></el-input>
+                    <el-input v-model="contentList[index].rule" type="textarea" placeholder="请输入活动规则" style="width:80%"></el-input>
                   </el-form-item>
                 </div>
                 <i v-if="(index + 1) === contentList.length" class="el-icon-circle-plus pl5" @click="add(item)" ></i>
@@ -265,7 +265,6 @@ export default {
             },
           ],
         },
-        // #endif
         {
           label: '参与设置:', //label
           ele: "xd-radio",
@@ -277,6 +276,7 @@ export default {
             { required: true, message: '请选择参与设置', trigger: ['blur', 'change'] },
           ]
         },
+        // #endif
         // #ifdef saas-admin
          {
           label: '全部企业参与:', //label
@@ -339,6 +339,7 @@ export default {
           ],
         },
         // #endif
+        // #ifdef app-activity
         {
           label: '工会ID:', //label
           ele: "xd-radio",
@@ -365,7 +366,6 @@ export default {
             },
           ],
         },
-        // #ifdef app-activity
         {
           label: "适用范围:",
           ele: "xd-check",
@@ -580,7 +580,19 @@ export default {
         copyFormParams['activity_banners'] = JSON.stringify(this.listValue.activity_banners)
       }
       if(this.contentList&&this.contentList.length){
-        copyFormParams['activity_content_config'] = JSON.stringify(this.contentList)
+        let isReturn = false
+        this.contentList.map(i=>{
+          if(!i.rule){
+            isReturn = true
+            return false
+          }
+        })
+        if(isReturn){
+          this.$message.error('请输入规则')
+          return false
+        }else{
+          copyFormParams['activity_content_config'] = JSON.stringify(this.contentList)
+        }
       }else{
         this.$message.error('请进行内容设置')
         return false
@@ -607,7 +619,8 @@ export default {
     handleClick () {
       this.$refs['poster'].submitAll()
         .then(res => {
-          let params = this.getParams();
+          if(this.getParams()){
+            let params = this.getParams();
           console.log(params,'ppppp')
           // return
           let loading = Loading.service({})
@@ -633,6 +646,7 @@ export default {
               console.error(error)
               loading.close()
             })
+          }
         })
         .catch()
     }

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/result.vue

@@ -12,7 +12,7 @@
         @onDone="getList"
       ></xd-search>
     </el-card>
-    <el-card class="app-container__list">
+    <el-card class="app-container__list" v-if="status">
       <div class="app-container__list-content" v-for="(item,index) in tables" :key="index">
         <content-box :list="item" :key="contentKey"></content-box>
         <comment-box :list="item" :key="commentKey"></comment-box>
@@ -83,6 +83,7 @@ export default {
       contentKey:'contentKey',
       commentKey:'commentKey',
       sortData:[],
+      status:false,
     }
   },
   
@@ -123,6 +124,7 @@ export default {
     getList() {
       let params = this.getParams()
       let loading = Loading.service({});
+      this.status = false;
       this.getCompanyUserWorkList(params).then(res => {
         const {list, total_size} = res.data;
         this.tables = list.map(item=>{
@@ -134,6 +136,7 @@ export default {
         });
         console.log(this.tables,'this.tables')
         this.total = total_size;
+        this.status = true;
         loading.close();
       }).catch(err=>loading.close())
     },
@@ -168,7 +171,7 @@ export default {
           placeholder: '请选择',
           classNmae:'input40',
           multiple: false,
-          list: [{label:'启用',value:'Y'},{label:'禁用',value:'N'}],
+          list: [{label:'显示',value:'Y'},{label:'隐藏',value:'N'}],
         },
         {
           label: '列表排序',

package/library/viewModules/viewsCorporateActivities/viewsCorporateActivities/sign_result.vue

@@ -155,6 +155,7 @@ export default {
   },
   
   created() {
+    this.id = this.$route.params.id
     this.initSearchForm();
   },
   methods: {
@@ -170,6 +171,7 @@ export default {
     },
     getParams(){
       let needFilter = JSON.parse(JSON.stringify(this.searchParams))
+      needFilter.activity_id = this.id
       let timeObj = {
         created_time_range: {
           start_time: this.searchParams.created_time_start,
@@ -179,7 +181,7 @@ export default {
       delete needFilter.created_time_start
       delete needFilter.created_time_end
       let params = {
-        filter: this.searchParams.created_time_start ? { ...needFilter, ...timeObj } : needFilter,
+        filters: this.searchParams.created_time_start ? { ...needFilter, ...timeObj } : needFilter,
         page_token: this.page_size.toString(),
         page_size: this.limit
       }
@@ -220,30 +222,38 @@ export default {
      */
     initSearchForm() {
       this.searchForm = [
+        // {
+        //   label: '报名人:',
+        //   ele: 'xd-remote-select',
+        //   valueKey: 'user_id',
+        //   value: [],
+        //   className: 'input40',
+        //   placeholder: `请选择报名人`,
+        //   multiple: false,
+        //   collapseTags: false,
+        //   remoteSearch: (query, resolve) => {
+        //     getOptions({
+        //       server: 'saas-company',
+        //       fn: 'staff',
+        //       path: 'p1',
+        //       params: {
+        //         page_token: '1',
+        //         page_size: '500',
+        //         user_name: query
+        //       }
+        //     })
+        //       .then(res => {
+        //         resolve(res.data.list)
+        //       })
+        //   },
+        // },
         {
           label: '报名人:',
-          ele: 'xd-remote-select',
-          valueKey: 'user_id',
-          value: [],
-          className: 'input40',
-          placeholder: `请选择报名人`,
-          multiple: false,
-          collapseTags: false,
-          remoteSearch: (query, resolve) => {
-            getOptions({
-              server: 'saas-company',
-              fn: 'staff',
-              path: 'p1',
-              params: {
-                page_token: '1',
-                page_size: '500',
-                user_name: query
-              }
-            })
-              .then(res => {
-                resolve(res.data.list)
-              })
-          },
+          ele: 'el-input',
+          type: 'text',
+          valueKey: 'username',
+          value:'',
+          placeholder: '请输入报名人',
         },
         {
           label: '提交时间:', //label

package/library/viewModules/viewsCycle/viewsCycle/create.vue

@@ -34,7 +34,7 @@
                 v-model="item.discount_ratio"
                 placeholder="请填写"
               ></el-input>
-              <span style="margin-left: 10px">折以内的商品</span>
+              <span style="margin-left: 10px">%以内的商品</span>
               <div style="margin-left: 10px" class="">
                 <el-link
                   :underline="false"
@@ -53,8 +53,10 @@
                   v-if="customForm.length > 1"
                 ></el-link>
               </div>
-              <span v-if="item.count">{{ item.count }}</span>
-              <el-button type="primary" @click="handleGetCount(item)">计算数量</el-button>
+              <span v-if="item.count" style="margin: 0 4px;color: red;">{{ item.count }}款商品</span>
+              <el-button type="primary" :loading="item.loading" @click="handleGetCount(item)" style="margin-left: 8px;">
+                {{item.count === undefined ? '计算数量':'重新计算'}}
+              </el-button>
             </el-form-item>
           </el-form>
         </template>
@@ -154,12 +156,15 @@ export default {
     handleGetCount(item){
       let discount_ratio = {
         type: "real_div_sale",
-        max: item.discount_ratio * 1000,
+        max: item.discount_ratio * 100,
         min: 0,
       }
+      this.$set(item, 'loading', true);
       this.selectedProductCount({filters: {discount_ratio}}).then(res => {
-        // item.count = res.data;
         this.$set(item, 'count', res.data.total);
+        this.$set(item, 'loading', false)
+      }).catch(err => {
+        this.$set(item, 'loading', false)
       })
     },
     initFormList(params, isWitch) {

package/package.json

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