From 56dbe18a6e52f7c2848c3cfc0eea94b75ee75a66 Mon Sep 17 00:00:00 2001
From: wwl <web_2021@163.com>
Date: Mon, 1 Apr 2024 11:51:05 +0800
Subject: [PATCH] fix bug

---
 .env.production                               |  2 +-
 package.json                                  |  1 +
 src/view/goods/index.vue                      | 16 ++++++++--
 src/view/mall/goods/physical/list.vue         |  5 +--
 src/view/mall/trade/normalorders/list.vue     |  1 +
 src/view/member/cardticket/edit.vue           | 13 ++++++--
 .../member/selfservice/registrationrecord.vue | 31 ++++++++++++++-----
 7 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/.env.production b/.env.production
index f971eda..5b70948 100755
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@ VUE_APP_IS_SAAS=false
 VUE_APP_SYSTEM_NAME=platform
 VUE_APP_PRODUCT_MODEL=platform
 # VUE_APP_BASE_API=https://ecshopx-shop.ex-sandbox.com/api
-VUE_APP_BASE_API=http://47.103.169.154:8080/api
+VUE_APP_BASE_API=https://test.birkenstock.net.cn/api
 # VUE_APP_PROXY_API=http://47.103.169.154:8080/api
 # VUE_APP_PUBLIC_PATH=https://ecshopx-vshop.oss-cn-hangzhou.aliyuncs.com/ecshopx-admin
 VUE_APP_PUBLIC_PATH=/
