Эх сурвалжийг харах

Signed-off-by: ljx <809268652@qq.com>

ljx 10 сар өмнө
parent
commit
89edbe25fe

+ 2 - 2
.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 ENV = 'development'
 
 
 # base api
 # base api
-# VUE_APP_BASE_API = 'http://127.0.0.1:18080'
-VUE_APP_BASE_API = 'https://430jy.uutime.cn/'
+VUE_APP_BASE_API = 'http://127.0.0.1:18080'
+#VUE_APP_BASE_API = 'https://127.0.0.1:9528/'
 VUE_APP_API_TIMEOUT = 30000
 VUE_APP_API_TIMEOUT = 30000
 
 
 
 

+ 1 - 1
Jenkinsfile

@@ -11,7 +11,7 @@ pipeline {
 //   tools { node '' }
 //   tools { node '' }
 //   parameters {}
 //   parameters {}
   environment {
   environment {
-    _fullDisplayName = "幼享乐-Web管理后台"
+    _fullDisplayName = "童趣分享-Web管理后台"
     _qyWechatRobotToken = "a47cb467-8e94-4877-b275-832cc1f0d9af"
     _qyWechatRobotToken = "a47cb467-8e94-4877-b275-832cc1f0d9af"
     _remote = "root@47.97.230.53"
     _remote = "root@47.97.230.53"
     _remoteB = "root@8.134.14.62"
     _remoteB = "root@8.134.14.62"

+ 1 - 1
package.json

@@ -48,7 +48,7 @@
     "mockjs": "1.0.1-beta3",
     "mockjs": "1.0.1-beta3",
     "runjs": "4.3.2",
     "runjs": "4.3.2",
     "sass": "1.26.8",
     "sass": "1.26.8",
-    "sass-loader": "8.0.2",
+    "sass-loader": "9.0.2",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-ext-html-webpack-plugin": "2.1.3",
     "serve-static": "1.13.2",
     "serve-static": "1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svg-sprite-loader": "4.1.3",

+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>幼享乐 | 管理后台</title>
+    <title>童趣分享 | 管理后台</title>
   </head>
   </head>
   <body>
   <body>
     <noscript>
     <noscript>

+ 1 - 1
src/const/urlKey.js

@@ -1,3 +1,3 @@
-export const UPLOAD_URL = `${process.env.VUE_APP_BASE_API}/yxl-back-end/framework/oss/local/upload`;
+export const UPLOAD_URL = `${process.env.VUE_APP_BASE_API}/yxl-back-end/service/oss/local/upload`;
 
 
 export const UPLOAD_URL_DEMO = `${process.env.VUE_APP_BASE_API}/file/init/f728a2ca-14fa-40b3-9daf-47622d628849.png`;
 export const UPLOAD_URL_DEMO = `${process.env.VUE_APP_BASE_API}/file/init/f728a2ca-14fa-40b3-9daf-47622d628849.png`;

+ 16 - 16
src/router/index.js

@@ -74,7 +74,7 @@ export const constantRoutes = [
  * the routes that need to be dynamically loaded based on user roles
  * the routes that need to be dynamically loaded based on user roles
  */
  */
 export const asyncRoutes = [
 export const asyncRoutes = [
-  {
+  /* {
     path: '/statistics',
     path: '/statistics',
     component: Layout,
     component: Layout,
     redirect: '/statistics/DownloadImage',
     redirect: '/statistics/DownloadImage',
@@ -106,26 +106,26 @@ export const asyncRoutes = [
         }
         }
       }
       }
     ]
     ]
-  },
+  }, */
 
 
   {
   {
     path: '/photographerManagement',
     path: '/photographerManagement',
     component: Layout,
     component: Layout,
     redirect: '/photographerManagement/PhotoVerify',
     redirect: '/photographerManagement/PhotoVerify',
-    name: '摄影师',
+    name: '摄影师作品',
     meta: {
     meta: {
-      title: '摄影师',
+      title: '摄影师作品',
       icon: 'el-icon-s-help',
       icon: 'el-icon-s-help',
       roles: ['admin', 'photoer', 'photoer_management']
       roles: ['admin', 'photoer', 'photoer_management']
     },
     },
     children: [
     children: [
       {
       {
         path: 'PhotoVerify',
         path: 'PhotoVerify',
-        name: '摄影师', // add by 梁展鹏 20210723 因为只有一个菜单,所以暂时把菜单名称写到这里。实际上这里是"照片管理"
+        name: '摄影师作品', // add by 梁展鹏 20210723 因为只有一个菜单,所以暂时把菜单名称写到这里。实际上这里是"照片管理"
         component: () =>
         component: () =>
           import('@/views/photographerManagement/photoVerify/index'),
           import('@/views/photographerManagement/photoVerify/index'),
         meta: {
         meta: {
-          title: '摄影师',
+          title: '摄影师作品',
           // icon: 'tree',
           // icon: 'tree',
           roles: ['admin', 'photoer', 'photoer_management']
           roles: ['admin', 'photoer', 'photoer_management']
         }
         }
@@ -192,11 +192,11 @@ export const asyncRoutes = [
     children: [
     children: [
       {
       {
         path: 'PhotographerVerify',
         path: 'PhotographerVerify',
-        name: '摄影师认证审核',
+        name: '摄影师审核',
         component: () =>
         component: () =>
           import('@/views/photographerManagement/photographerVerify/index'),
           import('@/views/photographerManagement/photographerVerify/index'),
         meta: {
         meta: {
-          title: '摄影师认证审核',
+          title: '摄影师审核',
           // icon: 'table',
           // icon: 'table',
           roles: ['admin', 'photoer_management']
           roles: ['admin', 'photoer_management']
         }
         }
@@ -245,7 +245,7 @@ export const asyncRoutes = [
           roles: ['admin', 'operate']
           roles: ['admin', 'operate']
         }
         }
       },
       },
-      {
+      /* {
         path: 'MemberList',
         path: 'MemberList',
         name: '会员列表',
         name: '会员列表',
         component: () => import('@/views/memberManagement/memberList/index'),
         component: () => import('@/views/memberManagement/memberList/index'),
@@ -254,7 +254,7 @@ export const asyncRoutes = [
           // icon: 'tree',
           // icon: 'tree',
           roles: ['admin', 'operate']
           roles: ['admin', 'operate']
         }
         }
-      }
+      } */
     ]
     ]
   },
   },
 
 
@@ -358,7 +358,7 @@ export const asyncRoutes = [
           roles: ['admin', 'operate']
           roles: ['admin', 'operate']
         }
         }
       },
       },
-      {
+      /* {
         path: 'BannerManagement',
         path: 'BannerManagement',
         name: 'Banner管理',
         name: 'Banner管理',
         component: () =>
         component: () =>
@@ -378,7 +378,7 @@ export const asyncRoutes = [
           // icon: 'tree',
           // icon: 'tree',
           roles: ['admin', 'operate']
           roles: ['admin', 'operate']
         }
         }
-      },
+      }, */
       {
       {
         path: 'ProblemFeedbackManagement',
         path: 'ProblemFeedbackManagement',
         name: '问题管理',
         name: '问题管理',
@@ -390,7 +390,7 @@ export const asyncRoutes = [
           roles: ['admin', 'operate']
           roles: ['admin', 'operate']
         }
         }
       },
       },
-      {
+      /* {
         path: 'UpdateListManagement',
         path: 'UpdateListManagement',
         name: '自更新管理',
         name: '自更新管理',
         component: () => import('@/views/baseManagement/updateList/index'),
         component: () => import('@/views/baseManagement/updateList/index'),
@@ -399,11 +399,11 @@ export const asyncRoutes = [
           // icon: 'tree',
           // icon: 'tree',
           roles: ['admin', 'operate']
           roles: ['admin', 'operate']
         }
         }
-      }
+      } */
     ]
     ]
   },
   },
 
 
-  {
+  /* {
     path: '/systemManagement',
     path: '/systemManagement',
     component: Layout,
     component: Layout,
     redirect: '/systemManagement/AccountManagement',
     redirect: '/systemManagement/AccountManagement',
@@ -437,7 +437,7 @@ export const asyncRoutes = [
         }
         }
       }
       }
     ]
     ]
-  },
+  }, */
 
 
   {
   {
     path: '/helpInfo',
     path: '/helpInfo',

+ 1 - 1
src/views/baseManagement/bannerManagement/index.vue

@@ -92,7 +92,7 @@ export default {
           width: this.$col.b
           width: this.$col.b
         },
         },
         {
         {
-          key: 'createAt',
+          key: 'updateAt',
           name: '修改时间',
           name: '修改时间',
           width: this.$col.b
           width: this.$col.b
         },
         },

+ 3 - 3
src/views/baseManagement/trending/index.vue

@@ -57,7 +57,7 @@ export default {
           width: this.$col.b
           width: this.$col.b
         },
         },
         {
         {
-          key: 'createAt',
+          key: 'updateAt',
           name: '修改时间',
           name: '修改时间',
           width: this.$col.b
           width: this.$col.b
         },
         },
@@ -75,7 +75,7 @@ export default {
           width: '120',
           width: '120',
           render: (h, { row }) => {
           render: (h, { row }) => {
             const action = [];
             const action = [];
-            action.push(
+            /* action.push(
               h(
               h(
                 'el-button',
                 'el-button',
                 {
                 {
@@ -96,7 +96,7 @@ export default {
                 },
                 },
                 '编辑'
                 '编辑'
               )
               )
-            );
+            ); */
             action.push(
             action.push(
               h(
               h(
                 'BaseBtn',
                 'BaseBtn',

+ 1 - 1
src/views/baseManagement/updateList/modal/ItemModal.vue

@@ -77,7 +77,7 @@ export default {
       modal: true,
       modal: true,
 
 
       form: {
       form: {
-        productName: '幼享乐',
+        productName: '童趣分享',
         versionCode: '',
         versionCode: '',
         versionNumber: '',
         versionNumber: '',
         downloadUrl: '',
         downloadUrl: '',

+ 21 - 19
src/views/login/index.vue

@@ -9,7 +9,7 @@
       label-position="left"
       label-position="left"
     >
     >
       <div class="title-container">
       <div class="title-container">
-        <h3 class="title">幼享乐</h3>
+        <h3 class="title">童趣分享</h3>
         <p class="title-tip">管理后台</p>
         <p class="title-tip">管理后台</p>
       </div>
       </div>
 
 
@@ -24,7 +24,7 @@
           auto-complete="on"
           auto-complete="on"
           prefix-icon="el-icon-phone"
           prefix-icon="el-icon-phone"
         >
         >
-          <el-button
+          <!-- <el-button
             slot="suffix"
             slot="suffix"
             class="inline-btn"
             class="inline-btn"
             type="primary"
             type="primary"
@@ -32,7 +32,7 @@
             @click="handlerGetCode"
             @click="handlerGetCode"
           >
           >
             {{btnTxt}}
             {{btnTxt}}
-          </el-button>
+          </el-button> -->
         </el-input>
         </el-input>
       </el-form-item>
       </el-form-item>
 
 
@@ -40,9 +40,9 @@
         <el-input
         <el-input
           ref="code"
           ref="code"
           v-model="loginForm.code"
           v-model="loginForm.code"
-          placeholder="请输入手机验证码"
+          placeholder="请输入码"
           name="code"
           name="code"
-          type="text"
+          type="password"
           tabindex="1"
           tabindex="1"
           prefix-icon="el-icon-chat-dot-round"
           prefix-icon="el-icon-chat-dot-round"
           @keyup.enter.native="handleLogin"
           @keyup.enter.native="handleLogin"
@@ -59,28 +59,28 @@
         登录
         登录
       </el-button>
       </el-button>
     </el-form>
     </el-form>
-    <div class="footer">
+<!--     <div class="footer">
       copyright @ {{ new Date().getFullYear() }}
       copyright @ {{ new Date().getFullYear() }}
       广东帕斯融媒体科技有限公司
       广东帕斯融媒体科技有限公司
-    </div>
+    </div> -->
 
 
-    <el-dialog
+    <!-- <el-dialog
       title="真人验证"
       title="真人验证"
       :visible.sync="dialogVisible"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       :close-on-click-modal="false"
       width="20%"
       width="20%"
-    >
+    > 
       <div class="f-c-c f-col">
       <div class="f-c-c f-col">
         <img :src="info.base64Img" class="info-img" @click="loadCheckImg" />
         <img :src="info.base64Img" class="info-img" @click="loadCheckImg" />
         <el-input v-model="point" placeholder="请输入验证码" clearable />
         <el-input v-model="point" placeholder="请输入验证码" clearable />
       </div>
       </div>
-      <!-- <span slot="footer" class="dialog-footer">
+      <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="handleGetSMS"
         <el-button type="primary" @click="handleGetSMS"
           >获取短信验证码</el-button
           >获取短信验证码</el-button
         >
         >
-      </span> -->
-    </el-dialog>
+      </span> 
+    </el-dialog>-->
   </div>
   </div>
 </template>
 </template>
 
 
@@ -101,7 +101,7 @@ export default {
     };
     };
     const validateCode = (rule, value, callback) => {
     const validateCode = (rule, value, callback) => {
       if (value.length !== 6) {
       if (value.length !== 6) {
-        callback(new Error('请输入正确电话验证码'));
+        callback(new Error('请输入正确码'));
       } else {
       } else {
         callback();
         callback();
       }
       }
@@ -134,12 +134,12 @@ export default {
       let b = validPhone(loginForm.phone) && this.timer === null
       let b = validPhone(loginForm.phone) && this.timer === null
       return b
       return b
     },
     },
-    btnTxt() {
+    /* btnTxt() {
       if (this.timer !== null) {
       if (this.timer !== null) {
         return `${this.time}秒`
         return `${this.time}秒`
       }
       }
       return '获取验证码'
       return '获取验证码'
-    }
+    } */
   },
   },
 
 
   watch: {
   watch: {
@@ -177,7 +177,7 @@ export default {
     },
     },
 
 
   methods: {
   methods: {
-    handlerGetCode() {
+    /* handlerGetCode() {
       if (this.timer) { clearInterval(this.timer); this.timer= null}
       if (this.timer) { clearInterval(this.timer); this.timer= null}
       this.timer = setInterval(() => {
       this.timer = setInterval(() => {
         if (this.time > 0) {
         if (this.time > 0) {
@@ -190,9 +190,9 @@ export default {
         }
         }
       }, 1000);
       }, 1000);
       this.dialogVisible = true
       this.dialogVisible = true
-    },
+    }, */
     handleLogin() {
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+       this.$refs.loginForm.validate(valid => {
         if (valid) {
         if (valid) {
           this.loading = true;
           this.loading = true;
           this.$store
           this.$store
@@ -211,7 +211,9 @@ export default {
           this.$error('尚未填写完成');
           this.$error('尚未填写完成');
           return false;
           return false;
         }
         }
-      });
+      }); 
+/*       this.$router.push('/dashboard')
+      console.log('跳过登录!!!!') */
     },
     },
 
 
     async loadCheckImg() {
     async loadCheckImg() {

+ 12 - 12
src/views/memberManagement/memberList/index.vue

@@ -31,62 +31,62 @@ export default {
     return {
     return {
       columns: [
       columns: [
         {
         {
-          key: 'photo',
+          key: 'hyid',
           name: '会员ID',
           name: '会员ID',
           width: '160'
           width: '160'
         },
         },
         {
         {
-          key: 'region',
+          key: 'avatar',
           name: '头像',
           name: '头像',
           width: '180'
           width: '180'
         },
         },
         {
         {
-          key: 'region',
+          key: 'nickname',
           name: '账号昵称',
           name: '账号昵称',
           minWidth: this.$col.b
           minWidth: this.$col.b
         },
         },
         {
         {
-          key: 'region',
+          key: 'phone',
           name: '账号手机号码',
           name: '账号手机号码',
           width: this.$col.m
           width: this.$col.m
         },
         },
         {
         {
-          key: 'region',
+          key: 'sex',
           name: '性别',
           name: '性别',
           width: '180'
           width: '180'
         },
         },
         {
         {
-          key: 'region',
+          key: 'wx',
           name: '微信',
           name: '微信',
           width: '180'
           width: '180'
         },
         },
         {
         {
-          key: 'region',
+          key: 'email',
           name: '邮箱',
           name: '邮箱',
           width: '180'
           width: '180'
         },
         },
         {
         {
-          key: 'region',
+          key: 'level',
           name: '会员等级',
           name: '会员等级',
           width: '180'
           width: '180'
         },
         },
         {
         {
-          key: 'region',
+          key: 'role',
           name: '角色',
           name: '角色',
           width: '180'
           width: '180'
         },
         },
         {
         {
-          key: 'region',
+          key: 'regiontime',
           name: '注册时间',
           name: '注册时间',
           width: '140'
           width: '140'
         },
         },
         {
         {
-          key: 'region',
+          key: 'status',
           name: '状态',
           name: '状态',
           width: '80'
           width: '80'
         },
         },
         {
         {
-          key: 'region',
+          key: 'operate',
           name: '操作',
           name: '操作',
           width: '180'
           width: '180'
         }
         }

+ 7 - 7
src/views/memberManagement/memberList/toolbar.vue

@@ -11,39 +11,39 @@ export default {
       fields: [
       fields: [
         {
         {
           type: 'text',
           type: 'text',
-          name: 'title',
+          name: 'hyid',
           label: '会员ID'
           label: '会员ID'
         },
         },
         {
         {
           type: 'text',
           type: 'text',
-          name: 'status',
+          name: 'phone',
           label: '手机号',
           label: '手机号',
           labelWidth: '100px'
           labelWidth: '100px'
         },
         },
         {
         {
           type: 'select',
           type: 'select',
-          name: 'date',
+          name: 'sex',
           label: '性别'
           label: '性别'
         },
         },
         {
         {
           type: 'select',
           type: 'select',
-          name: 'date',
+          name: 'role',
           label: '角色'
           label: '角色'
         },
         },
         {
         {
           type: 'select',
           type: 'select',
-          name: 'date',
+          name: 'level',
           label: '会员等级'
           label: '会员等级'
         },
         },
         {
         {
           type: 'dateArray',
           type: 'dateArray',
-          name: 'date',
+          name: 'fktime',
           label: '反馈时间',
           label: '反馈时间',
           apiName: ['start', 'end']
           apiName: ['start', 'end']
         },
         },
         {
         {
           type: 'select',
           type: 'select',
-          name: 'date',
+          name: 'status',
           label: '状态'
           label: '状态'
         }
         }
       ]
       ]

+ 2 - 2
src/views/photoManagement/eventsList/modal/ItemModal.vue

@@ -28,7 +28,7 @@
         <el-row>建议尺寸:</el-row>
         <el-row>建议尺寸:</el-row>
       </el-form-item>
       </el-form-item>
 
 
-      <el-form-item label="裂变预览图Logo(照片左上角)">
+      <!-- <el-form-item label="裂变预览图Logo(照片左上角)">
         <upload v-model="form.previewLogo" params="prefix=/activity-logo" />
         <upload v-model="form.previewLogo" params="prefix=/activity-logo" />
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/preview-logo-256*110.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/preview-logo-256*110.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
       </el-form-item>
       </el-form-item>
@@ -36,7 +36,7 @@
       <el-form-item label="裂变高清图Logo(照片左上角)">
       <el-form-item label="裂变高清图Logo(照片左上角)">
         <upload v-model="form.hdLogo" params="prefix=/activity-logo" />
         <upload v-model="form.hdLogo" params="prefix=/activity-logo" />
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/hd-logo-1252*521.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/hd-logo-1252*521.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
-      </el-form-item>
+      </el-form-item> -->
 
 
       <el-form-item label="活动时间" prop="eventTimeArr">
       <el-form-item label="活动时间" prop="eventTimeArr">
         <el-date-picker
         <el-date-picker

+ 4 - 4
src/views/photoManagement/imageGoodsManagement/index.vue

@@ -9,7 +9,7 @@
       :pagination="pagination"
       :pagination="pagination"
       :page-change="pageChange"
       :page-change="pageChange"
     >
     >
-      <template v-slot:batch-btn-box="{ selected }">
+      <!-- <template v-slot:batch-btn-box="{ selected }">
         <el-col :span="1.5">
         <el-col :span="1.5">
           <el-button
           <el-button
             type="primary"
             type="primary"
@@ -18,7 +18,7 @@
             @click="$MultFissonModal()"
             @click="$MultFissonModal()"
           >一键裂变</el-button>
           >一键裂变</el-button>
         </el-col>
         </el-col>
-      </template>
+      </template> -->
     </base-table>
     </base-table>
   </div>
   </div>
 </template>
 </template>
@@ -137,14 +137,14 @@ export default {
           // fetchTagType: val => (val ? 'success' : 'info'),
           // fetchTagType: val => (val ? 'success' : 'info'),
           // tagName: row => (row.isBeautiful ? '是' : '否')
           // tagName: row => (row.isBeautiful ? '是' : '否')
         },
         },
-        {
+        /* {
           key: 'isReady',
           key: 'isReady',
           name: '裂变',
           name: '裂变',
           width: this.$col.s,
           width: this.$col.s,
           type: 'tag',
           type: 'tag',
           fetchTagType: val => (val ? 'success' : 'info'),
           fetchTagType: val => (val ? 'success' : 'info'),
           tagName: row => (row.isReady ? '是' : '否')
           tagName: row => (row.isReady ? '是' : '否')
-        },
+        }, */
         {
         {
           key: 'isShow',
           key: 'isShow',
           name: '上架',
           name: '上架',

+ 2 - 2
src/views/photoManagement/imageGoodsManagement/toolbar.vue

@@ -47,13 +47,13 @@ export default {
           options: setStatus(['是', '否'], [true, false]),
           options: setStatus(['是', '否'], [true, false]),
           format: val => (val !== null && val !== '' ? !!val : null)
           format: val => (val !== null && val !== '' ? !!val : null)
         },
         },
-        {
+        /* {
           type: 'select',
           type: 'select',
           name: 'isReady',
           name: 'isReady',
           label: '裂变',
           label: '裂变',
           options: setStatus(['是', '否'], [true, false]),
           options: setStatus(['是', '否'], [true, false]),
           format: val => (val !== null && val !== '' ? !!val : null)
           format: val => (val !== null && val !== '' ? !!val : null)
-        }
+        } */
       ]
       ]
     };
     };
   }
   }

+ 2 - 7
src/views/photographerManagement/photoVerify/index.vue

@@ -26,9 +26,9 @@
     <toolbar @on-filter="filterData" @on-reset="filterData" />
     <toolbar @on-filter="filterData" @on-reset="filterData" />
 
 
     <div class="m-10 bg-w p-20 br-10">
     <div class="m-10 bg-w p-20 br-10">
-      <el-button type="primary" icon="el-icon-plus" @click="$AliOssMultiModal()"
+      <!-- <el-button type="primary" icon="el-icon-plus" @click="$AliOssMultiModal()"
         >批量上传照片</el-button
         >批量上传照片</el-button
-      >
+      > -->
 
 
       <base-table
       <base-table
         :columns="columns"
         :columns="columns"
@@ -81,11 +81,6 @@ export default {
           minWidth: this.$col.b
           minWidth: this.$col.b
         },
         },
         {
         {
-          key: 'nickname',
-          name: '账号昵称',
-          minWidth: this.$col.b
-        },
-        {
           key: 'phonenumber',
           key: 'phonenumber',
           name: '账号手机号码',
           name: '账号手机号码',
           width: this.$col.m
           width: this.$col.m

+ 2 - 2
src/views/photographerManagement/photographerVerify/index.vue

@@ -80,7 +80,7 @@ export default {
           name: '申请手机号码',
           name: '申请手机号码',
           minWidth: this.$col.m
           minWidth: this.$col.m
         },
         },
-        {
+        /* {
           key: 'logo',
           key: 'logo',
           name: '有关图片',
           name: '有关图片',
           width: this.$col.b,
           width: this.$col.b,
@@ -105,7 +105,7 @@ export default {
                   })
                   })
               }
               }
             })
             })
-        },
+        }, */
         {
         {
           key: 'createAt',
           key: 'createAt',
           name: '申请时间',
           name: '申请时间',

+ 5 - 5
src/views/photographerManagement/photographerVerify/modal/ItemModal.vue

@@ -16,7 +16,7 @@
       <el-form-item label="申请人邮箱">{{ form.email }}</el-form-item>
       <el-form-item label="申请人邮箱">{{ form.email }}</el-form-item>
       <el-form-item label="申请人银行卡号">{{ form.bankCardNumber }}</el-form-item>
       <el-form-item label="申请人银行卡号">{{ form.bankCardNumber }}</el-form-item>
       <el-form-item label="证照号码"> {{ form.idCardNumber }} </el-form-item>
       <el-form-item label="证照号码"> {{ form.idCardNumber }} </el-form-item>
-      <el-form-item label="半身照"
+      <!-- <el-form-item label="半身照"
         ><img
         ><img
           :src="form.bodyPhoto"
           :src="form.bodyPhoto"
           class="pre-img"
           class="pre-img"
@@ -51,14 +51,14 @@
               })
               })
           "
           "
         />
         />
-      </el-form-item>
+      </el-form-item> -->
 
 
       <el-form-item label="常用相机型号"> {{ form.cameraModel }} </el-form-item>
       <el-form-item label="常用相机型号"> {{ form.cameraModel }} </el-form-item>
       <el-form-item label="经常合作场景"> {{ form.cooperationScenario }} </el-form-item>
       <el-form-item label="经常合作场景"> {{ form.cooperationScenario }} </el-form-item>
       <el-form-item label="每月可拍摄天数"> {{ form.shootingDaysPerMonth }} </el-form-item>
       <el-form-item label="每月可拍摄天数"> {{ form.shootingDaysPerMonth }} </el-form-item>
       <el-form-item label="可能拍摄时间"> {{ form.possibleShootingTime }} </el-form-item>
       <el-form-item label="可能拍摄时间"> {{ form.possibleShootingTime }} </el-form-item>
       <el-form-item label="个人拍摄经验"> {{ form.personalShootingExperience }} </el-form-item>
       <el-form-item label="个人拍摄经验"> {{ form.personalShootingExperience }} </el-form-item>
-      <el-form-item label="作品集">
+      <!-- <el-form-item label="作品集">
         <img
         <img
           :src="form.sampleReels"
           :src="form.sampleReels"
           class="pre-img"
           class="pre-img"
@@ -69,7 +69,7 @@
               })
               })
           "
           "
         />
         />
-      </el-form-item>
+      </el-form-item> -->
 
 
       <el-form-item label="审核状态" prop="auditStatus">
       <el-form-item label="审核状态" prop="auditStatus">
         <el-radio-group v-if="auditStatus !== 1" v-model="form.auditStatus">
         <el-radio-group v-if="auditStatus !== 1" v-model="form.auditStatus">
@@ -131,7 +131,7 @@ export default {
 
 
   data() {
   data() {
     return {
     return {
-      title: '摄影师详情',
+      title: '摄影师作品详情',
       modal: true,
       modal: true,
       form: {
       form: {
         auditStatus: null,
         auditStatus: null,

+ 1 - 1
src/views/pointsManagement/pointsSetting/index.vue

@@ -41,7 +41,7 @@
 
 
 
 
         <el-divider content-position="left">现金相关</el-divider>
         <el-divider content-position="left">现金相关</el-divider>
-        <el-form-item label="照片购买摄影师分成(%)">
+        <el-form-item label="照片购买摄影师作品分成(%)">
           <el-input-number controls-position="right" v-model="form.CASH_PHOTOER_INCOME" style="width: 100%;" :precision="2" :step="0.1" :min="0"></el-input-number>
           <el-input-number controls-position="right" v-model="form.CASH_PHOTOER_INCOME" style="width: 100%;" :precision="2" :step="0.1" :min="0"></el-input-number>
         </el-form-item>
         </el-form-item>
         <el-form-item label="购买随手拍高清图统一原价格">
         <el-form-item label="购买随手拍高清图统一原价格">

+ 4 - 4
src/views/sceneManagement/sceneList/index.vue

@@ -26,9 +26,9 @@
     <toolbar @on-filter="filterData" @on-reset="filterData" />
     <toolbar @on-filter="filterData" @on-reset="filterData" />
 
 
     <div class="m-10 bg-w p-20 br-10">
     <div class="m-10 bg-w p-20 br-10">
-      <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
+      <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
         >新增</el-button
         >新增</el-button
-      >
+      > -->
       <base-table
       <base-table
         :columns="columns"
         :columns="columns"
         :items="items"
         :items="items"
@@ -148,7 +148,7 @@ export default {
                 '编辑'
                 '编辑'
               )
               )
             );
             );
-            action.push(
+            /* action.push(
               h(
               h(
                 'el-button',
                 'el-button',
                 {
                 {
@@ -164,7 +164,7 @@ export default {
                 },
                 },
                 '发送邮件'
                 '发送邮件'
               )
               )
-            );
+            ); */
             action.push(
             action.push(
               h(
               h(
                 'BaseBtn',
                 'BaseBtn',

+ 14 - 14
src/views/sceneManagement/sceneList/modal/ItemModal.vue

@@ -43,22 +43,22 @@
           placeholder="请输入场景介绍"
           placeholder="请输入场景介绍"
         />
         />
       </el-form-item>
       </el-form-item>
-      <el-form-item label="封面图" prop="cover" required>
+      <!-- <el-form-item label="封面图" prop="cover" required>
         <upload v-model="form.cover" :limit="9" params="prefix=/kindergarten-cover" />
         <upload v-model="form.cover" :limit="9" params="prefix=/kindergarten-cover" />
         <el-row>建议尺寸:</el-row>
         <el-row>建议尺寸:</el-row>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="场景Logo" prop="logo" required>
       <el-form-item label="场景Logo" prop="logo" required>
         <upload v-model="form.logo" params="prefix=/kindergarten-logo"/>
         <upload v-model="form.logo" params="prefix=/kindergarten-logo"/>
         <el-row>建议尺寸:</el-row>
         <el-row>建议尺寸:</el-row>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="裂变预览图Logo(照片右下角)" prop="previewLogo" required>
+      <!-- <el-form-item label="裂变预览图Logo(照片右下角)" prop="previewLogo" required>
         <upload v-model="form.previewLogo" params="prefix=/kindergarten-logo" />
         <upload v-model="form.previewLogo" params="prefix=/kindergarten-logo" />
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/preview-logo-256*110.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/preview-logo-256*110.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
       </el-form-item>
       </el-form-item>
       <el-form-item label="裂变高清图Logo(照片右下角)" prop="hdLogo" required>
       <el-form-item label="裂变高清图Logo(照片右下角)" prop="hdLogo" required>
         <upload v-model="form.hdLogo" params="prefix=/kindergarten-logo" />
         <upload v-model="form.hdLogo" params="prefix=/kindergarten-logo" />
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/hd-logo-1252*521.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
         <el-row>建议尺寸:<a href="http://youxiangle.cn/yxl-back-end/static/yxl/fission/hd-logo-1252*521.psd" target="_blank" style="color: rgb(245, 108, 108);">下载psd</a></el-row>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="显示/隐藏" prop="isShow">
       <el-form-item label="显示/隐藏" prop="isShow">
         <el-radio-group v-model="form.isShow">
         <el-radio-group v-model="form.isShow">
           <el-radio :label="true">显示</el-radio>
           <el-radio :label="true">显示</el-radio>
@@ -68,11 +68,11 @@
 
 
       <el-divider content-position="left">以下为认证信息</el-divider>
       <el-divider content-position="left">以下为认证信息</el-divider>
 
 
-      <el-form-item label="营业执照" prop="businessLicense" required>
+      <!-- <el-form-item label="营业执照" prop="businessLicense" required>
         <upload
         <upload
           v-model="form.businessLicense"
           v-model="form.businessLicense"
           :uploadUrl="$upload('/yxl-back-end/framework/oss/minio/upload')"
           :uploadUrl="$upload('/yxl-back-end/framework/oss/minio/upload')"
-        />
+        /> -->
       </el-form-item>
       </el-form-item>
       <el-form-item label="申请人姓名" prop="realName">
       <el-form-item label="申请人姓名" prop="realName">
         <el-input v-model="form.realName" placeholder="请输入申请人姓名" />
         <el-input v-model="form.realName" placeholder="请输入申请人姓名" />
@@ -86,7 +86,7 @@
       <el-form-item label="证照号码" prop="idCardNumber">
       <el-form-item label="证照号码" prop="idCardNumber">
         <el-input v-model="form.idCardNumber" placeholder="请输入证照号码" />
         <el-input v-model="form.idCardNumber" placeholder="请输入证照号码" />
       </el-form-item>
       </el-form-item>
-      <el-form-item label="半身照" prop="bodyPhoto" required>
+      <!-- <el-form-item label="半身照" prop="bodyPhoto" required>
         <upload
         <upload
           v-model="form.bodyPhoto"
           v-model="form.bodyPhoto"
           :uploadUrl="$upload('/yxl-back-end/framework/oss/minio/upload')"
           :uploadUrl="$upload('/yxl-back-end/framework/oss/minio/upload')"
@@ -103,7 +103,7 @@
           v-model="form.idCardBack"
           v-model="form.idCardBack"
           :uploadUrl="$upload('/yxl-back-end/framework/oss/minio/upload')"
           :uploadUrl="$upload('/yxl-back-end/framework/oss/minio/upload')"
         />
         />
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     </el-form>
     <span slot="footer" class="dialog-footer">
     <span slot="footer" class="dialog-footer">
       <el-button @click="modal = false">取消</el-button>
       <el-button @click="modal = false">取消</el-button>
@@ -180,12 +180,12 @@ export default {
         address: [{ required: true, min: 4, max: 255, message: '请输入详细地址(4 ~ 255个字符)', trigger: 'change' }],
         address: [{ required: true, min: 4, max: 255, message: '请输入详细地址(4 ~ 255个字符)', trigger: 'change' }],
         phonenumber: [{ required: true, min: 4, max: 64, message: '请输入办公电话(4 ~ 64个字符)', trigger: 'change' }],
         phonenumber: [{ required: true, min: 4, max: 64, message: '请输入办公电话(4 ~ 64个字符)', trigger: 'change' }],
         brief: [{ required: true, min: 4, max: 255, message: '请输入场景介绍(4 ~ 255个字符)', trigger: 'change' }],
         brief: [{ required: true, min: 4, max: 255, message: '请输入场景介绍(4 ~ 255个字符)', trigger: 'change' }],
-        cover: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }],
+        /* cover: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }], */
         logo: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change'}],
         logo: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change'}],
-        previewLogo: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change'}],
-        hdLogo: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change'}],
+        /* previewLogo: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change'}],
+        hdLogo: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change'}], 
 
 
-        businessLicense: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }],
+        businessLicense: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }],*/
         realName: [{ required: true, min: 2, max: 64, message: '请输入申请人姓名(2 ~ 64个字符)', trigger: 'change' }],
         realName: [{ required: true, min: 2, max: 64, message: '请输入申请人姓名(2 ~ 64个字符)', trigger: 'change' }],
         personPhonenumber: [{ required: true, min: 4, max: 64, message: '请输入手机号(4 ~ 64个字符)', trigger: 'change' }],
         personPhonenumber: [{ required: true, min: 4, max: 64, message: '请输入手机号(4 ~ 64个字符)', trigger: 'change' }],
         email: [
         email: [
@@ -193,9 +193,9 @@ export default {
           { validator: checkEmail, trigger: 'blur' }
           { validator: checkEmail, trigger: 'blur' }
         ],
         ],
         idCardNumber: [{ required: true, min: 4, max: 64, message: '请输入证照号码(4 ~ 64个字符)', trigger: 'change' }],
         idCardNumber: [{ required: true, min: 4, max: 64, message: '请输入证照号码(4 ~ 64个字符)', trigger: 'change' }],
-        bodyPhoto: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }],
+        /* bodyPhoto: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }],
         idCardFront: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }],
         idCardFront: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }],
-        idCardBack: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }]
+        idCardBack: [{ type: 'array', required: true, message: '请上传图片', trigger: 'change' }] */
       }
       }
     };
     };
   },
   },

+ 8 - 8
src/views/sceneManagement/sceneVerify/modal/ItemModal.vue

@@ -17,7 +17,7 @@
       <el-form-item label="详细地址"> {{ form.address }} </el-form-item>
       <el-form-item label="详细地址"> {{ form.address }} </el-form-item>
       <el-form-item label="办公电话"> {{ form.phonenumber }} </el-form-item>
       <el-form-item label="办公电话"> {{ form.phonenumber }} </el-form-item>
       <el-form-item label="场景介绍"> {{ form.brief }} </el-form-item>
       <el-form-item label="场景介绍"> {{ form.brief }} </el-form-item>
-      <el-form-item label="封面图"
+      <!-- <el-form-item label="封面图"
       ><img
       ><img
         :src="form.cover"
         :src="form.cover"
         class="pre-img"
         class="pre-img"
@@ -28,7 +28,7 @@
               })
               })
           "
           "
       />
       />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="场景Logo">
       <el-form-item label="场景Logo">
         <img
         <img
           :src="form.logo"
           :src="form.logo"
@@ -41,7 +41,7 @@
           "
           "
         />
         />
       </el-form-item>
       </el-form-item>
-      <el-form-item label="裂变预览图Logo(照片右下角)">
+      <!-- <el-form-item label="裂变预览图Logo(照片右下角)">
         <img
         <img
           :src="form.previewLogo"
           :src="form.previewLogo"
           class="pre-img"
           class="pre-img"
@@ -64,11 +64,11 @@
               })
               })
           "
           "
         />
         />
-      </el-form-item>
+      </el-form-item> -->
 
 
       <el-divider content-position="left">以下为认证信息</el-divider>
       <el-divider content-position="left">以下为认证信息</el-divider>
 
 
-      <el-form-item label="营业执照"
+      <!-- <el-form-item label="营业执照"
         ><img
         ><img
           :src="form.businessLicense"
           :src="form.businessLicense"
           class="pre-img"
           class="pre-img"
@@ -79,12 +79,12 @@
               })
               })
           "
           "
         />
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="申请人姓名"> {{ form.realName }} </el-form-item>
       <el-form-item label="申请人姓名"> {{ form.realName }} </el-form-item>
       <el-form-item label="手机号"> {{ form.personPhonenumber }} </el-form-item>
       <el-form-item label="手机号"> {{ form.personPhonenumber }} </el-form-item>
       <el-form-item label="邮箱"> {{ form.email }} </el-form-item>
       <el-form-item label="邮箱"> {{ form.email }} </el-form-item>
       <el-form-item label="证照号码"> {{ form.idCardNumber }} </el-form-item>
       <el-form-item label="证照号码"> {{ form.idCardNumber }} </el-form-item>
-      <el-form-item label="半身照"
+      <!-- <el-form-item label="半身照"
         ><img
         ><img
           :src="form.bodyPhoto"
           :src="form.bodyPhoto"
           class="pre-img"
           class="pre-img"
@@ -119,7 +119,7 @@
               })
               })
           "
           "
         />
         />
-      </el-form-item>
+      </el-form-item> -->
 
 
       <el-divider content-position="left">以下为审核信息</el-divider>
       <el-divider content-position="left">以下为审核信息</el-divider>
 
 

+ 2 - 2
src/views/sceneManagement/sceneVerify/toolbar.vue

@@ -30,11 +30,11 @@ export default {
           label: '类型',
           label: '类型',
           options: SCENETYPE
           options: SCENETYPE
         },
         },
-        {
+        /* {
           type: 'AccountSelect',
           type: 'AccountSelect',
           name: 'accountId',
           name: 'accountId',
           label: '账号'
           label: '账号'
-        },
+        }, */
         {
         {
           type: 'dateArray',
           type: 'dateArray',
           name: 'date',
           name: 'date',

+ 2 - 2
src/views/statistics/uploadImage/toolbar.vue

@@ -9,11 +9,11 @@ export default {
   data() {
   data() {
     return {
     return {
       fields: [
       fields: [
-        {
+        /* {
           type: 'text',
           type: 'text',
           name: 'photoWarehouseId',
           name: 'photoWarehouseId',
           label: '照片编号'
           label: '照片编号'
-        },
+        }, */
         {
         {
           type: 'SceneSelect',
           type: 'SceneSelect',
           name: 'kindergartenId',
           name: 'kindergartenId',

+ 9 - 0
yxl-web-admin-frontend.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>