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: [],
diff --git a/src/views/modules/worklog/worklog.vue b/src/views/modules/worklog/worklog.vue
new file mode 100644
index 0000000..4b17d8e
--- /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 = `${window.SITE_CONFIG['workLogURL']}/#/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