diff --git a/package.json b/package.json
index 13fae57..c0ae8c3 100755
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
   "repository": "https://git.ishopex.cn/ecshopx/ecshopx-admin.git",
   "scripts": {
     "build": "vue-cli-service build",
+    "build:slb": "vue-cli-service build",
     "dev": "vue-cli-service --model development serve",
     "sh": "node ./cli.js",
     "lint": "prettier-eslint --write --list-different 'src/**/*.{js,vue}'"
diff --git a/src/view/goods/index.vue b/src/view/goods/index.vue
index bc2c56e..5cfa51c 100755
--- a/src/view/goods/index.vue
+++ b/src/view/goods/index.vue
@@ -138,6 +138,7 @@ export default {
         mate_description: '', // pc页面标题
         mate_keywords: '', // pc页面标题
         item_name_2: '',
+        item_name_3: '',
         item_alias_name: '', //商品别名
         pdp: ''
       },
@@ -181,6 +182,13 @@ export default {
           type: 'input',
           display: 'inline'
         },
+        {
+          label: '内部货号',
+          key: 'item_name_3',
+          type: 'input',
+          display: 'inline',
+          message: '请输入内部货号'
+        },
         {
           label: 'PDP标题',
           key: 'item_name_2',
@@ -592,6 +600,7 @@ export default {
         item_params,
         intro_list,
         item_name_2,
+        item_name_3,
         item_alias_name,
         pdp
       } = await this.$api.goods.getItemsDetail(itemId)
@@ -611,6 +620,7 @@ export default {
       this.form.isGift = is_gift
       this.form.videos = videos
       this.form.item_name_2 = item_name_2
+      this.form.item_name_3 = item_name_3
       this.form.item_alias_name = item_alias_name
       this.form.isShowSpecimg = is_show_specimg
       this.form.pdp = pdp
@@ -705,7 +715,7 @@ export default {
         pageSize: 99
       })
       if (list.length > 0) {
-        this.formList[8].options = list.map((item) => {
+        this.formList[9].options = list.map((item) => {
           return {
             value: item.template_id,
             title: item.name
@@ -723,7 +733,7 @@ export default {
         attribute_type: 'brand'
         // attribute_name: searchVal
       })
-      this.formList[9].options = list.map(({ attribute_id, attribute_name }) => {
+      this.formList[10].options = list.map(({ attribute_id, attribute_name }) => {
         return {
           value: attribute_id,
           title: attribute_name
@@ -843,6 +853,7 @@ export default {
         paramsData,
         intro_list,
         item_name_2,
+        item_name_3,
         item_alias_name,
         pdp
       } = this.form
@@ -891,6 +902,7 @@ export default {
         intro: mode == 'component' ? JSON.stringify(content) : intro,
         intro_list: JSON.parse(JSON.stringify(intro_list)),
         item_name_2,
+        item_name_3,
         item_alias_name,
         pdp
       }
diff --git a/src/view/mall/goods/physical/list.vue b/src/view/mall/goods/physical/list.vue
index 4d7f905..23e3d2b 100755
--- a/src/view/mall/goods/physical/list.vue
+++ b/src/view/mall/goods/physical/list.vue
@@ -244,6 +244,7 @@
           >
             <el-table-column type="selection" align="center" label="全选" />
             <el-table-column prop="goods_id" label="商品ID" />
+            <el-table-column prop="item_name_3" label="内部货号" />
             <el-table-column prop="itemName" label="商品" width="300">
               <template slot-scope="scope">
                 <div class="goods-title">
@@ -328,7 +329,7 @@
                 </el-button>
                 <el-popover v-if="appID" placement="top" width="200" trigger="click">
                   <div>
-                    <img class="page-code" :src="appCodeUrl">
+                    <img class="page-code" :src="appCodeUrl" />
                     <div class="page-btns">
                       <el-button
                         type="primary"
@@ -383,7 +384,7 @@
                       class="copy-btn"
                       type="text"
                     >
-                      <input v-model="scope.row.link" class="copy-link" type="text">复制链接
+                      <input v-model="scope.row.link" class="copy-link" type="text" />复制链接
                     </el-button>
                     <el-button
                       v-if="scope.row.approve_status == 'onsale'"
diff --git a/src/view/mall/trade/normalorders/list.vue b/src/view/mall/trade/normalorders/list.vue
index 38c2434..8bf6068 100755
--- a/src/view/mall/trade/normalorders/list.vue
+++ b/src/view/mall/trade/normalorders/list.vue
@@ -210,6 +210,7 @@
             <p v-for="item in row.items">{{ item.item_bn }}</p>
           </template>
         </el-table-column>
+        <el-table-column prop="item_name_3" width="100" label="内部货号"> </el-table-column>
         <el-table-column prop="total_fee" width="120" label="订单金额（¥）">
           <template slot-scope="scope">
             {{ (scope.row.total_fee / 100).toFixed(2) }}
diff --git a/src/view/member/cardticket/edit.vue b/src/view/member/cardticket/edit.vue
index c89165e..0b08f7c 100755
--- a/src/view/member/cardticket/edit.vue
+++ b/src/view/member/cardticket/edit.vue
@@ -225,7 +225,13 @@
         </el-card>
         <el-card shadow="never" header="适用规则">
           <el-form-item label="前台直接领取">
-            <el-switch v-model="form.receive" active-color="#13ce66" inactive-color="#d2d4db" />
+            <el-switch
+              v-model="form.receive"
+              :active-value="true"
+              :inactiveValue="false"
+              active-color="#13ce66"
+              inactive-color="#d2d4db"
+            />
           </el-form-item>
           <el-form-item label="是否积分兑换">
             <el-switch
@@ -235,7 +241,10 @@
               active-color="#13ce66"
               inactive-color="#d2d4db"
             />
-            <div v-if="form.is_point_receive == 1" style="display: inline-flex; align-items: center; margin-left: 20px">
+            <div
+              v-if="form.is_point_receive == 1"
+              style="display: inline-flex; align-items: center; margin-left: 20px"
+            >
               <span>积分:</span>
               <el-input
                 v-model="form.point"
diff --git a/src/view/member/selfservice/registrationrecord.vue b/src/view/member/selfservice/registrationrecord.vue
index edd9817..5c58286 100755
--- a/src/view/member/selfservice/registrationrecord.vue
+++ b/src/view/member/selfservice/registrationrecord.vue
@@ -7,9 +7,9 @@
 <template>
   <div>
     <template v-if="$route.path.indexOf('detail') === -1 && $route.path.indexOf('editor') === -1">
-      <div class="action-container">
+      <!-- <div class="action-container">
         <el-button type="primary" @click="editorLog()"> 上传日志 </el-button>
-      </div>
+      </div> -->
 
       <SpFilterForm :model="params" @onSearch="onSearch" @onReset="onReset">
         <SpFilterFormItem prop="activity_id" label="活动:">
@@ -36,10 +36,10 @@
       </SpFilterForm>
 
       <div class="action-container">
-        <el-button plain type="primary" @click="uploadHandleTemplate()"> 下载模版 </el-button>
+        <!-- <el-button plain type="primary" @click="uploadHandleTemplate()"> 下载模版 </el-button> -->
 
         <export-tip @exportHandle="exportData">
-          <el-button type="primary" plain> 导出 </el-button>
+          <el-button type="primary" plain> 导出Excel </el-button>
         </export-tip>
 
         <el-upload
@@ -49,7 +49,7 @@
           :auto-upload="false"
           :show-file-list="false"
         >
-          <el-button type="primary" plain> 点击上传 </el-button>
+          <el-button type="primary" plain> 点击上传CRM邀约名单 </el-button>
         </el-upload>
       </div>
 
@@ -88,6 +88,12 @@
                 </el-tag>
               </template>
             </el-table-column>
+            <el-table-column prop="status" width="120" label="是否CRM邀约">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.is_crm != 1" type="warning" size="mini"> 否 </el-tag>
+                <el-tag v-if="scope.row.is_crm == 1" type="success" size="mini"> 是 </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column prop="is_write_off_date_format" label="签到时间" />
             <el-table-column prop="status" label="操作">
               <template slot-scope="scope">
@@ -251,13 +257,22 @@ export default {
       })
     },
     uploadHandleChange(file, fileList) {
-      let params = { isUploadFile: true, file_type: 'selform_registration_record', file: file.raw }
+      let params = {
+        isUploadFile: true,
+        file_type: 'selform_registration_crm_match',
+        should_queue: 0,
+        file: file.raw
+      }
       handleUploadFile(params).then((response) => {
         this.$message({
           type: 'success',
-          message: '上传成功，等待处理'
+          message: '上传成功，等待处理,请稍后手动刷新列表查看。',
+          duration: 3000
         })
-        this.$router.push({ path: this.matchHidePage('editor') })
+        setTimeout(() => {
+          this.fetchList()
+        }, 1500)
+        // this.$router.push({ path: this.matchHidePage('editor') })
       })
     },
     editorLog() {