前端

unimall-admin/src/api/card/circleManagementInfo.js

@@ -71,3 +71,16 @@ export function exportCircleManagementInfo(query) {
     }
   })
 }
+
+// 审核
+
+export function circleManagementInfoHandle(data) {
+  return request({
+    method: 'post',
+    params: {
+      _gp: 'admin.unimall.circleManagementInfo',
+      _mt: 'handle',
+      circleManagementInfo: data
+    }
+  })
+}

unimall-admin/src/router/route.json

@@ -95,6 +95,145 @@
 
         ]
     },
+    {
+        "redirect": "noredirect",
+        "name": "circleManagementInfo",
+        "path": "/circleManagementInfo",
+        "meta": {
+            "icon": "log",
+            "title": "圈子管理"
+        },
+        "alwaysShow": true,
+        "children": [
+            {
+            "path": "list",
+            "name": "circleManagementInfo",
+            "page": "/circleManagementInfo",
+            "meta": {
+                "title": "圈子",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        }
+    ]
+    },
+    {
+        "redirect": "noredirect",
+        "name": "cardManagementInfo",
+        "path": "/cardManagementInfo",
+        "meta": {
+            "icon": "log",
+            "title": "名片管理"
+        },
+        "alwaysShow": true,
+        "children": [
+            {
+            "path": "list",
+            "name": "cardManagementInfo",
+            "page": "/cardManagementInfo",
+            "meta": {
+                "title": "名片",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        },
+        {
+            "path": "cardClassifyInfo",
+            "name": "cardClassifyInfo",
+            "page": "/cardClassifyInfo",
+            "meta": {
+                "title": "名片分类",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        },
+        {
+            "path": "cardHolderInfo",
+            "name": "cardHolderInfo",
+            "page": "/cardHolderInfo",
+            "meta": {
+                "title": "名片夹",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        }
+    ]
+    },
+    {
+        "redirect": "noredirect",
+        "name": "certificateManagementInfo",
+        "path": "/certificateManagementInfo",
+        "meta": {
+            "icon": "log",
+            "title": "证件管理"
+        },
+        "alwaysShow": true,
+        "children": [
+            {
+            "path": "list",
+            "name": "certificateManagementInfo",
+            "page": "/certificateManagementInfo",
+            "meta": {
+                "title": "证件",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        }]
+    },
+    {
+        "redirect": "noredirect",
+        "name": "commonUserInfo",
+        "path": "/commonUserInfo",
+        "meta": {
+            "icon": "log",
+            "title": "用户管理"
+        },
+        "alwaysShow": true,
+        "children": [
+            {
+            "path": "list",
+            "name": "logininfor",
+            "page": "/commonUserInfo",
+            "meta": {
+                "title": "用户",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        },
+        {
+            "path": "personalHomepageInfo",
+            "name": "personalHomepageInfo",
+            "page": "/personalHomepageInfo",
+            "meta": {
+                "title": "个人主页",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        }
+    ]
+    },
+    {
+        "redirect": "noredirect",
+        "name": "info",
+        "path": "/info",
+        "meta": {
+            "icon": "log",
+            "title": "消息管理"
+        },
+        "alwaysShow": true,
+        "children": [
+            {
+            "path": "list",
+            "name": "logininfor",
+            "page": "/info",
+            "meta": {
+                "title": "消息",
+                "icon": "logininfor",
+                "noCache": true
+            }
+        }
+    ]
+    },
     {
         "redirect": "noredirect",
         "name": "sysLog",

unimall-admin/src/views/cardClassifyInfo/index.vue

@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="置顶标识" prop="topMarking">
+      <!-- <el-form-item label="置顶标识" prop="topMarking">
         <el-input
           v-model="queryParams.topMarking"
           placeholder="请输入置顶标识"
@@ -52,7 +52,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -89,7 +89,7 @@
           v-permission="['unimall:cardClassifyInfo:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -97,16 +97,16 @@
           @click="handleExport"
           v-permission="['unimall:cardClassifyInfo:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="cardClassifyInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
       <el-table-column label="个人id" align="center" prop="commonId" />
       <el-table-column label="分类名称" align="center" prop="circleName" />
       <el-table-column label="置顶标识" align="center" prop="topMarking" />
-      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+      <!-- <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
         </template>
@@ -116,7 +116,7 @@
           <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
+      <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -140,8 +140,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -157,7 +157,7 @@
         <el-form-item label="置顶标识" prop="topMarking">
           <el-input v-model="form.topMarking" placeholder="请输入置顶标识" />
         </el-form-item>
-        <el-form-item label="" prop="gmtCreate">
+        <!-- <el-form-item label="" prop="gmtCreate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.gmtCreate"
             type="date"
@@ -175,7 +175,7 @@
         </el-form-item>
         <el-form-item label="删除标识" prop="deleteFlag">
           <el-input v-model="form.deleteFlag" placeholder="请输入删除标识" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -209,8 +209,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         commonId: undefined,
         circleName: undefined,
         topMarking: undefined,
@@ -266,7 +266,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */

unimall-admin/src/views/cardHolderInfo/index.vue

@@ -10,7 +10,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="名片id" prop="cardId">
+      <el-form-item label="手机号" prop="commonId">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="名片id" prop="cardId">
         <el-input
           v-model="queryParams.cardId"
           placeholder="请输入名片id"
@@ -52,14 +61,14 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -98,16 +107,27 @@
           v-permission="['unimall:cardHolderInfo:export']"
         >导出</el-button>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="cardHolderInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="个人id" align="center" prop="commonId" />
-      <el-table-column label="名片id" align="center" prop="cardId" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      <!-- <el-table-column label="个人id" align="center" prop="commonId" /> -->
+      <!-- <el-table-column label="名片id" align="center" prop="cardId" /> -->
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="公司" align="center" prop="companyName" />
+      <el-table-column label="职位" align="center" prop="post" />
+      <el-table-column label="地址" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.province }}{{ scope.row.city }}{{ scope.row.area }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="详细地址" align="center" prop="detailedAddress" />
+      <el-table-column label="经纬度" align="center" prop="location" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="客户分类" align="center" prop="classify" />
-      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+      <!-- <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
         </template>
@@ -117,8 +137,8 @@
           <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -135,7 +155,7 @@
             v-permission="['unimall:cardHolderInfo:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     
     <pagination

unimall-admin/src/views/cardManagementInfo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="个人id" prop="commonId">
+      <!-- <el-form-item label="个人id" prop="commonId">
         <el-input
           v-model="queryParams.commonId"
           placeholder="请输入个人id"
@@ -9,8 +9,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="名片标识" prop="cardBusiness">
+      </el-form-item> -->
+      <!-- <el-form-item label="名片标识" prop="cardBusiness">
         <el-input
           v-model="queryParams.cardBusiness"
           placeholder="请输入名片标识"
@@ -18,7 +18,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -28,7 +28,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="职务" prop="post">
+      <!-- <el-form-item label="职务" prop="post">
         <el-input
           v-model="queryParams.post"
           placeholder="请输入职务"
@@ -115,7 +115,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -123,7 +123,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -131,7 +131,7 @@
           @click="handleAdd"
           v-permission="['unimall:cardManagementInfo:add']"
         >新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -152,7 +152,7 @@
           v-permission="['unimall:cardManagementInfo:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -160,13 +160,13 @@
           @click="handleExport"
           v-permission="['unimall:cardManagementInfo:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="cardManagementInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="个人id" align="center" prop="commonId" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      <!-- <el-table-column label="个人id" align="center" prop="commonId" /> -->
       <el-table-column label="名片标识" align="center" prop="cardBusiness" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="职务" align="center" prop="post" />
@@ -174,9 +174,17 @@
       <el-table-column label="定位" align="center" prop="location" />
       <el-table-column label="详细地址" align="center" prop="detailedAddress" />
       <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="头像" align="center" prop="headSculpture" />
-      <el-table-column label="二维码" align="center" prop="qrCode" />
-      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+      <el-table-column label="头像" align="center" prop="headSculpture">
+        <template slot-scope="scope">
+          <img :src="scope.row.headSculpture" width="40">
+        </template>
+      </el-table-column>
+      <el-table-column label="二维码" align="center" prop="qrCode">
+        <template slot-scope="scope">
+          <img :src="scope.row.qrCode" width="40">
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
         </template>
@@ -186,7 +194,7 @@
           <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
+      <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -210,17 +218,17 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
     <!-- 添加或修改名片管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="个人id" prop="commonId">
+        <!-- <el-form-item label="个人id" prop="commonId">
           <el-input v-model="form.commonId" placeholder="请输入个人id" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="名片标识" prop="cardBusiness">
           <el-input v-model="form.cardBusiness" placeholder="请输入名片标识" />
         </el-form-item>
@@ -242,10 +250,17 @@
         <el-form-item label="联系电话" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入联系电话" />
         </el-form-item>
-        <el-form-item label="头像" prop="headSculpture">
+        <!-- <el-form-item label="头像" prop="headSculpture">
           <el-input v-model="form.headSculpture" placeholder="请输入头像" />
+        </el-form-item> -->
+        <el-form-item label="圈子头像" prop="picUrl">
+          <el-upload :action="uploadPath" :headers="headers" :limit="5" :file-list="imgsFileList"
+            :on-exceed="uploadOverrun" :on-success="handleimgsUrl" :on-remove="handleRemove" multiple
+            accept=".jpg, .jpeg, .png, .gif" list-type="picture-card">
+            <i class="el-icon-plus" />
+          </el-upload>
         </el-form-item>
-        <el-form-item label="二维码" prop="qrCode">
+        <!-- <el-form-item label="二维码" prop="qrCode">
           <el-input v-model="form.qrCode" placeholder="请输入二维码" />
         </el-form-item>
         <el-form-item label="" prop="gmtCreate">
@@ -266,7 +281,7 @@
         </el-form-item>
         <el-form-item label="删除标识" prop="deleteFlag">
           <el-input v-model="form.deleteFlag" placeholder="请输入删除标识" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -278,10 +293,13 @@
 
 <script>
 import { listCardManagementInfo, getCardManagementInfo, delCardManagementInfo, addCardManagementInfo, updateCardManagementInfo, exportCardManagementInfo } from "@/api/card/cardManagementInfo";
-
+import { uploadPath } from '@/api/storage'
+import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
+      imgsFileList: [],
+      uploadPath,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -300,8 +318,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         commonId: undefined,
         cardBusiness: undefined,
         name: undefined,
@@ -329,10 +347,36 @@ export default {
         ]      }
     };
   },
+  computed: {
+    headers() {
+      return {
+        accessToken: getToken()
+      }
+    }
+  },
   created() {
     this.getList();
   },
   methods: {
+    handleimgsUrl(response, file, fileList) {
+      if (response.errno === 200) {
+        this.form.headSculpture = response.url
+      }
+    },
+    uploadOverrun: function () {
+      this.$message({
+        type: 'error',
+        message: '上传文件个数超出限制!最多上传5张图片!'
+      })
+    },
+    handleimgsUrl(response, file, fileList) {
+      if (response.errno === 200) {
+        this.form.headSculpture = response.url
+      }
+    },
+    handleRemove: function (file, fileList) {
+      this.form.headSculpture=""
+    },
     /** 查询名片管理列表 */
     getList() {
       this.loading = true;
@@ -363,13 +407,13 @@ export default {
         qrCode: undefined,
         gmtCreate: undefined,
         gmtUpdate: undefined,
-        deleteFlag: undefined
+        deleteFlag: undefined,
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -392,6 +436,10 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.imgsFileList = []
+      this.imgsFileList.push({
+            url:row.headSculpture
+          })
       const id = row.id || this.ids.join(',')
       getCardManagementInfo(id).then(response => {
         this.form = response.data.data

unimall-admin/src/views/certificateManagementInfo/index.vue

@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="证件名称" prop="certificateName">
+      <!-- <el-form-item label="证件名称" prop="certificateName">
         <el-input
           v-model="queryParams.certificateName"
           placeholder="请输入证件名称"
@@ -52,14 +52,14 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -98,15 +98,19 @@
           v-permission="['unimall:certificateManagementInfo:export']"
         >导出</el-button>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="certificateManagementInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
       <el-table-column label="个人id" align="center" prop="commonId" />
       <el-table-column label="证件名称" align="center" prop="certificateName" />
-      <el-table-column label="证件图" align="center" prop="certificateImage" />
-      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+      <el-table-column label="证件图" align="center" prop="gmtCreate" width="180">
+        <template slot-scope="scope">
+          <img :src="scope.row.certificateImage" width="40">
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
         </template>
@@ -116,8 +120,8 @@
           <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -134,14 +138,14 @@
             v-permission="['unimall:certificateManagementInfo:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -209,8 +213,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         commonId: undefined,
         certificateName: undefined,
         certificateImage: undefined,
@@ -264,7 +268,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */

unimall-admin/src/views/circleManagementInfo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="个人id" prop="commonId">
+      <!-- <el-form-item label="个人id" prop="commonId">
         <el-input
           v-model="queryParams.commonId"
           placeholder="请输入个人id"
@@ -9,38 +9,32 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="圈子名称" prop="circleName">
-        <el-input
-          v-model="queryParams.circleName"
-          placeholder="请输入圈子名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.circleName" placeholder="请输入圈子名称" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-        <el-form-item label="0未审核 1已通过" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择0未审核 1已通过" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
+      <el-form-item label="状态" prop="status">
+        <el-input v-model="queryParams.status" placeholder="请输入0未审核 1已通过" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="" prop="gmtCreate">
+      <!-- <el-form-item label="" prop="gmtCreate">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.gmtCreate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="gmtUpdate">
+      </el-form-item> -->
+      <!-- <el-form-item label="" prop="gmtUpdate">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.gmtUpdate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="删除标识" prop="deleteFlag">
+      </el-form-item> -->
+      <!-- <el-form-item label="删除标识" prop="deleteFlag">
         <el-input
           v-model="queryParams.deleteFlag"
           placeholder="请输入删除标识"
@@ -48,7 +42,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -57,117 +51,99 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-permission="['unimall:circleManagementInfo:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-permission="['unimall:circleManagementInfo:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-permission="['unimall:circleManagementInfo:edit']"
-        >修改</el-button>
+        <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-permission="['unimall:circleManagementInfo:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-permission="['unimall:circleManagementInfo:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-permission="['unimall:circleManagementInfo:export']"
-        >导出</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-permission="['unimall:circleManagementInfo:remove']">删除</el-button>
       </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
+          v-permission="['unimall:circleManagementInfo:export']">导出</el-button>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="circleManagementInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="个人id" align="center" prop="commonId" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      <!-- <el-table-column label="个人id" align="center" prop="commonId" /> -->
       <el-table-column label="圈子名称" align="center" prop="circleName" />
       <el-table-column label="圈子标签" align="center" prop="circleLabel" />
-      <el-table-column label="0未审核 1已通过" align="center" prop="status" />
-      <el-table-column label="" align="center" prop="gmtCreate" width="180">
+      <el-table-column label="头像" align="center" prop="circleHead">
+        <template slot-scope="scope">
+          <img :src="scope.row.circleHead" width="40">
+        </template>
+      </el-table-column>
+
+      <el-table-column label="状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span>{{ scope.row.status == 0 ? '未审核' : '已通过' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="" align="center" prop="gmtUpdate" width="180">
+      <!-- <el-table-column label="" align="center" prop="gmtUpdate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
         </template>
-      </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
+      </el-table-column> -->
+      <!-- <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-permission="['unimall:circleManagementInfo:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-permission="['unimall:circleManagementInfo:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" @click="handle(scope.row)"
+            v-permission="['unimall:circleManagementInfo:edit']" v-if="scope.row.status == '0'">通过</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-permission="['unimall:circleManagementInfo:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-permission="['unimall:circleManagementInfo:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.limit"
+      @pagination="getList" />
 
     <!-- 添加或修改圈子管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="个人id" prop="commonId">
+        <!-- <el-form-item label="个人id" prop="commonId">
           <el-input v-model="form.commonId" placeholder="请输入个人id" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="圈子名称" prop="circleName">
           <el-input v-model="form.circleName" placeholder="请输入圈子名称" />
         </el-form-item>
         <el-form-item label="圈子标签" prop="circleLabel">
           <el-input v-model="form.circleLabel" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="0未审核 1已通过">
+        <el-form-item label="圈子头像" prop="picUrl">
+          <el-upload :action="uploadPath" :headers="headers" :limit="5" :file-list="imgsFileList"
+            :on-exceed="uploadOverrun" :on-success="handleimgsUrl" :on-remove="handleRemove" multiple
+            accept=".jpg, .jpeg, .png, .gif" list-type="picture-card">
+            <i class="el-icon-plus" />
+          </el-upload>
+        </el-form-item>
+        <!-- <el-form-item label="0未审核 1已通过">
           <el-radio-group v-model="form.status">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
-        </el-form-item>
-        <el-form-item label="" prop="gmtCreate">
+        </el-form-item> -->
+        <!-- <el-form-item label="" prop="gmtCreate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.gmtCreate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择">
           </el-date-picker>
-        </el-form-item>
-        <el-form-item label="" prop="gmtUpdate">
+        </el-form-item> -->
+        <!-- <el-form-item label="" prop="gmtUpdate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.gmtUpdate"
             type="date"
@@ -177,7 +153,7 @@
         </el-form-item>
         <el-form-item label="删除标识" prop="deleteFlag">
           <el-input v-model="form.deleteFlag" placeholder="请输入删除标识" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -188,11 +164,14 @@
 </template>
 
 <script>
-import { listCircleManagementInfo, getCircleManagementInfo, delCircleManagementInfo, addCircleManagementInfo, updateCircleManagementInfo, exportCircleManagementInfo } from "@/api/card/circleManagementInfo";
-
+import { circleManagementInfoHandle, listCircleManagementInfo, getCircleManagementInfo, delCircleManagementInfo, addCircleManagementInfo, updateCircleManagementInfo, exportCircleManagementInfo } from "@/api/card/circleManagementInfo";
+import { uploadPath } from '@/api/storage'
+import { getToken } from '@/utils/auth'
 export default {
   data() {
     return {
+      imgsFileList: [],
+      uploadPath,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -211,8 +190,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         commonId: undefined,
         circleName: undefined,
         circleLabel: undefined,
@@ -227,19 +206,46 @@ export default {
       rules: {
         status: [
           { required: true, message: "0未审核 1已通过不能为空", trigger: "blur" }
-        ],        gmtCreate: [
+        ], gmtCreate: [
           { required: true, message: "不能为空", trigger: "blur" }
-        ],        gmtUpdate: [
+        ], gmtUpdate: [
           { required: true, message: "不能为空", trigger: "blur" }
-        ],        deleteFlag: [
+        ], deleteFlag: [
           { required: true, message: "删除标识不能为空", trigger: "blur" }
-        ]      }
+        ]
+      }
     };
   },
+  computed: {
+    headers() {
+      return {
+        accessToken: getToken()
+      }
+    }
+  },
   created() {
     this.getList();
   },
   methods: {
+    handleimgsUrl(response, file, fileList) {
+      if (response.errno === 200) {
+        this.form.circleHead = response.url
+      }
+    },
+    uploadOverrun: function () {
+      this.$message({
+        type: 'error',
+        message: '上传文件个数超出限制!最多上传5张图片!'
+      })
+    },
+    handleimgsUrl(response, file, fileList) {
+      if (response.errno === 200) {
+        this.form.circleHead = response.url
+      }
+    },
+    handleRemove: function (file, fileList) {
+      this.form.circleHead=""
+    },
     /** 查询圈子管理列表 */
     getList() {
       this.loading = true;
@@ -262,6 +268,7 @@ export default {
         circleName: undefined,
         circleLabel: undefined,
         status: "0",
+        circleHead:'',
         gmtCreate: undefined,
         gmtUpdate: undefined,
         deleteFlag: undefined
@@ -270,7 +277,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.page = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -281,7 +288,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -290,10 +297,27 @@ export default {
       this.open = true;
       this.title = "添加圈子管理";
     },
+    // 审核
+    handle(row) {
+      console.log(row)
+      debugger
+      circleManagementInfoHandle(row).then(response => {
+        if (response.data) {
+          this.msgSuccess("新增成功");
+          this.getList();
+        } else {
+          this.msgError(response.msg);
+        }
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.imgsFileList = []
       const id = row.id || this.ids.join(',')
+      this.imgsFileList.push({
+            url:row.circleHead
+          })
       getCircleManagementInfo(id).then(response => {
         this.form = response.data.data
         this.open = true;
@@ -301,7 +325,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != undefined) {
@@ -332,28 +356,28 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids.join(',')
       this.$confirm('是否确认删除圈子管理编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCircleManagementInfo(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delCircleManagementInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(function () { });
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有圈子管理数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCircleManagementInfo(queryParams);
-        }).then(response => {
-          this.download(response.data.data);
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportCircleManagementInfo(queryParams);
+      }).then(response => {
+        this.download(response.data.data);
+      }).catch(function () { });
     }
   }
 };

unimall-admin/src/views/commonUserInfo/index.vue

@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="密码" prop="password">
+      <!-- <el-form-item label="密码" prop="password">
         <el-input
           v-model="queryParams.password"
           placeholder="请输入密码"
@@ -18,7 +18,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="手机号" prop="phone">
         <el-input
           v-model="queryParams.phone"
@@ -28,7 +28,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="真实姓名" prop="realname">
+      <!-- <el-form-item label="真实姓名" prop="realname">
         <el-input
           v-model="queryParams.realname"
           placeholder="请输入真实姓名"
@@ -93,7 +93,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -130,7 +130,7 @@
           v-permission="['unimall:commonUserInfo:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -138,16 +138,16 @@
           @click="handleExport"
           v-permission="['unimall:commonUserInfo:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
     </el-row>
 
     <el-table v-loading="loading" :data="commonUserInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
       <el-table-column label="昵称" align="center" prop="nickname" />
-      <el-table-column label="密码" align="center" prop="password" />
+      <!-- <el-table-column label="密码" align="center" prop="password" /> -->
       <el-table-column label="手机号" align="center" prop="phone" />
-      <el-table-column label="真实姓名" align="center" prop="realname" />
+      <!-- <el-table-column label="真实姓名" align="center" prop="realname" />
       <el-table-column label="允许他人分享名片(1允许)" align="center" prop="shareCard" />
       <el-table-column label="允许圈子成员查看主页(1允许)" align="center" prop="lookPage" />
       <el-table-column label="自动接受邀请(1是)" align="center" prop="autoAccept" />
@@ -162,7 +162,7 @@
           <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
+      <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -197,13 +197,13 @@
         <el-form-item label="昵称" prop="nickname">
           <el-input v-model="form.nickname" placeholder="请输入昵称" />
         </el-form-item>
-        <el-form-item label="密码" prop="password">
+        <!-- <el-form-item label="密码" prop="password">
           <el-input v-model="form.password" placeholder="请输入密码" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号" />
         </el-form-item>
-        <el-form-item label="真实姓名" prop="realname">
+        <!-- <el-form-item label="真实姓名" prop="realname">
           <el-input v-model="form.realname" placeholder="请输入真实姓名" />
         </el-form-item>
         <el-form-item label="允许他人分享名片(1允许)" prop="shareCard">
@@ -238,7 +238,7 @@
         </el-form-item>
         <el-form-item label="删除标识" prop="deleteFlag">
           <el-input v-model="form.deleteFlag" placeholder="请输入删除标识" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

unimall-admin/src/views/personalHomepageInfo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="个人id" prop="commonId">
+      <!-- <el-form-item label="个人id" prop="commonId">
         <el-input
           v-model="queryParams.commonId"
           placeholder="请输入个人id"
@@ -9,7 +9,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="公司名" prop="companyName">
         <el-input
           v-model="queryParams.companyName"
@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公司地址" prop="companyAddress">
+      <!-- <el-form-item label="公司地址" prop="companyAddress">
         <el-input
           v-model="queryParams.companyAddress"
           placeholder="请输入公司地址"
@@ -27,7 +27,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="联系电话" prop="phone">
         <el-input
           v-model="queryParams.phone"
@@ -37,7 +37,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="传真" prop="portraiture">
+      <!-- <el-form-item label="传真" prop="portraiture">
         <el-input
           v-model="queryParams.portraiture"
           placeholder="请输入传真"
@@ -79,14 +79,14 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -125,12 +125,12 @@
           v-permission="['unimall:personalHomepageInfo:export']"
         >导出</el-button>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="personalHomepageInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="个人id" align="center" prop="commonId" />
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      <!-- <el-table-column label="个人id" align="center" prop="commonId" /> -->
       <el-table-column label="公司名" align="center" prop="companyName" />
       <el-table-column label="公司简介" align="center" prop="companyIntroduction" />
       <el-table-column label="业务范围" align="center" prop="scopeOfBusiness" />
@@ -138,7 +138,13 @@
       <el-table-column label="联系电话" align="center" prop="phone" />
       <el-table-column label="传真" align="center" prop="portraiture" />
       <el-table-column label="邮箱" align="center" prop="postbox" />
-      <el-table-column label="企业风采" align="center" prop="addressUrl" />
+      <!-- <el-table-column label="企业风采" align="center" prop="addressUrl" /> -->
+      <el-table-column label="企业风采" align="center" prop="gmtCreate" width="180">
+        <template slot-scope="scope">
+          <img :src="item" width="40" v-for="item in scope.row.addressUrl.split(',')">
+        </template>
+      </el-table-column>
+<!-- 
       <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
@@ -149,8 +155,8 @@
           <span>{{ parseTime(scope.row.gmtUpdate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="删除标识" align="center" prop="deleteFlag" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="删除标识" align="center" prop="deleteFlag" /> -->
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -167,7 +173,7 @@
             v-permission="['unimall:personalHomepageInfo:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     
     <pagination

xiaochengxu/components/point-share/index.vue

@@ -0,0 +1,104 @@
+<template>
+	<view>
+        <!--<tui-bottom-popup :show="show" @close="close" :zIndex="99999">
+            <view class="tui-modal-box" >
+                <view :style="{width:width?width:'100%'}" style="position: absolute;top: 0;right: 0;">
+                    <view><image src="/static/images/share/point_bg.png" style="width: 100%;" mode="widthFix" /></view>
+                    <view><image src="/static/images/share/point_btn.png" style="width: 50%;" mode="widthFix" /></view>
+                </view>
+            </view>
+        </tui-bottom-popup>-->
+        <!--<view class="cu-modal" :class="{'show':show}" >
+            <view :style="{width:width?width:'100%'}" style="position: absolute;top: 0;right: 0;">
+                <view><image src="/static/images/share/point_bg.png" style="width: 100%;" mode="widthFix" /></view>
+                <view><image src="/static/images/share/point_btn.png" style="width: 50%;" mode="widthFix" /></view>
+            </view>
+        </view>-->
+
+        <view class="tui-alert-mask" :class="[show?'tui-alert-mask-show':'']"  >
+            <view :style="{width:width?width:'100%'}" style="position: absolute;top: 0;right: 0;">
+                <view>
+                    <image src="@/static/imgs/mySet/point_bg.png" style="width: 100%;" mode="widthFix" />
+                </view>
+                <view @click="close" style="text-align: center;">
+                    <image src="@/static/imgs/mySet/point_btn.png" style="width: 60%;" mode="widthFix" />
+                </view>
+            </view>
+        </view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'pointShare',
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			width: {
+				type: String,
+				default: '100%'
+			},
+		},
+		methods: {
+			close() {
+				this.$emit("close",{})
+			},
+			btnPay(){
+                this.$emit("payment",{type:this.payType})
+			},
+            payTypeChange(e){
+				this.payType = e.detail.value
+			}
+		}
+	}
+</script>
+
+<style scoped>
+    .tui-alert-mask1 {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background-color: rgba(0, 0, 0, 0.8);
+        z-index: 99996;
+        transition: all 0.3s ease-in-out;
+        opacity: 0;
+        visibility: hidden;
+    }
+    .tui-alert-mask {
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        z-index: 1110;
+        opacity: 0;
+        outline: 0;
+        text-align: center;
+        -ms-transform: scale(1.185);
+        transform: scale(1.185);
+        backface-visibility: hidden;
+        perspective: 2000upx;
+        background: rgba(0, 0, 0, 0.6);
+        transition: all 0.3s ease-in-out 0s;
+        pointer-events: none;
+    }
+    .tui-alert-mask-show {
+        opacity: 1;
+        transition-duration: 0.3s;
+        -ms-transform: scale(1);
+        transform: scale(1);
+        overflow-x: hidden;
+        overflow-y: auto;
+        pointer-events: auto;
+    }
+    .tui-alert-mask-show1 {
+        visibility: visible;
+        opacity: 1;
+    }
+</style>

xiaochengxu/js_sdk/share.js

@@ -39,9 +39,9 @@ export default {
 	// 分享到朋友圈
 	onShareTimeline() {
 		return {
-			title: '商通线上商城',
-			path: '/pages/index/index',
-			imageUrl: 'https://cdn.uviewui.com/uview/swiper/1.jpg'
+			title: '名片box',
+			path: '/pages/cardHolder/cardHolder',
+			imageUrl: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E5%90%8D%E7%89%87box.png'
 		};
 	},
 	methods: {

xiaochengxu/main.js

@@ -17,6 +17,7 @@ Vue.prototype.$request = request
 Vue.prototype.$helper = helper
 Vue.prototype.$store = store
 Vue.prototype.parseTime = parseTime
+Vue.prototype.$WXBizDataCrypt = WXBizDataCrypt
 App.mpType = 'app'
 
 const app = new Vue({

xiaochengxu/pages/circle/changeCard.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="content">
 		<view class="content1 flex">
-			<span class='default active'>邀请</span>
-			<span class='default'>黑名单</span>
+			<span @click='switchStatus(1)' :class='status==1?"active":""' class='default'>邀请</span>
+			<span @click='switchStatus(2)' :class='status==2?"active":""' class='default'>黑名单</span>
 		</view>
 		<view class="content2 ">
 			<view v-for='(item,index) in cardList' class="item">
@@ -240,6 +240,10 @@
 			this.getList()
 		},
 		methods:{
+			switchStatus(status){
+				this.status=status
+				this.getList()
+			},
 			getList(){
 				uni.showLoading({
 					title: '数据加载中'

xiaochengxu/pages/circle/circle.vue

@@ -11,7 +11,7 @@
 			<view class="right relative">
 				<image src="../../static/imgs/cirlce/hy.png" mode="widthFix" class="hy-search-img"
 					@click="toChangeCard"></image>
-				<u-badge :isDot="true" type="error" class="point position"></u-badge>
+				<u-badge v-if='cardList.length>0' :isDot="true" type="error" class="point position"></u-badge>
 			</view>
 		</view>
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback">
@@ -71,6 +71,7 @@
 				circleList: [],
 				userInfo: {},
 				canReset: false,
+				cardList:[],
 			};
 		},
 		onLoad() {
@@ -84,6 +85,21 @@
 				this.canReset = true // 过滤第一次的onShow事件,避免初始化界面时重复触发upCallback, 无需配置auto:false
 			});
 			this.searchVal = uni.getStorageSync("cirlce_search_val") ? uni.getStorageSync("cirlce_search_val") : ''
+			this.$request.baseRequest('admin.unimall.cardExchangeInfo', 'list', {
+				receiveId:this.userInfo.id,
+				status:1
+			}, failres => {
+				console.log('res+++++', failres.errmsg)
+				this.$refs.uToast.show({
+					type: 'error',
+					message: failres.errmsg,
+				})
+				uni.hideLoading()
+			}).then(res => {
+				uni.hideLoading()
+				this.cardList = res.data.items.filter((item)=>{return item.status==0})
+				console.log(this.cardList)
+			})
 		},
 		methods: {
 			delSearchVal() {

xiaochengxu/pages/circle/createCirclce.vue

@@ -11,7 +11,7 @@
 			<view class="title">
 				选择名片
 			</view>
-			<view style="font-size:12px;" class='flex align-item-center' @click="cardShow">
+			<view style="font-size:12px;padding-right:20rpx;" class='flex align-item-center' @click="cardShow">
 			{{formData.cardBusiness?formData.cardBusiness:'无名片'}}
 			<u-icon v-if='!formData.cardBusiness' name="arrow-right" size="12"></u-icon>
 			</view>

xiaochengxu/pages/circle/detail.vue

@@ -42,7 +42,7 @@
 
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback"
 			style="position: relative;top: -80rpx;">
-			<view class="content3" v-for="(item,index) in changeCardList" :key="index">
+			<view class="content3" v-for="(item,index) in changeCardList" :style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''" :key="index">
 				<view class="flex item">
 					<view class="top flex">
 						<view class="left">
@@ -62,7 +62,7 @@
 				</view>
 
 				<view class="line">
-					<image src="../../static/imgs/cirlce/line.png" mode="widthFix" style="width: 100%;"></image>
+					<image src="../../static/imgs/cirlce/line.png" mode="widthFix" style="width: 95%;"></image>
 				</view>
 				<view class="bottom">
 					{{item.scopeOfBusiness}}
@@ -493,4 +493,7 @@
 
 		}
 	}
+	.line{
+		text-align:center;
+	}
 </style>

xiaochengxu/pages/mySet/cardType.vue

@@ -73,29 +73,19 @@
 						for (var i = 0; i < res.data.items.length; i++) {
 							res.data.items[i].name = res.data.items[i].circleName[0]
 						}
-						var itemIndex = res.data.items.findIndex((item) => {
-							return item.topMarking == 1
-						})
-						if (itemIndex != -1) {
-							var data = res.data.items.splice(itemIndex, 1)
-							res.data.items.unshift({
-								circleName: '默认分类',
-								name: '默'
-							})
-							res.data.items = data.concat(res.data.items)
+						// var itemIndex = res.data.items.findIndex((item) => {
+						// 	return item.topMarking == 1
+						// })
+						// if (itemIndex != -1) {
+						// 	var data = res.data.items.splice(itemIndex, 1)
+						// 	res.data.items = data.concat(res.data.items)
 							
-						} else {
-							res.data.items = [{
-								circleName: '默认分类',
-								name: '默'
-							}].concat(res.data.items)
-						}
+						// } else {
+						// 	res.data.items = [].concat(res.data.items)
+						// }
 						this.cardTypeList = res.data.items
 					} else {
-						this.cardTypeList = [{
-							circleName: '默认分类',
-							name: '默'
-						}]
+						this.cardTypeList = []
 					}
 				})
 			},
@@ -142,15 +132,7 @@
 							id: item.id
 						})
 					}
-				} else {
-					type = 'admin.unimall.cardClassifyInfo'
-					type1 = 'topDefault'
-					data = {
-						cardClassifyInfo: JSON.stringify({
-							commonId: this.cardTypeData.commonId
-						})
-					}
-				}
+				} 
 				this.$request.baseRequest(type, type1, data, failres => {
 					console.log('res+++++', failres.errmsg)
 					uni.showToast({

xiaochengxu/pages/mySet/help.vue

@@ -1,15 +1,11 @@
 <template>
-	<view>
-		<view>
-		1.如何删除名片夹中的名片？	
-		</view>
-		<view>
-			回答：长安名片后右上方出现删除按钮，点击确认后即可删除。
-		</view>
-		<view>2.为什么别人无法分享我的名片？</view>
-		<view class="">
-			回答：其他用户分享您的名片之前需要得到您的授权，可在“我的-设置”中打开授权开关。
+	<view class='content'>
+		<view class="bg"></view>
+		<view class=' imgwrap'>
+			<image class='img'  src="../../static/imgs/mySet/question1.png" mode=""></image>
+			<image class='img'  src="../../static/imgs/mySet/question2.png" mode=""></image>
 		</view>
+		
 	</view>
 </template>
 
@@ -23,6 +19,23 @@
 	}
 </script>
 
-<style lang="scss">
-
+<style lang="scss" scoped>
+.bg{
+	height:162rpx;
+	background: linear-gradient(180deg, #112253 0%,  #FCFCFC 100%);
+	
+}
+// .content{
+// 	padding:20rpx;
+// }
+.imgwrap{
+	position:relative;
+	top:-132rpx;
+	text-align:center;
+}
+.img{
+	width:92vw;
+	height:276rpx;
+	margin:20rpx auto;
+}
 </style>

xiaochengxu/pages/mySet/myInfo.vue

@@ -5,10 +5,12 @@
 				<view class="title-name">
 					{{item.cardBusiness}}
 				</view>
-				<view class="card-list-item" :style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''">
+				<view class="card-list-item"
+					:style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''">
 					<view class="card-content style1" v-if="item.cuttentTemplate==1">
 						<view class="left">
-							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px" shape="circle"></u--image>
+							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+								shape="circle"></u--image>
 						</view>
 						<view class="right">
 							<view class="row1">
@@ -19,10 +21,16 @@
 								{{item.companyName}}
 							</view>
 							<view class="row3 flex">
-								<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+								<u--image :showLoading="true" src="/static/imgs/card/address1.png" width="13px"
+									height="16px"></u--image>{{ item.province }}{{ item.city }}{{ item.area }}
 							</view>
 							<view class="row4 flex">
-								<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.phone }}
+								<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px"
+									height="13px"></u--image>{{ item.phone }}
+							</view>
+							<view class="row4 flex">
+								<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px"
+									height="12px"></u--image>{{item.remark?item.remark:'单击添加备注'}}
 							</view>
 							<!-- <view class="">
 								备注
@@ -39,47 +47,37 @@
 								{{item.companyName}}
 							</view>
 							<view class="row3 flex">
-								<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
+								<u--image :showLoading="true" src="/static/imgs/card/address3.png" width="13px"
+									height="16px"></u--image>{{ item.province }}{{ item.city }}{{ item.area }}
+							</view>
+							<view class="row4 flex">
+								<u--image :showLoading="true" src="/static/imgs/card/phone3.png" width="12px"
+									height="13px"></u--image>{{ item.phone }}
 							</view>
 							<view class="row4 flex">
-								<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.phone }}
+								<u--image :showLoading="true" src="/static/imgs/card/remark3.png" width="10px"
+									height="12px"></u--image>{{item.remark?item.remark:'单击添加备注'}}
 							</view>
 							<!-- <view class="">
 								备注
 							</view> -->
 						</view>
 						<view class="left">
-							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px" shape="circle" v-if="item.headSculpture"></u--image>
-							<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
+							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+								shape="circle" v-if="item.headSculpture"></u--image>
+							<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+								height="66px" shape="circle" v-else></u--image>
 						</view>
 					</view>
 					<view class="card-content style2" v-if="item.cuttentTemplate==3">
-							<view class="top">
-								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px" shape="circle" v-if="item.headSculpture"></u--image>
-								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
-							</view>
-							<view class="bottom flex">
-								<view class="left">
-									<view class="row1">
-										<text class="name">{{item.name}}</text>
-										<text class="post">{{item.post}}</text>
-									</view>
-									<view class="row2">
-										{{item.companyName}}
-									</view>
-								</view>
-								<view class="right">
-									<view class="row1 flex">
-										<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
-									</view>
-									<view class="row2 flex">
-										<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.phone }}
-									</view>
-								</view>
-							</view>
-					</view>
-					<view class="card-content style2" v-if="item.cuttentTemplate==4">
-							<view class="top">
+						<view class="top">
+							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+								shape="circle" v-if="item.headSculpture"></u--image>
+							<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+								height="66px" shape="circle" v-else></u--image>
+						</view>
+						<view class="bottom flex">
+							<view class="left">
 								<view class="row1">
 									<text class="name">{{item.name}}</text>
 									<text class="post">{{item.post}}</text>
@@ -87,28 +85,65 @@
 								<view class="row2">
 									{{item.companyName}}
 								</view>
-								
 							</view>
-							<view class="bottom flex">
-								<view class="left">
-								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px" shape="circle" v-if="item.headSculpture"></u--image>
-								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
+							<view class="right">
+								<view class="row3 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/address1.png" width="13px"
+										height="16px"></u--image>{{ item.province }}{{ item.city }}{{ item.area }}
+								</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/phone1.png" width="12px"
+										height="13px"></u--image>{{ item.phone }}
+								</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/remark1.png" width="10px"
+										height="12px"></u--image>{{item.remark?item.remark:'单击添加备注'}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="card-content style2" v-if="item.cuttentTemplate==4">
+						<view class="top">
+							<view class="row1">
+								<text class="name">{{item.name}}</text>
+								<text class="post">{{item.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.companyName}}
+							</view>
+
+						</view>
+						<view class="bottom flex">
+							<view class="left">
+								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
+									shape="circle" v-if="item.headSculpture"></u--image>
+								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+									height="66px" shape="circle" v-else></u--image>
+							</view>
+							<view class="right">
+								<view class="row3 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/address2.png" width="13px"
+										height="16px"></u--image>{{ item.province }}{{ item.city }}{{ item.area }}
+								</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/phone2.png" width="12px"
+										height="13px"></u--image>{{ item.phone }}
 								</view>
-								<view class="right">
-									<view class="row1 flex">
-										<uni-icons type="map-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.province }}{{ item.city }}{{ item.area }}
-									</view>
-									<view class="row2 flex">
-										<uni-icons type="phone-filled" size="20" style="margin-right: 20rpx;" color="#5e6d82"></uni-icons>{{ item.phone }}
-									</view>
+								<view class="row4 flex">
+									<u--image :showLoading="true" src="/static/imgs/card/remark2.png" width="10px"
+										height="12px"></u--image>{{item.remark?item.remark:'单击添加备注'}}
 								</view>
 							</view>
+						</view>
 					</view>
 					<view class="car-bottom flex">
 						<view class="left">
-							<image src="../../static/imgs/card/home.png" mode="widthFix" style="width: 32rpx;" @click="toHome(item)"></image>
-							<image src="../../static/imgs/card/share.png" mode="widthFix" style="width: 35rpx;" @click="share(item)"></image>
-							<image src="../../static/imgs/card/ewm.png" mode="widthFix" style="width: 32rpx;" @click="showCode(item)"></image>
+							<image src="../../static/imgs/card/home.png" mode="widthFix" style="width: 32rpx;"
+								@click="toHome(item)"></image>
+							<image src="../../static/imgs/card/share.png" mode="widthFix" style="width: 35rpx;"
+								@click="share(item)"></image>
+							<image src="../../static/imgs/card/ewm.png" mode="widthFix" style="width: 32rpx;"
+								@click="showCode(item)"></image>
 						</view>
 						<view class="right">
 							<text class="text" @click="topMarking(item)">置顶</text>
@@ -122,7 +157,7 @@
 						<!-- <button @click="toEditCard(item)">编辑</button> -->
 					</view>
 				</view>
-				
+
 			</view>
 		</view>
 		<view class="upload flex flex-all-center" @click="addCard">
@@ -151,19 +186,50 @@
 			</view>
 		</u-popup>
 		<u-popup :show="isShowCode" @close="isShowCode=false" mode="center" :round='10'>
-		                <image style='margin:10px;' :src="selectCode" mode="widthFix"></image>
-				</u-popup>
+			<image style='margin:10px;' :src="selectCode" mode="widthFix"></image>
+		</u-popup>
+		<u-popup :show="popupshow" :closeOnClickOverlay='true' :overlayOpacity='0.4' @close='handleHiddenShare'
+			:round="10" mode="bottom">
+			<view>
+				<view class="share-content">
+					<view class="block" @click="toUrl()">
+						<button class="moment">
+							<view class="iconfont icon-pengyouquan"></view>
+							<view>分享朋友圈</view>
+						</button>
+					</view>
+					<view class="block">
+						<button class="shareBtn" type="default" data-name="shareBtn" open-type="share">
+							<view class="iconfont icon-weixin"></view>
+							<view>分享微信好友</view>
+						</button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- 生成图片 -->
+		<poster :data="canvasData" background-color="#FFF" :width='750' :height='420' @on-success="posterSuccess"
+			ref="poster" @on-error="posterError"></poster>
+			<point-share @close='showShare=false' :show='showShare'></point-share>
 	</view>
 </template>
 
 <script>
+	import Poster from '../../components/zhangyuhao-poster/Poster.vue';
+	import PointShare from '../../components/point-share/index.vue';
 	var that;
 	export default {
+		components: {
+			Poster,
+			PointShare
+		},
 		data() {
 			return {
-				isShowCode:false,
-				selectCode:'',
+				isShowCode: false,
+				selectCode: '',
 				id: '',
+				showShare:false,
+				popupshow:false,
 				radiovalue: '仅从自己名片列表删除',
 				radiolist: [{
 						name: '仅从自己名片列表删除',
@@ -175,7 +241,10 @@
 					}
 				],
 				isShowDel: false,
-				cardList: []
+				cardList: [],
+				canvasData:{},
+				clicknum:0,
+				poster:''
 			};
 		},
 		onLoad() {
@@ -185,18 +254,367 @@
 		onShow() {
 			this.init()
 		},
+		onShareAppMessage(res) {
+		
+			console.log(res, this.popupshow)
+			let that = this;
+			//生成名片图片
+			let imageUrl = this.poster
+			console.log("imageUrl", imageUrl)
+			if (res.from === 'button') {
+				let path = `/pages/cardHolder/scanCodeAddCard?id=${that.currectData.id}`
+				return {
+					title: this.popupshow ? `${that.currectData.name}分享的名片~` : '电子名片',
+					path: path,
+					imageUrl: this.popupshow ? imageUrl : '',
+				};
+			}
+			if (res.from === 'menu') {
+				return {
+					title: '我的名片',
+					path: '/pages/tabBarPro/index/index',
+					imageUrl: this.popupshow ? imageUrl : ''
+				};
+			}
+		},
 		methods: {
-			
-			showCode(val){
+			toUrl(){
+				this.popupshow=false
+				this.showShare=true
+			},
+			handleHiddenShare() {
+				this.popupshow = false
+			},
+			posterError(err) {
+				console.log(err)
+				uni.hideLoading()
+			},
+			posterSuccess(url) {
+				console.log("hahahah", url)
+				// 生成成功，会把临时路径在这里返回
+				this.poster = url;
+				uni.hideLoading()
+				this.popupshow = true
+				console.log(url)
+				
+			},
+			showCode(val) {
 				this.selectCode = val.qrCodeMyself
 				this.isShowCode = true
 			},
-			share(){
-				
+			share(item) {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.currectData = item
+				var data = [{
+						type: 'image',
+						path: this.currectData.currentBackground,
+						use: 'bg',
+						x: -10,
+						y: 0,
+						width: 530,
+						height: 325
+					},
+					{
+						type: 'image',
+						path: this.currectData.headSculpture,
+						shape: 'circle',
+						use: 'head',
+						x: 30,
+						y: 30,
+						width: 100,
+						height: 100
+					},
+					{
+						type: 'text',
+						text: this.currectData.name,
+						use: 'name',
+						x: 150,
+						y: 50,
+						size: 24,
+						color: '#000'
+
+					},
+					{
+						type: 'text',
+						text: this.currectData.post,
+						use: 'post',
+						x: 240,
+						y: 55,
+						size: 18,
+						color: '#666666'
+
+					},
+					{
+						type: 'text',
+						text: this.currectData.companyName,
+						use: 'companyName',
+						x: 150,
+						y: 95,
+						size: 18,
+						color: '#000'
+
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/address1.png',
+						use: 'address-icon',
+						x: 145,
+						y: 130,
+						width: 15,
+						height: 20
+					},
+					{
+						type: 'textarea',
+						text: this.currectData.province + this.currectData.city + this.currectData.area + this
+							.currectData.detailedAddress,
+						lineSpace: 1,
+						width: 320,
+						use: 'address',
+						x: 175,
+						y: 135,
+						size: 14,
+						color: '#000'
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/phone1.png',
+						use: 'phone-icon',
+						x: 145,
+						y: 163,
+						width: 16,
+						height: 16
+					},
+					{
+						type: 'text',
+						text: this.currectData.phone,
+						use: 'phone',
+						x: 175,
+						y: 167,
+						size: 14,
+						color: '#000'
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/remark1.png',
+						use: 'remark-icon',
+						x: 145,
+						y: 197,
+						width: 13,
+						height: 16
+					},
+					{
+						type: 'textarea',
+						text: this.currectData.remark ? this.currectData.remark : '单击添加备注',
+						use: 'remark',
+						lineSpace: 2,
+						width: 200,
+						x: 175,
+						y: 200,
+						size: 13,
+						color: '#000'
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/bgc1.png',
+						use: 'bg1',
+						x: 3,
+						y: 243,
+						width: 240,
+						height: 67
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/bgc2.png',
+						use: 'bg2',
+						x: 225,
+						y: 243,
+						width: 278,
+						height: 67
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/home.png',
+						use: 'home',
+						x: 30,
+						y: 260,
+						width: 33,
+						height: 33
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/share.png',
+						use: 'share',
+						x: 90,
+						y: 263,
+						width: 33,
+						height: 28
+					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/ewm.png',
+						use: 'code',
+						x: 150,
+						y: 263,
+						width: 32,
+						height: 32
+					},
+					{
+						type: 'text',
+						text: '置顶',
+						use: 'top',
+						x: 280,
+						y: 265,
+						size: 24,
+						color: '#fff'
+					},
+					{
+						type: 'text',
+						text: '删除',
+						use: 'del',
+						x: 350,
+						y: 265,
+						size: 24,
+						color: '#fff'
+					},
+					{
+						type: 'text',
+						text: '编辑',
+						use: 'edit',
+						x: 420,
+						y: 265,
+						size: 24,
+						color: '#fff'
+					},
+				]
+				console.log(this.currectData.cuttentTemplate, 111111)
+				for (var i = 0; i < data.length; i++) {
+					switch (this.currectData.cuttentTemplate) {
+						case '2':
+							if (data[i].use === 'name' ||
+								data[i].use === 'companyName' ||
+								data[i].use === 'address-icon' ||
+								data[i].use === 'phone-icon' ||
+								data[i].use === 'remark-icon') {
+								data[i].x = 30
+							}
+							if (data[i].use === 'address-icon') {
+								data[i].path = '../../static/imgs/card/address3.png'
+							}
+							if (data[i].use === 'phone-icon') {
+								data[i].path = '../../static/imgs/card/phone3.png'
+							}
+							if (data[i].use === 'remark-icon') {
+								data[i].path = '../../static/imgs/card/remark3.png'
+							}
+							if (data[i].use === 'post') {
+								data[i].x = 100
+							}
+							if (data[i].use === 'address' ||
+								data[i].use === 'phone' ||
+								data[i].use === 'remark') {
+								data[i].x = 60
+							}
+							if (data[i].use == 'head') {
+								data[i].x = 370
+							}
+							break;
+						case '3':
+							if (data[i].use === 'name') {
+								data[i].x = 30
+								data[i].y = 150
+							}
+							if (data[i].use === 'companyName') {
+								data[i].x = 30
+								data[i].y = 180
+							}
+							if (data[i].use === 'post') {
+								data[i].x = 100
+								data[i].y = 153
+							}
+							if (data[i].use === 'address-icon' ||
+								data[i].use === 'phone-icon' ||
+								data[i].use === 'remark-icon') {
+								data[i].x = 170
+							}
+							if (data[i].use === 'address-icon') {
+								data[i].y = 150
+							}
+							if (data[i].use === 'address') {
+								data[i].y = 155;
+								data[i].width = 300
+							}
+							if (data[i].use === 'phone-icon') {
+								data[i].y = 180
+							}
+							if (data[i].use === 'phone') {
+								data[i].y = 183
+							}
+							if (data[i].use === 'remark-icon') {
+								data[i].y = 210
+							}
+							if (data[i].use === 'remark') {
+								data[i].y = 212
+							}
+							if (data[i].use === 'address' ||
+								data[i].use === 'phone' ||
+								data[i].use === 'remark') {
+								data[i].x = 190
+							}
+							break;
+						case '4':
+							if (data[i].use === 'name' ||
+								data[i].use === 'companyName') {
+								data[i].x = 30
+							}
+							if (data[i].use === 'companyName') {
+								data[i].y = 90
+							}
+							if (data[i].use === 'post') {
+								data[i].x = 100
+							}
+							if (data[i].use == 'head') {
+								data[i].x = 25
+								data[i].y = 120
+							}
+							if (data[i].use === 'address-icon') {
+								data[i].path = '../../static/imgs/card/address2.png'
+							}
+							if (data[i].use === 'phone-icon') {
+								data[i].path = '../../static/imgs/card/phone2.png'
+							}
+							if (data[i].use === 'remark-icon') {
+								data[i].path = '../../static/imgs/card/remark2.png'
+							}
+							if (data[i].use === 'address-icon' ||
+								data[i].use === 'phone-icon' ||
+								data[i].use === 'remark-icon') {
+								data[i].x = 170
+							}
+							if (data[i].use === 'address') {
+								data[i].width = 300
+							}
+							if (data[i].use === 'address' ||
+								data[i].use === 'phone' ||
+								data[i].use === 'remark') {
+								data[i].x = 190
+							}
+							break;
+						default:
+					}
+				}
+				this.canvasData = {
+					clicknum: this.clicknum++,
+					list: data,
+					page:'myInfo'
+				}
+				console.log(1111111)
 			},
-			toHome(item){
+			toHome(item) {
 				uni.navigateTo({
-					url: "/pages/mySet/myHome?id="+item.personalHomeId
+					url: "/pages/mySet/myHome?id=" + item.personalHomeId
 				})
 			},
 			radioChange(n) {
@@ -217,7 +635,7 @@
 			},
 			toEditCard(val) {
 				uni.navigateTo({
-					url: "/pages/mySet/editCard?itemVal="+JSON.stringify(val)
+					url: "/pages/mySet/editCard?itemVal=" + JSON.stringify(val)
 				})
 			},
 			delCard() {
@@ -281,136 +699,162 @@
 </script>
 
 <style lang="scss" scoped>
-	.content{
+	.content {
 		padding-bottom: 40rpx;
 	}
-	.card-content{
+
+	.card-content {
 		width: 100%;
 	}
-	.content1{
-		.style1{
+
+	.content1 {
+		.style1 {
 			display: flex;
 			padding: 20rpx 30rpx;
 			width: 85%;
 			margin-bottom: 90rpx;
-			.left{
+
+			.left {
 				width: 132rpx;
 				height: 132rpx;
 				border-radius: 50%;
 			}
-			.right{
+
+			.right {
 				margin-left: 40rpx;
-				.row1{
-					.name{
+
+				.row1 {
+					.name {
 						font-size: 38rpx;
 						font-weight: bold;
 						color: #040000;
 						margin-right: 20rpx;
 					}
-					.post{
+
+					.post {
 						font-size: 26rpx;
 						font-weight: 500;
 						color: #666666;
 					}
 				}
-				.row2{
+
+				.row2 {
 					margin-top: 20rpx;
 					font-size: 24rpx;
 					font-weight: bold;
 					color: #323333;
 				}
-				.row3{
+
+				.row3 {
 					margin-top: 30rpx;
 					font-size: 24rpx;
 					font-weight: 500;
 					color: #323333;
-					
+
 				}
 			}
 		}
-		.style2{
-				padding:30rpx;
-				margin-bottom: 100rpx;
-				.top{
-					.row1{
-						.name{
+
+		.style2 {
+			padding: 30rpx;
+			margin-bottom: 100rpx;
+
+			.top {
+				.row1 {
+					.name {
+						font-size: 38rpx;
+						font-weight: bold;
+						color: #040000;
+						margin-right: 20rpx;
+					}
+
+					.post {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #666666;
+					}
+				}
+
+				.row2 {
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #323333;
+				}
+			}
+
+			.bottom {
+				margin-top: 48rpx;
+
+				.left {
+					margin-right: 40rpx;
+
+					.row1 {
+						.name {
 							font-size: 38rpx;
 							font-weight: bold;
 							color: #040000;
 							margin-right: 20rpx;
 						}
-						.post{
+
+						.post {
 							font-size: 26rpx;
 							font-weight: 500;
 							color: #666666;
 						}
 					}
-					.row2{
+
+					.row2 {
 						margin-top: 20rpx;
 						font-size: 24rpx;
 						font-weight: bold;
 						color: #323333;
 					}
 				}
-				.bottom{
-					margin-top: 48rpx;
-					.left{
-						margin-right: 40rpx;
-						.row1{
-							.name{
-								font-size: 38rpx;
-								font-weight: bold;
-								color: #040000;
-								margin-right: 20rpx;
-							}
-							.post{
-								font-size: 26rpx;
-								font-weight: 500;
-								color: #666666;
-							}
-						}
-						.row2{
-							margin-top: 20rpx;
-							font-size: 24rpx;
-							font-weight: bold;
-							color: #323333;
-						}
+
+				.right {
+
+					.row1,
+					.row2 {
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #323333;
 					}
-					.right{
-						.row1,.row2{
-							font-size: 24rpx;
-							font-weight: 500;
-							color: #323333;
-						}
-						.row2{
-							margin-top: 20rpx;
-						}
+
+					.row2 {
+						margin-top: 20rpx;
 					}
 				}
-				
+			}
+
 		}
 	}
-	.card-list{
-		padding:0 20rpx;
-		.title-name{
+
+	.card-list {
+		padding: 0 20rpx;
+
+		.title-name {
 			font-weight: bold;
 			color: #19191A;
 			margin: 20rpx 0;
 		}
 	}
+
 	.card-list-item {
 		width: calc(100% + 40rpx);
-		left:-20rpx;
+		left: -20rpx;
 		position: relative;
 		border-radius: 30rpx;
 		padding: 40rpx;
 		box-sizing: border-box;
-		.car-bottom{
+
+		.car-bottom {
 			position: absolute;
 			bottom: 20rpx;
-			left:20rpx;
+			left: 20rpx;
 			width: calc(100% - 40rpx);
-			.left{
+
+			.left {
 				position: absolute;
 				padding: 20rpx 0;
 				width: 310rpx;
@@ -420,7 +864,8 @@
 				background: url("../../static/imgs/card/bgc1.png") no-repeat center;
 				background-size: 100% 100%;
 			}
-			.right{
+
+			.right {
 				font-size: 26rpx;
 				padding: 20rpx 0;
 				position: relative;
@@ -431,11 +876,13 @@
 				justify-content: space-evenly;
 				background: url("../../static/imgs/card/bgc2.png") no-repeat center;
 				background-size: 100% 100%;
-				.text{
+
+				.text {
 					color: #fff;
 				}
 			}
 		}
+
 		.left {
 			width: 30%;
 
@@ -462,20 +909,42 @@
 			}
 		}
 	}
-	.upload{
+
+	.upload {
 		background-color: #fff;
 		margin: 20rpx;
 		border-radius: 20rpx;
 		padding: 76rpx;
-		.solids{
+
+		.solids {
 			flex-direction: column;
-			.text{
+
+			.text {
 				margin-top: 20rpx;
 				font-size: 26rpx;
 				font-weight: 500;
 				color: #666666;
 			}
 		}
-		
+
+	}
+	.share-content {
+		display: flex;
+		padding: 20rpx;
+		justify-content: center;
+		font-size: 24rpx;
+	
+		button {
+			background: transparent;
+			line-height: 1.5;
+		}
+	
+		button:after {
+			border: none;
+		}
+	}
+	.icon-pengyouquan,.icon-weixin{
+		font-size:50px;
+		color:#33CC00;
 	}
-</style>
+</style>

xiaochengxu/pages/mySet/mySet.vue

@@ -38,6 +38,7 @@
 			@confirm="cardConfirm" :show="show1" :columns="cardList"></u-picker>
 		<poster :data="canvasData" background-color="#FFF" :width='750' :height='420' @on-success="posterSuccess"
 			ref="poster" @on-error="posterError"></poster>
+		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
@@ -98,22 +99,28 @@
 			};
 		},
 		onShow() {
-			this.userInfo = uni.getStorageSync("userInfo")
-			console.log(this.userInfo)
-			this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
-				commonId: uni.getStorageSync("userInfo").id
-			}, failres => {
-				this.$refs.uToast.show({
-					type: 'error',
-					message: failres.errmsg,
+			if (uni.getStorageSync("userInfo").phone) {
+				this.userInfo = uni.getStorageSync("userInfo")
+				this.$request.baseRequest('admin.unimall.cardManagementInfo', 'list', {
+					commonId: uni.getStorageSync("userInfo").id
+				}, failres => {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: failres.errmsg,
+					})
+					uni.hideLoading()
+				}).then(res => {
+					this.cardList = [res.data.items]
+					this.cardChange({
+						value: this.cardList[[0]]
+					})
 				})
-				uni.hideLoading()
-			}).then(res => {
-				this.cardList = [res.data.items]
-				this.cardChange({
-					value: this.cardList[[0]]
+			} else {
+				uni.switchTab({
+					url: "/pages/cardHolder/cardHolder"
 				})
-			})
+			}
+
 		},
 		onShareAppMessage(res) {
 			this.popupshow = false
@@ -132,20 +139,12 @@
 			}
 			if (res.from === 'menu') {
 				return {
-					title: '商通线上商城',
+					title: '我的',
 					path: '/pages/tabBarPro/index/index',
 					imageUrl: this.popupshow ? imageUrl : ''
 				};
 			}
 		},
-		// 分享到朋友圈
-		onShareTimeline() {
-			return {
-				title: '商通线上商城',
-				path: '/pages/index/index',
-				imageUrl: 'https://cdn.uviewui.com/uview/swiper/1.jpg'
-			};
-		},
 		methods: {
 			handleHiddenShare() {
 				this.popupshow = false
@@ -197,7 +196,7 @@
 						y: 50,
 						size: 24,
 						color: '#000'
-
+				
 					},
 					{
 						type: 'text',
@@ -207,7 +206,7 @@
 						y: 55,
 						size: 18,
 						color: '#666666'
-
+				
 					},
 					{
 						type: 'text',
@@ -217,7 +216,7 @@
 						y: 95,
 						size: 18,
 						color: '#000'
-
+				
 					},
 					{
 						type: 'image',
@@ -280,49 +279,76 @@
 					},
 					{
 						type: 'image',
-						path: '../../static/imgs/card/bg3.png',
+						path: '../../static/imgs/card/bgc1.png',
 						use: 'bg1',
-						x: 0,
+						x: 3,
 						y: 243,
-						width: 370,
+						width: 240,
 						height: 67
 					},
 					{
 						type: 'image',
-						path: '../../static/imgs/card/bg4.png',
+						path: '../../static/imgs/card/bgc2.png',
 						use: 'bg2',
-						x: 355,
+						x: 225,
 						y: 243,
-						width: 150,
+						width: 278,
 						height: 67
 					},
 					{
 						type: 'image',
 						path: '../../static/imgs/card/home.png',
 						use: 'home',
-						x: 65,
+						x: 30,
 						y: 260,
 						width: 33,
 						height: 33
 					},
-					{
-						type: 'text',
-						text: this.currectData.classifyName ? this.currectData.classifyName : '默',
-						use: 'classify',
-						x: 145,
-						y: 263,
-						size: 34,
-						color: '#fff'
-					},
 					{
 						type: 'image',
 						path: '../../static/imgs/card/share.png',
 						use: 'share',
-						x: 235,
+						x: 90,
 						y: 263,
 						width: 33,
 						height: 28
 					},
+					{
+						type: 'image',
+						path: '../../static/imgs/card/ewm.png',
+						use: 'code',
+						x: 150,
+						y: 263,
+						width: 32,
+						height: 32
+					},
+					{
+						type: 'text',
+						text: '置顶',
+						use: 'top',
+						x: 280,
+						y: 265,
+						size: 24,
+						color: '#fff'
+					},
+					{
+						type: 'text',
+						text: '删除',
+						use: 'del',
+						x: 350,
+						y: 265,
+						size: 24,
+						color: '#fff'
+					},
+					{
+						type: 'text',
+						text: '编辑',
+						use: 'edit',
+						x: 420,
+						y: 265,
+						size: 24,
+						color: '#fff'
+					},
 				]
 				console.log(this.currectData.cuttentTemplate, 111111)
 				for (var i = 0; i < data.length; i++) {
@@ -335,6 +361,15 @@
 								data[i].use === 'remark-icon') {
 								data[i].x = 30
 							}
+							if (data[i].use === 'address-icon') {
+								data[i].path = '../../static/imgs/card/address3.png'
+							}
+							if (data[i].use === 'phone-icon') {
+								data[i].path = '../../static/imgs/card/phone3.png'
+							}
+							if (data[i].use === 'remark-icon') {
+								data[i].path = '../../static/imgs/card/remark3.png'
+							}
 							if (data[i].use === 'post') {
 								data[i].x = 100
 							}
@@ -405,6 +440,15 @@
 								data[i].x = 25
 								data[i].y = 120
 							}
+							if (data[i].use === 'address-icon') {
+								data[i].path = '../../static/imgs/card/address2.png'
+							}
+							if (data[i].use === 'phone-icon') {
+								data[i].path = '../../static/imgs/card/phone2.png'
+							}
+							if (data[i].use === 'remark-icon') {
+								data[i].path = '../../static/imgs/card/remark2.png'
+							}
 							if (data[i].use === 'address-icon' ||
 								data[i].use === 'phone-icon' ||
 								data[i].use === 'remark-icon') {
@@ -424,7 +468,8 @@
 				}
 				this.canvasData = {
 					clicknum: this.clicknum++,
-					list: data
+					list: data,
+					page:'myInfo'
 				}
 			},
 			posterError(err) {
@@ -441,12 +486,12 @@
 			},
 			menuClick(typeName) {
 				if (typeName == "contactCustomer") return
-			let _url = '/pages/mySet/' + typeName
-			uni.navigateTo({
-				url: _url
-			})
+				let _url = '/pages/mySet/' + typeName
+				uni.navigateTo({
+					url: _url
+				})
 			}
-			
+
 		}
 	}
 </script>

xiaochengxu/pages/mySet/set.vue

@@ -2,16 +2,16 @@
 	<view class="content">
 		<view class='flex bottom flex-between' style="padding: 20rpx;">
 			<text>允许他人分享我的名片</text>
-			<u-switch v-model="value1" :activeValue='true' :inactiveValue='false' @change="change($event,1)"
+			<u-switch v-model="value1" activeColor="#112253" :activeValue='true' :inactiveValue='false' @change="change($event,1)"
 				size="20"></u-switch>
 		</view>
 		<view class='flex bottom flex-between' style="padding: 20rpx;">
 			<text>允许圈子成员查看我的主页</text>
-			<u-switch v-model="value2" @change="change($event,2)" size="20"></u-switch>
+			<u-switch v-model="value2" activeColor="#112253" @change="change($event,2)" size="20"></u-switch>
 		</view>
 		<view class="flex flex-between" style="padding: 20rpx;">
 			<text>自动接受交换名片邀请</text>
-			<u-switch v-model="value3" @change="change($event,3)" size="20"></u-switch>
+			<u-switch v-model="value3" activeColor="#112253" @change="change($event,3)" size="20"></u-switch>
 		</view>
 		<u-toast ref="uToast"></u-toast>
 	</view>