update:列表筛选条件修改未输入框&设置页人群筛选参数修改

src/views/sign/list.vue

@@ -3,10 +3,7 @@
     <div class="pb20 clearfix">
       <el-input v-model="pageParams.memberInfo" class="w300" placeholder="请输入会员姓名/手机号" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
       <el-date-picker class="w250" v-model="pageParams.time" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
-      <p class="store_id">
-        <el-input v-model="storeName" placeholder="请选择门店" clearable @clear="clearStoreInfo"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input> <span @click="showStoreDialog" :style="!storeName ? 'width:100%;' : null">{{ storeName }}</span>
-      </p>
-      <vue-gic-store :projectName="projectName" :selectId="pageParams.storeId" :showStoreDialog="storeDialog" @selectStore="selectStore"></vue-gic-store>
+      <el-input v-model="pageParams.storeName" class="w300" placeholder="请输入门店" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
     </div>
     <el-table tooltipEffect="light" :data="tableList" style="width: 100%">
       <el-table-column :show-overflow-tooltip="true" align="left" prop="createTime" label="签到时间">
@@ -22,8 +19,8 @@
           <div class="memberInfo">
             <img :src="scope.row.memberImage || ''" alt="" />
             <div>
-              <p class="cell-memberInfo">{{ scope.row.memberName || '未获取到用户名' }}</p>
-              <p class="cell-memberInfo">{{ scope.row.memberPhone || '未获取到用户手机' }}</p>
+              <p class="cell-memberInfo">{{ scope.row.memberName || ' - ' }}</p>
+              <p class="cell-memberInfo">{{ scope.row.memberPhone || ' - ' }}</p>
             </div>
           </div>
         </template>
@@ -119,20 +116,21 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.store_id {
-  display: inline-block;
-  position: relative;
-  height: 32px;
-  min-width: 300px;
-  vertical-align: middle;
-  cursor: default;
-  span {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    opacity: 0;
-    cursor: default;
+.memberInfo {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  img {
+    display: block;
+    width: 40px;
+    height: 40px;
+    margin-right: 10px;
+    border-radius: 5px;
+  }
+  .cell-memberInfo {
+    color: #606266;
+    line-height: 20px;
+    font-size: 14px;
   }
 }
 </style>

src/views/sign/setting.vue

@@ -41,7 +41,7 @@
       <el-form-item label="签到人群" prop="memberSearchId">
         <div style="width:984px">
           <p class="people">在此权限下进行条件筛选<i>（不进行筛选则默认是您权限下的所有用户）</i></p>
-          <vue-gic-people projectName="gic-web" :isAdd="false" :useId="form.memberSearchId" :hasSearchData="hasSearchData" sceneValue="member" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn" />
+          <vue-gic-people projectName="marketing" :isAdd="false" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn" />
           <div class="gic-people--button" v-show="toggleTag">
             <el-button size="small" type="primary" @click="getData">确 定</el-button>
             <el-button size="small" @click="cancelFilter">取 消</el-button>
@@ -140,8 +140,8 @@ export default {
       isAdd: true,
       storeConfig: null,
       // 人群筛选器
-      hasSearchData: '{}',
-      operateType: true, // 编辑的时候是false 新增是true 例如列表筛选是开始true 编辑改成false
+      getSaveData: '',
+      hasSearchData: '{}', // 当前页回显的数据(接口返回)
       toggleTag: false, // 控制(确认取消)按钮显示的参数,仅供参考,可自行修改
       saveTag: false, // 控制(保存)按钮显示的参数,仅供参考,可自行修改
       form: Object.assign({}, defaultForm),
@@ -171,6 +171,7 @@ export default {
       if (res.errorCode === 0 && res.result) {
         this.isAdd = false;
         this.form = { ...res.result };
+        this.hasSearchData = this.form.memberSearchId;
         if (this.form.dateType) {
           this.form.date = [];
           this.form.date[0] = formatDateTimeByType(this.form.dateStart, 'yyyy-MM-dd');
@@ -230,9 +231,12 @@ export default {
       this.$refs.peopleFilter.cancelSet();
     },
     // 获取需要回显的数据, 供保存时候使用
-    getBackData(val) {
-      this.form.memberSearchId = `${val}`;
-      this.hasSearchData = val;
+    getBackData(value) {
+      this.getSaveData = value;
+    },
+    // 子组件触发父组件事件,返回过滤条件数据
+    findFilter(value) {
+      this.form.memberSearchId = value;
     },
     // 显示编辑,保存按钮隐藏,确认按钮显示 (子组件会调用)
     editShow() {
@@ -252,7 +256,6 @@ export default {
     // 签到福利
     showPrizeDialog(type) {
       this.dialogCom = type ? 'lib-card' : 'lib-integral';
-
       this.showDialog = true;
     },
     // 签到福利保存