浏览代码

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

魏志佳 5 年之前
父节点
当前提交
951e26b4bd

+ 1 - 0
src/utils/request.js

@@ -13,6 +13,7 @@ if (process.env.NODE_ENV == 'development') {
 else if (process.env.NODE_ENV == 'debug') { 
 } 
 else if (process.env.NODE_ENV == 'production') { 
+    // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
 axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
 }
 const service = axios.create({

+ 1 - 1
src/views/modules/kuaishouapp/account/advertisingGroup.vue

@@ -227,7 +227,7 @@
           <a-radio-group buttonStyle="solid" v-decorator="[
           'createType',
            {
-            initialValue:'1' } ]" @change="createUnitName">l
+            initialValue:'1' } ]" @change="createUnitName">
             <a-radio-button value="1">系统生成</a-radio-button>
             <a-radio-button value="2">自定义</a-radio-button>
           </a-radio-group>

+ 1 - 1
src/views/modules/kuaishouapp/account/editGroup.vue

@@ -29,7 +29,7 @@
     <a-form @submit="handleSubmit" :form="form">
       <a-form-item label="目标应用" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
         :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }" v-if="campaignType == '2'">
-        <a-select disabled v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch
+        <a-select :disabled="typeCopy=='edit'" v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch
           allowClear placeholder="选择应用目标" optionFilterProp="children" style="width: 500px" @focus="handleFocus"
           @blur="handleBlur" @change="handleChange" :filterOption="filterOption">
           <a-select-option value="0">请选择目标应用</a-select-option>

+ 1 - 1
src/views/modules/kuaishouapp/account/editGroupNew.vue

@@ -29,7 +29,7 @@
     <a-form @submit="handleSubmit" :form="form">
       <a-form-item label="目标应用" :labelCol="{ lg: { span: 7 }, sm: { span: 7 } }"
         :wrapperCol="{ lg: { span: 10 }, sm: { span: 17 } }" v-if="campaignType == '2'">
-        <a-select disabled v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch
+        <a-select v-decorator="['appId', { rules: [{ required: true, message: '请选择目标应用' }] }]" showSearch
           allowClear placeholder="选择应用目标" optionFilterProp="children" style="width: 500px" @focus="handleFocus"
           @blur="handleBlur" @change="handleChange" :filterOption="filterOption">
           <a-select-option value="0">请选择目标应用</a-select-option>

+ 2 - 5
src/views/modules/kuaishouapp/account/stepForm/Step3.vue

@@ -235,7 +235,7 @@
       </template>
       <a-form-item label="" class="add-image-material">
         <upload-to-ali style="width:100%" v-model="urlListImage.url" :customDomain="customDomain" :multiple="true"
-          preview :region="region" :bucket="bucket" :accept="acceptImage" :max="15" :size="1024000"
+          preview :region="region" :bucket="bucket" :accept="acceptImage" :max="15" :size="2048"
           :accessKeyId="accessKeyId" :accessKeySecret="accessKeySecret" :before-upload="fileWater" :dir="dirImg"
           @delete='deleteImage' @loaded="overUploadImage"></upload-to-ali>
         <span v-if="material.filter(item => item == false).length > 0 && urlListImage.url.length > 0"
@@ -503,16 +503,13 @@
         region: 'oss-cn-beijing',
         bucket: 'ctop-media',
         acceptVideo: 'video/mpeg,video/mp4',
-        acceptImage: 'image/jpeg,image/jpg,image/png',
+        acceptImage: 'image/jpeg,image/jpg',
         accessKeyId: 'LTAIbNbqWzSOklQV',
         accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
         messageTip: null
       }
     },
     methods: {
-      a() {
-        alert(1)
-      },
       showTitle(index, bestIndex) {
         nowIndex = index
         bestIndex = bestIndex

+ 6 - 6
src/views/modules/material/videoMaterial.vue

@@ -545,7 +545,7 @@ a {
                           :bucket="bucket"
                           :accept="acceptImage"
                           :max="10"
-                          :size="1024000"
+                          :size="2048"
                           :accessKeyId="accessKeyId"
                           :accessKeySecret="accessKeySecret"
                           :dir="dirImg"
@@ -650,7 +650,7 @@ a {
           :bucket="bucket"
           :accept="acceptImage"
           :max="10"
-          :size="1024000"
+          :size="2048"
           :accessKeyId="accessKeyId"
           :accessKeySecret="accessKeySecret"
           :before-upload="fileWater"
@@ -766,7 +766,7 @@ a {
             :bucket="bucket"
             :accept="acceptImage"
             :max="10"
-            :size="1024000"
+            :size="2048"
             :accessKeyId="accessKeyId"
             :accessKeySecret="accessKeySecret"
             :before-upload="fileWater"
@@ -1054,7 +1054,7 @@ a {
                   :bucket="bucket"
                   :accept="acceptImage"
                   :max="10"
-                  :size="1024000"
+                  :size="2048"
                   :accessKeyId="accessKeyId"
                   :accessKeySecret="accessKeySecret"
                   :dir="dirImg"
@@ -1114,7 +1114,7 @@ a {
                         :bucket="bucket"
                         :accept="acceptImage"
                         :max="10"
-                        :size="1024000"
+                        :size="2048"
                         :accessKeyId="accessKeyId"
                         :accessKeySecret="accessKeySecret"
                         :dir="dirImg"
@@ -1365,7 +1365,7 @@ export default {
       region: 'oss-cn-beijing',
       bucket: 'ctop-media',
       acceptVideo: 'video/mpeg,video/mp4',
-      acceptImage: 'image/jpeg,image/jpg,image/png',
+      acceptImage: 'image/jpeg,image/jpg',
       accessKeyId: 'LTAIbNbqWzSOklQV',
       accessKeySecret: '1rkPz7JNoXk8sJevPaeYHWqfkQXBGh',
       checkArr: [],