From 5775109c822f6b44d0600f01645407161415845c Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 5 Feb 2021 10:57:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                     |  4 ++--
 src/views/modules/worklog/worklog.vue | 30 +++++++++++++++++++++++++++
 src/views/pages/login.vue             | 10 +++++++++
 vue.config.js                         |  1 +
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 src/views/modules/worklog/worklog.vue

diff --git a/public/index.html b/public/index.html
index 0b4ca59..f16d66a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -36,8 +36,8 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
   <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
-    // window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
+    // window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
   </script>
   <% } %>
   <!-- 集成测试环境 -->
diff --git a/src/views/modules/worklog/worklog.vue b/src/views/modules/worklog/worklog.vue
new file mode 100644
index 0000000..3710175
--- /dev/null
+++ b/src/views/modules/worklog/worklog.vue
@@ -0,0 +1,30 @@
+<template>
+  <el-card class="worklog">
+      <iframe :src="url" class="iframe"/>
+  </el-card>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+export default {
+  data() {
+    return {
+      url: ''
+    }
+  },
+  created () {
+    const _token = Cookies.get('token') || localStorage.getItem('token')
+    const _customerId = Cookies.get('customerId') || localStorage.getItem('customerId')
+    this.url = `https://epdc-jinan-test.elinkservice.cn/plugin-wrf/#/NoteTaking?token=${_token}&customerId=${_customerId}`
+  }
+}
+</script>
+<style lang="scss" scoped>
+.worklog {
+  min-height: calc(calc(100vh - 50px - 38px - 30px) - 2px);
+}
+.iframe {
+  width: 100%;
+  min-height: calc(calc(100vh - 50px - 38px - 30px) - 2px);
+}
+</style>
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 8e838c0..9eb355c 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -151,6 +151,16 @@ export default {
           // 登陆之后从localStorage获取党委为空则从网络上拉取
           this.checkLocakStorage()
         }).catch(() => { })
+        this.$http.get(`/api/plugins/workLog/getCustomId`)
+        .then(res => {
+          if (res.data.code !== 0) {
+            return this.$message.error(res.data.msg)
+          }
+          Cookies.set('customerId',res.data.data)
+        })
+        .catch((err) => {
+          console.log(err)
+        })
       })
     }, 1000, { 'leading': true, 'trailing': false }),
     checkLocakStorage () {
diff --git a/vue.config.js b/vue.config.js
index e24674f..d3a31f9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,6 +9,7 @@ module.exports = {
   devServer: {
     open: true,
     port: 8001,
+    public: '192.168.51.32',
     overlay: {
       errors: false,
       warnings: false

From 36470560cbad2a898a90133a5f30be01ab46de8a Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 5 Feb 2021 11:15:31 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                     | 2 ++
 src/views/modules/worklog/worklog.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index f16d66a..559c79a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -31,6 +31,8 @@
     window.SITE_CONFIG['dynamicRoutes'] = [] // 动态路由列表
     window.SITE_CONFIG['dynamicMenuRoutes'] = [] // 动态(菜单)路由列表
     window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false // 动态(菜单)路由是否已经添加的状态标示（用于判断是否需要重新拉取数据并进行动态添加操作）
+
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
 
   <!-- 开发环境 -->
diff --git a/src/views/modules/worklog/worklog.vue b/src/views/modules/worklog/worklog.vue
index 3710175..4b17d8e 100644
--- a/src/views/modules/worklog/worklog.vue
+++ b/src/views/modules/worklog/worklog.vue
@@ -15,7 +15,7 @@ export default {
   created () {
     const _token = Cookies.get('token') || localStorage.getItem('token')
     const _customerId = Cookies.get('customerId') || localStorage.getItem('customerId')
-    this.url = `https://epdc-jinan-test.elinkservice.cn/plugin-wrf/#/NoteTaking?token=${_token}&customerId=${_customerId}`
+    this.url = `${window.SITE_CONFIG['workLogURL']}/#/NoteTaking?token=${_token}&customerId=${_customerId}`
   }
 }
 </script>

From a4de77d478828c1109ca73adea6ab041b8d308ed Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 5 Feb 2021 11:18:30 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index 559c79a..655426c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -31,8 +31,6 @@
     window.SITE_CONFIG['dynamicRoutes'] = [] // 动态路由列表
     window.SITE_CONFIG['dynamicMenuRoutes'] = [] // 动态(菜单)路由列表
     window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false // 动态(菜单)路由是否已经添加的状态标示（用于判断是否需要重新拉取数据并进行动态添加操作）
-
-    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
 
   <!-- 开发环境 -->
@@ -40,24 +38,28 @@
   <script>
     // window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
     window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 集成测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 验收测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinan-test.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
   <!-- 生产环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'https://epdc-jinshui.elinkservice.cn/epdc-api'
+    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinshui.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
 </head>

From 2243f52f2faa5abf395910e6670ece5abd1ebd06 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 22 Feb 2021 15:37:28 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=96=B0=E5=A2=9E=E5=8F=96=E8=B4=A7=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/groupbuy-detail.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/custom/groupbuy-detail.vue b/src/views/modules/custom/groupbuy-detail.vue
index d258990..b692f7e 100644
--- a/src/views/modules/custom/groupbuy-detail.vue
+++ b/src/views/modules/custom/groupbuy-detail.vue
@@ -31,6 +31,10 @@
       <el-form-item label="截至时间" prop="groupBuyEndTime">
         <div>{{ dataForm.groupBuyEndTime }}</div>
       </el-form-item>
+      <el-form-item label="取货方式" prop="pickupMethod">
+        <div v-if="dataForm.pickupMethod === 1">包邮</div>
+        <div v-if="dataForm.pickupMethod === 2">自提</div>
+      </el-form-item>
       <el-form-item label="报名人员">
         <el-link type="primary" @click="innerVisible = true">查看</el-link>
       </el-form-item>
@@ -122,7 +126,8 @@ export default {
         shieldReason: '',
         prices: [],
         images: [],
-        groupBuyEndTime: ''
+        groupBuyEndTime: '',
+        pickupMethod: ''
       },
       previewImgList: [],
       signUpList: [],

From 7a58def085ff1604e382ad80d18c80165fd23388 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 25 Feb 2021 16:08:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=9C=B0=E5=9D=80=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 655426c..64c941f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -59,7 +59,7 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'https://epdc-jinshui.elinkservice.cn/epdc-api'
-    window.SITE_CONFIG['workLogURL'] = 'https://epdc-jinshui.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
+    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext9.elinkservice.cn/plugin-wrf/' //工作日志引用外链地址
   </script>
   <% } %>
 </head>

From c32bfb3885aa20e11bf866617cce4d680b1fd238 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 25 Feb 2021 17:18:44 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 64c941f..4e0c380 100644
--- a/public/index.html
+++ b/public/index.html
@@ -59,7 +59,7 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
   <script>
     window.SITE_CONFIG['apiURL'] = 'https://epdc-jinshui.elinkservice.cn/epdc-api'
-    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext9.elinkservice.cn/plugin-wrf/' //工作日志引用外链地址
+    window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext9.elinkservice.cn/plugin-wrf' //工作日志引用外链地址
   </script>
   <% } %>
 </head>