1、修改APP扫码开关管理功能和接口

2、修改居民端启动页管理功能和接口

src/views/modules/api/scanswitch-add-or-update.vue

@@ -13,6 +13,12 @@
         <el-input v-model="dataForm.versionNum"
                   placeholder="版本号"></el-input>
       </el-form-item>
+      <el-form-item label="平台" prop="platform">
+        <el-select v-model="dataForm.platform" placeholder="平台">
+          <el-option v-for="item in platformArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="扫码开关" prop="scanFlag">
         <el-select v-model="dataForm.scanFlag" placeholder="扫码开关">
           <el-option v-for="item in scanFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
@@ -55,7 +61,8 @@ export default {
         creator: '',
         createdTime: '',
         updater: '',
-        updatedTime: ''
+        updatedTime: '',
+        platform: ''
       },
       scanFlagArr: [
         { dictValue: 0, dictName: '关闭扫码' },
@@ -64,6 +71,10 @@ export default {
       maintainFlagArr: [
         { maintainValue: 0, maintainName: '关闭维护' },
         { maintainValue: 1, maintainName: '开启维护' }
+      ],
+      platformArr: [
+        { dictValue: '0', dictName: 'e锦水' },
+        { dictValue: '1', dictName: '志愿者去哪' }
       ]
     }
   },
@@ -93,6 +104,9 @@ export default {
         ],
         updateTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        platform: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -110,7 +124,6 @@ export default {
     // 获取信息
     getInfo () {
       this.$http.get(`/api/ma/${this.dataForm.id}`).then(({ data: res }) => {
-        console.log(1111111)
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }

src/views/modules/api/scanswitch.vue

@@ -36,6 +36,11 @@
                          show-overflow-tooltip
                          align="center"
                          width="50"></el-table-column>
+        <el-table-column prop="platform"
+                         label="平台"
+                         header-align="center"
+                         :formatter="platformFormatter"
+                         align="center"></el-table-column>
         <el-table-column prop="versionNum"
                          label="版本号"
                          header-align="center"
@@ -129,6 +134,13 @@ export default {
       } else {
         return '开启维护'
       }
+    },
+    platformFormatter: function (row, column) {
+      if (row.platform === '0') {
+        return 'e锦水'
+      } else if (row.platform === '1') {
+        return '志愿者去哪'
+      }
     }
   }
 }

src/views/modules/api/startuppage-add-or-update.vue

@@ -1,7 +1,13 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-         <el-form-item prop="imgUrl"
+      <el-form-item label="平台" prop="platform">
+        <el-select v-model="dataForm.platform" placeholder="平台">
+          <el-option v-for="item in platformArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="imgUrl"
                         v-loading="loading"
                         label="图片">
             <el-upload class="avatar-uploader"
@@ -67,7 +73,8 @@ export default {
         createdTime: '',
         updatedBy: '',
         updatedTime: '',
-        delFlag: ''
+        delFlag: '',
+        platform: ''
       },
       uploadUrl: '',
       loading: false,
@@ -81,7 +88,11 @@ export default {
           value: '0'
         }
       ],
-      btnAble: false
+      btnAble: false,
+      platformArr: [
+        { dictValue: '0', dictName: 'e锦水' },
+        { dictValue: '1', dictName: '志愿者去哪' }
+      ]
     }
   },
   computed: {
@@ -98,6 +109,9 @@ export default {
         ],
         sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        platform: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }

src/views/modules/api/startuppage.vue

@@ -12,6 +12,11 @@
             {{scope.$index+1}}
           </template>
         </el-table-column>
+        <el-table-column prop="platform"
+                         label="平台"
+                         header-align="center"
+                         :formatter="platformFormatter"
+                         align="center"></el-table-column>
         <el-table-column prop="imgUrl" label="图片" header-align="center" align="center">
           <template slot-scope="scope">
             <el-image
@@ -79,6 +84,13 @@ export default {
       } else if (enableFlag === '1') {
         return '是'
       }
+    },
+    platformFormatter: function (row, column) {
+      if (row.platform === '0') {
+        return 'e锦水'
+      } else if (row.platform === '1') {
+        return '志愿者去哪'
+      }
     }
   }
 }