Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521

src/pages/activity/ActivityCode.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="activity_code">
-    <Table :loading="loading" border :columns="columns" :data="data"></Table>
+    <Table :loading="loading" border :columns="columns" :data="data">
+      <template slot-scope="{row}" slot="qrCodeAction">
+        <img :src="require('../../../static/img/qrCode-init.png')" @click="show(row)"
+              class="table-img-qr-code"/>
+      </template>
+      <router-link slot-scope="{row}" slot="action"
+        :to="{path:'/shop/increase/manager/staff',query:{storeId:row.id}}">
+        <Button ghost class="router-btn"> 门店导购管理</Button>
+      </router-link>
+    </Table>
     <Page
       :total="totalSize"
       :current="pageNum"
@@ -70,56 +79,58 @@ export default {
         },
         {
           title: "推广码",
-          key: "qrCode",
-          render(h, params) {
-            return h(
-              "div",
-              {
-                class: "qrcode",
-              },
-              [
-                h(
-                  "Button",
-                  {
-                    props: { type: "primary", size: "small" },
-                    style: { marginRight: "8px" },
-                    on: {
-                      "mouseover.native": () => _this.showQrcode(params.row),
-                    },
-                  },
-                  "二维码"
-                ),
-                h(
-                  "div",
-                  {
-                    class: "qrcodeBox",
-                    style: { display: "none" },
-                  },
-                  [h("img", { attrs: { src: params.row.qrCode } })]
-                ),
-              ]
-            );
-          },
+          slot: 'qrCodeAction',
+          className: 'table-width-80',
+          // render(h, params) {
+          //   return h(
+          //     "div",
+          //     {
+          //       class: "qrcode",
+          //     },
+          //     [
+          //       h(
+          //         "Button",
+          //         {
+          //           props: { type: "primary", size: "small" },
+          //           style: { marginRight: "8px" },
+          //           on: {
+          //             "mouseover.native": () => _this.showQrcode(params.row),
+          //           },
+          //         },
+          //         "二维码"
+          //       ),
+          //       h(
+          //         "div",
+          //         {
+          //           class: "qrcodeBox",
+          //           style: { display: "none" },
+          //         },
+          //         [h("img", { attrs: { src: params.row.qrCode } })]
+          //       ),
+          //     ]
+          //   );
+          // },
         },
         {
-          title: "操作",
-          key: "action",
-          width: 200,
-          render(h, p) {
-            return h("div", [
-              h(
-                "Button",
-                {
-                  props: { type: "primary", size: "small" },
-                  style: { marginRight: "8px" },
-                  on: {
-                    click: () => _this.guideCode(p.row),
-                  },
-                },
-                "查看导购码"
-              ),
-            ]);
-          },
+          title: '操作',
+          slot: 'action',
+          // key: "action",
+          // width: 200,
+          // render(h, p) {
+          //   return h("div", [
+          //     h(
+          //       "Button",
+          //       {
+          //         props: { type: "primary", size: "small" },
+          //         style: { marginRight: "8px" },
+          //         on: {
+          //           click: () => _this.guideCode(p.row),
+          //         },
+          //       },
+          //       "查看导购码"
+          //     ),
+          //   ]);
+          // },
         },
       ],
     };
@@ -152,4 +163,8 @@ export default {
 };
 </script>
 
-<style></style>
+<style>
+  .table-width-80 {
+        width: 80px !important;
+    }
+</style>

src/pages/recruit/BulletinIndex.vue

@@ -1,10 +1,44 @@
 <template>
-  <div>asd</div>
+  <div class="div-page">
+    <template>
+      <Row class="search-row">
+        <i-col span="8">
+            <p class="" style="font-size: 16px;line-height: 22px;margin-top: 10px;margin-left: 20px;margin-right: 20px;">招募令</p>
+            <p class="" style="font-size: 13px;line-height: 32px;margin-left: 20px;margin-right: 20px;">便于门店进行推广员招募</p>
+        </i-col>
+        <i-col span="8">
+            <span class="">使用范围：26家零售公司，785家店铺</span>
+            <span class="" style="border: 0px; color: rgb(52, 150, 235); margin-left: 15px; cursor: pointer;">修改</span>
+        </i-col>
+        <i-col span="8">
+            <i-switch size="large">
+                <span slot="open">开启</span>
+                <span slot="close">关闭</span>
+            </i-switch>
+        </i-col>
+      </Row>
+    </template>
+  </div>
 </template>
 
 <script>
-export default {};
+
+export default {
+  data() {
+    return {
+     
+    };
+  },
+  mounted: function() {
+    
+  },
+  methods: {
+    change (status) {
+        this.$Message.info('开关状态：' + status);
+    }
+  },
+};
 </script>
 
-<style>
-</style>
+<style scoped>
+</style>

src/pages/recruit/CheckList.vue

@@ -1,10 +1,44 @@
 <template>
-  <div>asd</div>
+    <div>
+        <Tabs active-key="key1">
+            <Tab-pane label="标签一" key="key1">
+                标签yi的内容
+            </Tab-pane>
+            <Tab-pane label="标签二" key="key2">标签二的内容</Tab-pane>
+            <Tab-pane label="标签三" key="key3">标签三的内容</Tab-pane>
+        </Tabs>
+        
+    </div>
 </template>
 
+<script>
+
+    export default {
+        name: "",
+        data() {
+            return {
+
+            }
+        },
+        mounted: function () {
+            
+        },
+        methods: {
+            
+        }
+    }
+</script>
+
+<style scoped>
+
+
+    .search-btn{
+        margin-left: 40px;
+    }
+</style>
 <script>
 export default {};
 </script>
 
 <style>
-</style>
+</style>