梁展鹏 3 éve
szülő
commit
b02eb89dd6

+ 13 - 8
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',

+ 38 - 27
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');
         }
       });
     }

+ 7 - 2
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',