Merge branch 'cherry-pick-d46efa88' into 'dev'

Merge branch 'feature/member-defect-604' into 'pre-release'

See merge request !76

src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue

@@ -72,8 +72,8 @@
       <el-form-item :label="$t('提货点')" v-if="queryParams.type == '1'" prop="extraOrderV.receiveAddrList">
         <el-cascader v-if="cascaderState" style="width: 400px" :options="regionTreeList" @change="selectHandle" @expand-change="selectExpand" collapse-tags v-model="queryParams.extraOrderV.receiveAddrList" :props="cascaderProps" clearable></el-cascader>
       </el-form-item>
-      <el-form-item :label="$t('渠道')" v-if="queryParams.extraOrderV.transportType == '3'">
-        <el-select v-model="queryParams.channel" multiple placeholder="请选择">
+      <el-form-item :label="$t('渠道')" v-if="queryParams.type == '1' && queryParams.extraOrderV.transportType == '3'">
+        <el-select v-model="queryParams.extraOrderV.channel" multiple placeholder="请选择">
           <el-option v-for="item in channelList" :key="item.channelId" :label="isChinese ? item.nameZh : item.nameEn" :value="item.channelId"> </el-option>
         </el-select>
       </el-form-item>
@@ -705,7 +705,6 @@ export default {
         if (isNumber(res.data.extraRecommend?.shareStatus)) {
           params.extraRecommend.shareStatus = res.data.extraRecommend?.shareStatus.toString()
         }
-        console.log(params)
         params.dateRangeCreateTime = [parseTime(res.data.startTime), parseTime(res.data.endTime)]
 
         if (params.type == 1 && params.extraOrderV.receiveAddrList[0].toString() == "0,0,0") {

src/views/ecw/memberManagement/sharingDetails/index.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item :label="$t('操作人')" prop="memberName">
-        <el-input
-          v-model="queryParams.memberName"
-          :placeholder="$t('请输入操作人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.memberName" :placeholder="$t('请输入操作人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('分类')" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          :placeholder="$t('请选择分类')"
-          clearable
-        >
-          <el-option
-            v-for="item in getDictDatas(DICT_TYPE.SCORE_RULE_TYPE)"
-            :label="isChinese ? item.label : item.labelEn"
-            :value="item.value"
-            v-if="item.value == 3 || item.value == 4"
-          />
+        <el-select v-model="queryParams.type" :placeholder="$t('请选择分类')" clearable>
+          <el-option v-for="item in getDictDatas(DICT_TYPE.SCORE_RULE_TYPE)" :label="isChinese ? item.label : item.labelEn" :value="item.value" v-if="item.value == 3 || item.value == 4" />
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('标题')" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          :placeholder="$t('请输入关键词查找')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.title" :placeholder="$t('请输入关键词查找')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('分享ID')" prop="code">
-        <el-input
-          v-model="queryParams.code"
-          :placeholder="$t('请输入分享ID')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.code" :placeholder="$t('请输入分享ID')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('总积分')" prop="type">
         <el-row :gutter="10" style="width: 300px">
           <el-col :span="10">
-            <dict-selector
-              v-model="queryParams.relationSymbol"
-              clearable
-              :type="DICT_TYPE.QUANTITATIVE_RELATION_SYMBOL"
-              @change="handleQuery"
-            />
+            <dict-selector v-model="queryParams.relationSymbol" clearable :type="DICT_TYPE.QUANTITATIVE_RELATION_SYMBOL" @change="handleQuery" />
           </el-col>
           <el-col :span="14">
-            <el-input
-              v-model.trim="queryParams.totalScore"
-              :placeholder="$t('请输入数字')"
-              clearable
-              onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model.trim="queryParams.totalScore" :placeholder="$t('请输入数字')" clearable onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" @keyup.enter.native="handleQuery" />
           </el-col>
         </el-row>
       </el-form-item>
       <el-form-item :label="$t('操作时间')">
-        <el-date-picker
-          v-model="dateRangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        />
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
-          $t("搜索")
-        }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{
-          $t("重置")
-        }}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('序号')" align="center" prop="id" />
-      <el-table-column :label="$t('操作人')" align="center" prop="memberName" />
-      <el-table-column
-        :label="$t('分类')"
-        align="center"
-        :prop="isChinese ? 'typeZh' : 'typeEn'"
-      />
-      <el-table-column :label="$t('分享ID')" align="center" prop="code" />
-      <el-table-column
-        :label="$t('标题')"
-        align="center"
-        :prop="isChinese ? 'titleZh' : 'titleEn'"
-      />
-      <el-table-column
-        :label="$t('操作时间')"
-        align="center"
-        prop="createTime"
-        width="180"
-      >
+      <el-table-column width="100" :label="$t('序号')" align="center" prop="id" />
+      <el-table-column width="140" :label="$t('操作人')" align="center" prop="memberName" />
+      <el-table-column width="120" :label="$t('分类')" align="center" :prop="isChinese ? 'typeZh' : 'typeEn'" />
+      <el-table-column width="120" :label="$t('分享ID')" align="center" prop="code" />
+      <el-table-column :label="$t('标题')" align="center" :prop="isChinese ? 'titleZh' : 'titleEn'" />
+      <el-table-column :label="$t('操作时间')" align="center" prop="createTime"">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('点击时间')"
-        align="center"
-        prop="createTime"
-        width="180"
-      >
+      <el-table-column :label="$t('点击时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.triggerTime) || "--" }}</span>
         </template>
       </el-table-column>
+      <el-table-column   width="180" :label="$t('ip')" align="center" prop="ipAddress" />
       <el-table-column :label="$t('积分')" align="center" prop="score" />
     </el-table>
     <!-- 分页组件 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.page"
-      :limit.sync="queryParams.rows"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
   </div>
 </template>
 
 <script>
-import { getShareRecordDetails } from "@/api/ecw/memberManagement";
+import { getShareRecordDetails } from "@/api/ecw/memberManagement"
 export default {
   name: "EcwMembermanagementSharingdetailsIndex",
   components: {},
@@ -181,17 +101,17 @@ export default {
         status: null,
         type: null,
         category: null,
-        remark: null,
-      },
-    };
+        remark: null
+      }
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   computed: {
     isChinese() {
-      return this.$i18n.locale === "zh_CN";
-    },
+      return this.$i18n.locale === "zh_CN"
+    }
   },
   methods: {
     goShareDetails(row) {
@@ -199,38 +119,38 @@ export default {
         this.$router.push({
           path: "/member/memberManagement/sharingStatisticalDetails",
           query: {
-            id: row.id,
-          },
-        });
+            id: row.id
+          }
+        })
       }
     },
     /** 查询列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       // 处理查询参数
-      let params = { ...this.queryParams };
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
+      let params = { ...this.queryParams }
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime")
       // 执行查询
       getShareRecordDetails(params).then((response) => {
-        this.list = response.data.list;
-        this.total = response.data.total;
-        this.loading = false;
-      });
+        this.list = response.data.list
+        this.total = response.data.total
+        this.loading = false
+      })
     },
 
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.page = 1;
-      this.getList();
+      this.queryParams.page = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = [];
-      this.queryParams.relationSymbol = "";
-      this.queryParams.totalScore = "";
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-  },
-};
+      this.dateRangeCreateTime = []
+      this.queryParams.relationSymbol = ""
+      this.queryParams.totalScore = ""
+      this.resetForm("queryForm")
+      this.handleQuery()
+    }
+  }
+}
 </script>