feat:切换线上更新功能

6d76bb9c · zhangmeng · fcd87c23 · 6d76bb9c · 6d76bb9c · fcd87c23
Commit 6d76bb9c authored Dec 27, 2018 by zhangmeng
5 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.67af1b4f7a69fa8166bd7206b102010b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b52e32600f8f7c7becf9.js></script><script type=text/javascript src=/marketing/static/js/app.bdcb4f7364a9cce408fc.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.67af1b4f7a69fa8166bd7206b102010b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b52e32600f8f7c7becf9.js></script><script type=text/javascript src=/marketing/static/js/app.2524746c73744f18e2e4.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.2524746c73744f18e2e4.js
+++ b/dist/static/js/app.2524746c73744f18e2e4.js
--- a/dist/static/js/app.bdcb4f7364a9cce408fc.js
+++ b/dist/static/js/app.bdcb4f7364a9cce408fc.js
--- a/src/views/game/ptyx/addEdit.vue
+++ b/src/views/game/ptyx/addEdit.vue
@@ -32,9 +32,9 @@
              {{(scope.$index+1) | numberToChinese}}等奖
            </template>
          </el-table-column>
-          <el-table-column prop="rankEnd" label="奖品数量" align="left" width="220">
+          <el-table-column prop="winnerCount" label="奖品数量" align="left" width="220">
            <template slot-scope="scope">
-                <el-input-number controls-position="right" v-model="scope.row.rankEnd" :precision="0" :min="1" @change="comparePre(scope.$index,scope.row.rankEnd)" size="small" class="w150" :disabled="isInfo"></el-input-number> 个
+                <el-input-number controls-position="right" v-model="scope.row.winnerCount" :precision="0" :min="1"  size="small" class="w150" :disabled="isInfo"></el-input-number> 个
            </template>
          </el-table-column>
          <el-table-column prop="prizeName" label="商品名称" align="left" :min-width="180">
@@ -227,7 +227,7 @@ export default {
        gameActivityPuzzleAccessId:'',
        gameActivityPuzzleShareId:'',
        gameActivityPuzzleStartId:'',
-        tipTitle:'12121',
+        tipTitle:'',
        tipsImg:{imgUrl:'',code:''},
        // 皮肤模板
        skinType:0,
@@ -242,9 +242,9 @@ export default {
        usedIntegral:{required:true,  type:'number', message: '请输入数值', trigger: 'blur' }
      },
      tableList:[
-        {awardName:'',rankEnd:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''},
-        {awardName:'',rankEnd:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''},
-        {awardName:'',rankEnd:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''},
+        {awardName:'',winnerCount:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''},
+        {awardName:'',winnerCount:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''},
+        {awardName:'',winnerCount:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''},
      ],
      isInfo:this.$route.meta.type === 'query',
      isEdit:this.$route.meta.type === 'edit',
@@ -286,23 +286,17 @@ export default {
  methods: {
    //添加奖品
    addPrice() {
-      this.tableList.push({awardName:'',rankEnd:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''})
+      this.tableList.push({awardName:'',winnerCount:0,prizeName:'', prizeImg: {code:'',imgUrl:''},prizeQuantity:''})
    },
    delItem(index){
      this.tableList.splice(index,1);
    },
    //这里用nextTick下个更新执行
    comparePre(index,val){
-      if (this.tableList[index].rankEnd<0) {
+      if (this.tableList[index].winnerCount<0) {
        this.$tips({type:'warning',message:'不能为负值'});
        return;
      }
-      if (index > 0 && (this.tableList[index].rankEnd - this.tableList[index-1].rankEnd) <= 0 ) {
-        this.$tips({type:'warning',message:'必须大于上一个名次'});
-        this.$nextTick(_ => {
-          this.tableList[index].rankEnd = parseInt(this.tableList[index-1].rankEnd) +1
-        })
-      }
    },
    //获取系统音乐列表
    async getGameSystemMusicList() {
@@ -390,8 +384,9 @@ export default {
        this.shareGame = gameInfo.shareGame;
        this.form.gameActivityPuzzleShareId = gameInfo.shareGame.gameActivityPuzzleShareId;
      }
+      this.tableList = gameInfo.prizeList.map(v => ({...v,winnerCount:v.rankEnd - v.rankBegin + 1}))

-      this.tableList = gameInfo.prizeList;
+      // this.tableList = gameInfo.prizeList;

      this.$nextTick(_ => {
        this.$refs.ptyxSkin.init();
@@ -424,7 +419,7 @@ export default {
      }

      this.tableList.forEach((v,i) => {
-        if (!v.rankEnd || !v.prizeName || !v.prizeImg.code) {
+        if (!v.winnerCount || !v.prizeName || !v.prizeImg.code) {
          this.$tips({type:'warning',message:'奖品设置区名次、名称、商品图不能为空'});
          flag = true;
        }
@@ -465,7 +460,7 @@ export default {
            list.push({
              prizeImgFieldCode : v.prizeImg.code || '',
              prizeImgUrl : v.prizeImg.imgUrl || '',
-              winnerCount : parseInt(v.rankEnd) || '',
+              winnerCount : v.winnerCount || '',
              awardName : numberToChinese(i+1)+'等奖',
              prizeType :1,
              prizeName:v.prizeName || '',

--- a/src/views/game/ptyx/partials/audio-upload.vue
+++ b/src/views/game/ptyx/partials/audio-upload.vue
@@ -2,7 +2,7 @@
  <div>
      <label class="el-button el-button--primary" :class="{'is-disabled':disabled}">
        {{disabled?'上传中...':label}}
-        <input type="file" style="display:none;" :disabled="disabled" accept="image/gif, image/jpeg,image/png" ref="uploader" v-audioUpload='this'>
+        <input type="file" style="display:none;" :disabled="disabled" accept="audio/mpeg" ref="uploader" v-audioUpload='this'>
      </label>
      <p class="fz12 gray"> {{tips}}</p>
  </div>
@@ -13,7 +13,7 @@ import axios from 'axios';
 import config from '@/config'
 const maxSize = 2 * 1024 * 1024; //5M
 axios.defaults.withCredentials = true
-const reqUrl = '/api-plug/upload-img';
+const reqUrl = '/api-marketing/upload-game-music';
 export default {
  name:'dm-upload',
  props:{
@@ -28,7 +28,7 @@ export default {
    size: String,
    url:{
      type:String,
-      default:'/api-marketing/upload-game-image'
+      default:'/api-marketing/upload-game-music'
    }
  },
  data(){