Merge branch 'master' into dev

# Conflicts:
#	src/containers/sceneSelect/SceneSelect.vue

src/api/scene/index.js

@@ -4,8 +4,6 @@ export const getPage = params =>
 	api.post(`/yxl-back-end/admin/kindergarten/page`, params);
 export const getCount = params =>
 	api.post(`/yxl-back-end/admin/kindergarten/count`, params);
-export const getList = params =>
-	api.post(`/yxl-back-end/admin/kindergarten/list`, params);
 export const getItem = ({ id, ...params }) =>
 	api.get(`/yxl-back-end/admin/kindergarten/${id}`, params);
 export const saveItem = ({ id, ...params }) => {

src/containers/sceneSelect/SceneSelect.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { getList } from '@/api/scene';
+import { getPage } from '@/api/scene';
 
 export default {
   name: 'SceneSelect',
@@ -57,12 +57,14 @@ export default {
     },
 
     async loadData() {
-      const { success, data, msg } = await getList({
+      const { success, data, msg } = await getPage({
+        isDel: false,
+        auditStatus: 1,
         page: 1,
         size: 999999
       });
       if (success) {
-        this.options = data.map(x => ({
+        this.options = data.data.map(x => ({
           value: x.id,
           label: x.name
         }));

src/views/baseManagement/updateList/index.vue

@@ -37,23 +37,28 @@ export default {
       columns: [
         {
           key: 'productName',
-          name: '版本名',
-          minWidth: this.$col.m
+          name: '产品名称',
+          width: this.$col.m
         },
         {
-          key: 'versionNumber',
-          name: '版本号',
+          key: 'platform',
+          name: '平台',
+          width: this.$col.m
+        },
+        {
+          key: 'versionCode',
+          name: '版本编码',
           minWidth: this.$col.b
         },
         {
-          key: 'platform',
-          name: '客户端',
-          width: this.$col.m
+          key: 'versionNumber',
+          name: '版本号',
+          minWidth: this.$col.b
         },
         {
           key: 'downloadUrl',
           name: '下载地址',
-          minWidth: this.$col.m
+          minWidth: this.$col.b
         },
         {
           key: 'upgradeDesc',

src/views/baseManagement/updateList/modal/ItemModal.vue

@@ -11,26 +11,29 @@
     "
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-      <el-form-item label="版本名" prop="productName">
+      <el-form-item label="产品名称" prop="productName">
         <el-input v-model="form.productName"></el-input>
       </el-form-item>
 
+      <el-form-item label="平台">
+        <el-radio-group v-model="form.platform" prop="platform">
+          <el-radio label="Android">Android</el-radio>
+          <el-radio label="iOS">iOS</el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item label="版本编码" prop="versionCode">
+        <el-input v-model="form.versionCode"></el-input>
+      </el-form-item>
+
       <el-form-item label="版本号" prop="versionNumber">
         <el-input v-model="form.versionNumber"></el-input>
       </el-form-item>
 
-      <el-form-item label="下载地址" prop="downloadUrl">
+      <el-form-item label="下载地址">
         <el-input v-model="form.downloadUrl"></el-input>
       </el-form-item>
 
-      <el-form-item label="客户端">
-        <el-radio-group v-model="form.platform" prop="platform">
-          <el-radio label="Android">Android</el-radio>
-          <!-- // todo 前端判断更改成大写IOS -->
-          <el-radio label="iOS">iOS</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
       <el-form-item label="强制更新">
         <el-radio-group v-model="form.isForceUpgrade" prop="isForceUpgrade">
           <el-radio :label="true">开启</el-radio>
@@ -46,7 +49,7 @@
       </el-form-item>
 
       <el-form-item label="升级备注">
-        <el-input v-model="form.upgradeDesc"></el-input>
+        <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="form.upgradeDesc"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -74,23 +77,24 @@ export default {
       modal: true,
 
       form: {
-        productName: '',
+        productName: '幼享乐',
+        versionCode: '',
         versionNumber: '',
         downloadUrl: '',
         isShow: false,
         isForceUpgrade: false,
         platform: 'Android',
-        upgradeDesc: null
+        upgradeDesc: '1. 优化产品体验，修复若干问题'
       },
       rules: {
         productName: [
-          { required: true, message: '请输入版本名', trigger: 'change' }
+          { required: true, message: '请输入产品名称', trigger: 'change' }
+        ],
+        versionCode: [
+          { required: true, message: '请输入版本编码', trigger: 'change' }
         ],
         versionNumber: [
           { required: true, message: '请输入版本号', trigger: 'change' }
-        ],
-        downloadUrl: [
-          { required: true, message: '请输入下载地址', trigger: 'change' }
         ]
       }
     };
@@ -111,16 +115,23 @@ export default {
   methods: {
     handleConfirm() {
       this.$refs.form.validate(async valid => {
-        if (valid) {
-          const params = Object.assign({}, this.form);
-          params.cover = '';
-          if (this.id) params.id = this.id;
-          const { success, msg } = await saveItem(params);
-          if (success) {
-            this.$success('保存成功！');
-            this.modal = false;
-            this.$g_emit('update_app_reload');
-          }
+        if (!valid) {
+          return false;
+        }
+
+        if (this.form.platform === 'Android' && !this.form.downloadUrl) {
+          this.$error('Android端，下载地址为必填！~');
+          return false;
+        }
+
+        const params = Object.assign({}, this.form);
+        params.cover = '';
+        if (this.id) params.id = this.id;
+        const { success, msg } = await saveItem(params);
+        if (success) {
+          this.$success('保存成功！');
+          this.modal = false;
+          this.$g_emit('update_app_reload');
         }
       });
     }

src/views/baseManagement/updateList/toolbar.vue

@@ -13,13 +13,18 @@ export default {
       fields: [
         {
           type: 'text',
+          name: 'productName',
+          label: '产品名称'
+        },
+        {
+          type: 'text',
           name: 'platform',
           label: '平台'
         },
         {
           type: 'text',
-          name: 'productName',
-          label: '版本名'
+          name: 'versionCode',
+          label: '版本编码'
         },
         {
           type: 'text',

src/views/photoManagement/imageGoodsManagement/index.vue

@@ -40,13 +40,13 @@ export default {
           width: this.$col.b
         },
         {
-          key: 'activityName',
-          name: '活动',
+          key: 'kindergartenName',
+          name: '场景名称',
           minWidth: this.$col.b
         },
         {
-          key: 'nickname',
-          name: '账号昵称',
+          key: 'activityName',
+          name: '活动名称',
           minWidth: this.$col.b
         },
         {
@@ -107,7 +107,6 @@ export default {
           type: 'switch',
           switchName: ['是', '否'],
           api: async row => {
-            console.log(row);
             row.isBeautiful = !row.isBeautiful;
             const { success } = await updateItem(row);
             if (success) {
@@ -142,7 +141,6 @@ export default {
           type: 'switch',
           switchName: ['上架', '下架'],
           api: async row => {
-            console.log(row);
             row.isShow = !row.isShow;
             const { success } = await updateItem(row);
             if (success) {

src/views/photoManagement/photoVerifyManagement/index.vue

@@ -94,13 +94,13 @@ export default {
           width: this.$col.b
         },
         {
-          key: 'activityName',
-          name: '活动',
+          key: 'kindergartenName',
+          name: '场景名称',
           minWidth: this.$col.b
         },
         {
-          key: 'nickname',
-          name: '账号昵称',
+          key: 'activityName',
+          name: '活动名称',
           minWidth: this.$col.b
         },
         {
@@ -146,7 +146,7 @@ export default {
         },
         {
           key: 'auditStatus',
-          name: '状态',
+          name: '审核状态',
           width: this.$col.s,
           type: 'tag',
           fetchTagType: val => {

src/views/photoManagement/photoVerifyManagement/modal/MultItemModal.vue

@@ -75,7 +75,7 @@ export default {
             auditMsg: this.form.auditMsg
           };
           if (this.ids.length > 0) params.ids = this.ids;
-          console.log(params)
+
           const { success, msg } = await auditMultiItem(params);
           if (success) {
             this.$success('保存成功！');

src/views/photographerManagement/photoVerify/index.vue

@@ -69,8 +69,13 @@ export default {
           width: this.$col.b
         },
         {
+          key: 'kindergartenName',
+          name: '场景名称',
+          minWidth: this.$col.b
+        },
+        {
           key: 'activityName',
-          name: '活动',
+          name: '活动名称',
           minWidth: this.$col.b
         },
         {
@@ -121,7 +126,7 @@ export default {
         },
         {
           key: 'auditStatus',
-          name: '状态',
+          name: '审核状态',
           width: this.$col.s,
           type: 'tag',
           fetchTagType: val => {

src/views/photographerManagement/photoVerify/modal/ali-oss-multi.vue

@@ -174,17 +174,13 @@ export default {
                 file.file.progressFlag= true;
                 file.file.percentage= Math.floor(p * 100);
                 file.file.progressPercent= Math.abs(file.file.percentage.toFixed(0));
-                console.log(p);
-                console.log(_that.fileList);
-                console.log('------ali-oss-multi.vue')
+
                 _that.showProgress = true;
                 _that.progress = Math.floor(p * 100);
               }
-            })
-            .then(result => { // 上传成功返回值，可针对项目需求写其他逻辑
+            }).then(result => { // 上传成功返回值，可针对项目需求写其他逻辑
               _that.saveData(result, file.file.name, file.file.size);
-            })
-            .catch(err => {
+            }).catch(err => {
               console.log('err:', err);
             });
         }