zhuxinbo há 4 anos atrás
pai
commit
550ee25a97

+ 0 - 136
package.json

@@ -1,136 +0,0 @@
-{
-  "name": "vue-antd-jeecg",
-  "version": "2.2.0",
-  "private": true,
-  "scripts": {
-    "pre": "yarn --registry https://registry.npm.taobao.org || cnpm install || npm install --registry https://registry.npm.taobao.org ",
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@antv/data-set": "^0.11.2",
-    "@femessage/upload-to-ali": "^1.8.1",
-    "@riophae/vue-treeselect": "^0.4.0",
-    "@jeecg/antd-online-beta220": "^1.0.1",
-    "@tinymce/tinymce-vue": "^2.0.0",
-    "ali-oss": "^6.1.1",
-    "ant-design-vue": "1.5.2",
-    "apexcharts": "^3.6.5",
-    "area-data": "^5.0.6",
-    "axios": "^0.18.0",
-    "babel-loader": "^8.0.6",
-    "blueimp-md5": "^2.11.0",
-    "browser-md5-file": "^1.1.1",
-    "clipboard": "^2.0.4",
-    "codemirror": "^5.46.0",
-    "cos-js-sdk-v5": "^0.5.26",
-    "dayjs": "^1.8.0",
-    "echarts": "^4.3.0",
-    "element-ui": "^2.13.0",
-    "enquire.js": "^2.1.6",
-    "html2canvas": "^1.0.0-rc.3",
-    "iview": "2.0.0-rc.17",
-    "jquery": "^3.4.1",
-    "js-cookie": "^2.2.0",
-    "lodash.get": "^4.4.2",
-    "lodash.pick": "^4.4.0",
-    "mcanvas": "^1.3.9",
-    "md5": "^2.2.1",
-    "nprogress": "^0.2.0",
-    "promise.prototype.finally": "^3.1.1",
-    "tinymce": "^5.1.4",
-    "viser-vue": "^2.4.4",
-    "vue": "^2.6.10",
-    "vue-area-linkage": "^5.1.0",
-    "vue-apexcharts": "^1.3.2",
-    "vue-class-component": "^6.0.0",
-    "vue-count-to": "^1.0.13",
-    "vue-cropper": "^0.4.8",
-    "vue-i18n": "^8.7.0",
-    "vue-layer": "^1.0.2",
-    "vue-loader": "^15.7.0",
-    "vue-ls": "^3.2.0",
-    "vue-oss-uploader": "^0.1.10",
-    "vue-photo-preview": "^1.1.3",
-    "vue-preview": "^1.1.3",
-    "vue-print-nb-jeecg": "^1.0.9",
-    "vue-property-decorator": "^7.3.0",
-    "vue-router": "^3.0.1",
-    "vue-splitpane": "^1.0.4",
-    "vue-video-player": "^5.0.2",
-    "vue-waterfall-easy": "^2.4.3",
-    "vuedraggable": "^2.20.0",
-    "vuex": "^3.1.0",
-    "vuex-class": "^0.3.1"
-  },
-  "devDependencies": {
-    "@babel/polyfill": "^7.2.5",
-    "@vue/cli-plugin-babel": "^3.3.0",
-    "@vue/cli-plugin-eslint": "^3.3.0",
-    "@vue/cli-service": "^3.3.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "babel-eslint": "^10.0.1",
-    "babel-plugin-component": "^1.1.1",
-    "compression-webpack-plugin": "^3.1.0",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.1.0",
-    "html-webpack-plugin": "^4.2.0",
-    "less": "^3.9.0",
-    "less-loader": "^4.1.0",
-    "node-sass": "^4.11.0",
-    "sass-loader": "^7.0.1",
-    "vue-template-compiler": "^2.6.10"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/strongly-recommended",
-      "@vue/standard",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {
-      "generator-star-spacing": "off",
-      "no-mixed-operators": 0,
-      "vue/max-attributes-per-line": [
-        2,
-        {
-          "singleline": 5,
-          "multiline": {
-            "max": 1,
-            "allowFirstLine": false
-          }
-        }
-      ],
-      "vue/attribute-hyphenation": 0,
-      "vue/html-self-closing": 0,
-      "vue/component-name-in-template-casing": 0,
-      "vue/html-closing-bracket-spacing": 0,
-      "vue/singleline-html-element-content-newline": 0,
-      "vue/no-unused-components": 0,
-      "vue/multiline-html-element-content-newline": 0,
-      "vue/no-use-v-if-with-v-for": 0,
-      "vue/html-closing-bracket-newline": 0,
-      "vue/no-parsing-error": 0,
-	  "no-console": 0,
-      "no-tabs": 0,
-      "indent": [1, 4]
-    }
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}

+ 34 - 34
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -920,37 +920,37 @@ export default {
             // console.log(text,record);
             let recordData=JSON.parse(JSON.stringify(record))
             record.spin=true;
-           if(this.tabkey=='group'){
-               let ids=record.id;
-               let status=text?'disable':'enable';
-               postAction('/ctop/byteDanceCampaign/editStatus',qs.stringify({
-                   accountId:this.accountID,
-                   ids:`${ids}`,
-                   status:status,
-               })).then((res)=>{
-                //    console.log(res);
-                    // this.spinning=false;
-                    record.spin=false;
-                   if(res.success){
-                       this.refreshCampaignList({
-                            accountId:this.accountID,
-                            name:this.optionId,
-                            status:this.statusValue,
-                            startDate:this.dateString[0],
-                            endDate:this.dateString[1],
-                            pageNo:this.ipagination.current
-                        })
-                        this.$message.success(res.message)
-                   }else{
-                       this.$message.error(res.message)
-                   }
-               })
+            if(this.tabkey=='group'){
+                let ids=record.id;
+                let status=text?'disable':'enable';
+                postAction('/ctop/byteDanceCampaign/editStatus',qs.stringify({
+                    accountId:this.accountID,
+                    ids:`${ids}`,
+                    status:status,
+                })).then((res)=>{
+                    //    console.log(res);
+                        // this.spinning=false;
+                        record.spin=false;
+                    if(res.success){
+                        this.refreshCampaignList({
+                                accountId:this.accountID,
+                                name:this.optionId,
+                                status:this.statusValue,
+                                startDate:this.dateString[0],
+                                endDate:this.dateString[1],
+                                pageNo:this.ipagination.current
+                            })
+                            this.$message.success(res.message)
+                    }else{
+                        this.$message.error(res.message)
+                    }
+                })
            }else if(this.tabkey=='plan'){
 
                 if(text){
-                    recordData.toutiaoStatus='AD_STATUS_DISABLE';
+                    recordData.optStatus='AD_STATUS_DISABLE';
                 }else{
-                    recordData.toutiaoStatus='AD_STATUS_DELIVERY_OK'
+                    recordData.optStatus='AD_STATUS_ENABLE'
                 }
                 this.batchEditHttp('status',[recordData])
 
@@ -1057,19 +1057,19 @@ export default {
                 // this.selectedRows.forEach(item=>{
                 //     item.spin=true;
                 // })
-                // this.loading=true;
+            
                 if(this.optValue=='pause'){   
-                    
+                    this.loading=true;
                     if(this.tabkey=='group'){
                         console.log(this.selectedRows);                       
                         this.editGroupStatus('/ctop/byteDanceCampaign/editStatus')
 
                     }else if(this.tabkey=='plan'){
-                        console.log(0)
+                        // console.log(0)
                         this.loading=true;
                         if(this.selectedRowKeys.length>0){
                             this.selectedRows.forEach((item)=>{
-                                item.toutiaoStatus='AD_STATUS_DISABLE'
+                                item.optStatus='AD_STATUS_DISABLE'
                             })
                         }
                         console.log(0)
@@ -1080,13 +1080,13 @@ export default {
                     }
 
                 }else if(this.optValue=='open'){
-                    
+                    this.loading=true;
                     if(this.tabkey=='group'){
                         this.editGroupStatus('/ctop/byteDanceCampaign/editStatus');
                     }else if(this.tabkey=='plan'){
                         if(this.selectedRowKeys.length>0){
                             this.selectedRows.forEach((item)=>{
-                                item.toutiaoStatus='AD_STATUS_DELIVERY_OK'
+                                item.optStatus='AD_STATUS_ENABLE'
                             })
                         }
                         this.batchEditHttp('status',this.selectedRows)
@@ -1113,7 +1113,7 @@ export default {
                     }else if(this.tabkey=='plan'){
                         if(this.selectedRowKeys.length>0){
                             this.selectedRows.forEach((item)=>{
-                                item.toutiaoStatus='AD_STATUS_DELETE'
+                                item.optStatus='AD_STATUS_DELETE'
                             })
                         }
                         this.batchEditHttp('status',this.selectedRows)

+ 3 - 6
src/views/modules/BatchCreate/selectPlanList.vue

@@ -60,8 +60,7 @@
               </a-tab-pane>
           </a-tab-pane>      
           <a-tab-pane key="create" tab="新建广告计划" forceRender>
-              <div class="selectedExist">
-                  
+              <div class="selectedExist">                  
                   <div class="campaign-have-list">
                       <div class="campaign-have-header">操作</div>
                       <div class="hasAccountID" v-if="groupId">
@@ -69,10 +68,8 @@
                       </div>
                       <div class="noAccountID" v-else>
                           选择广告组后,才能新建已有广告计划
-                      </div>
-                      
-                  </div>
-                 
+                      </div>                      
+                  </div>                
               </div>             
           </a-tab-pane>      
       </a-tabs>

+ 2 - 2
src/views/modules/BatchCreate/singleLayerSelecte.vue

@@ -78,7 +78,7 @@ export default {
                 this.checkedList=[]
                 this.checkedShowList=[];
                 this.plainOptions = this.listArr
-                this.valueOptions=[]
+                this.valueOptions=[];
                 this.listArr.forEach((item) => {
                     this.valueOptions.push(item.value)
                 })
@@ -175,7 +175,7 @@ export default {
   },
   mounted() {
     this.plainOptions = this.listArr
-    this.valueOptions=[]
+    this.valueOptions=[];
     this.listArr.forEach((item) => {
       this.valueOptions.push(item.value)
     })