Bladeren bron

Merge branch 'develop_szhj' of jianguan-web/qpls-it-html into develop

李磊 3 jaren geleden
bovenliggende
commit
14c72e1a0d
2 gewijzigde bestanden met toevoegingen van 23 en 14 verwijderingen
  1. 22 12
      src/views/appSetting/versionSettings/editModal.vue
  2. 1 2
      vue.config.js

+ 22 - 12
src/views/appSetting/versionSettings/editModal.vue

@@ -22,6 +22,7 @@
           id="versionSettingsList-versionType"
           code="VERSION_TYPE"
           placeholder="请选择版本类型"
+          @change="changeType"
           allowClear></v-select>
       </a-form-model-item>
       <a-form-model-item label="版本号" prop="version">
@@ -60,17 +61,21 @@
         <a-textarea id="versionSettingsList-upgradeContent" :maxLength="500" v-model="form.upgradeContent" :placeholder="'请输入升级内容(最多500个字符)'" allowClear />
       </a-form-model-item>
       <a-form-model-item label="附件" prop="attachment" v-if="form.versionType!='IOS'">
-        <Upload
-          id="versionSettingsList-attachment"
-          ref="attachment"
-          :maxNums="1"
-          :fileSize="100"
-          fileType="application/vnd.android.package-archive"
-          :action="attachAction"
-          :uploadParams="uploadParams"
-          @change="changeImport"
-          upText="附件上传"></Upload>
-        <div style="line-height: 16px;padding-top: 10px;color: #999;">(上传apk格式文件)</div>
+        <div style="display: flex;">
+          <div>
+            <Upload
+              id="versionSettingsList-attachment"
+              ref="attachment"
+              :maxNums="1"
+              :fileSize="100"
+              fileType="application/vnd.android.package-archive"
+              :action="attachAction"
+              :uploadParams="uploadParams"
+              @change="changeImport"
+              upText="附件上传"></Upload>
+          </div>
+          <div style="line-height: 16px;padding-top: 10px;color: #999;">(上传apk格式文件)</div>
+        </div>
       </a-form-model-item>
       <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
         <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
@@ -117,7 +122,7 @@ export default {
         version: [ { required: true, message: '请输入版本号', trigger: 'blur' } ],
         publicDate: [ { required: true, message: '请选择更新时间', trigger: 'change' } ],
         forceUpgrade: [ { required: true, message: '请选择是否强制升级', trigger: 'change' } ],
-        downloadUrl: [ { required: true, message: '请输入', trigger: 'blur' } ],
+        downloadUrl: [ { required: false, message: '请输入更新地址', trigger: 'blur' } ],
         upgradeContent: [ { required: true, message: '请输入升级内容', trigger: 'blur' } ],
         attachment: [ { required: true, message: '请上传app安装文件', trigger: 'change' } ]
       },
@@ -133,6 +138,11 @@ export default {
     }
   },
   methods: {
+    changeType (val) {
+      console.log(val)
+      this.rules.downloadUrl[0].required = val == 'IOS'
+      this.$refs.ruleForm.clearValidate()
+    },
     // 保存
     handleSubmit () {
       const _this = this

+ 1 - 2
vue.config.js

@@ -109,8 +109,7 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.103:8501/qpls-it',
-        target: 'http://qpls-it.360arrow.com.cn/qpls-it',
-        // target: 'https://it.test.qiubcar.com/zyit',
+        target: 'http://p.it.360arrow.com/qpls-it',
         ws: false,
         changeOrigin: true,
         pathRewrite: {