Merge branch 'dev' of 115.159.76.241:marketing-web/marketing into dev

# Conflicts: # dist/index.html # src/views/game/dzp/form.vue

Merge branch 'dev' of 115.159.76.241:marketing-web/marketing into dev
# Conflicts: # dist/index.html # src/views/game/dzp/form.vue
ac70def9 · chenxin · aef93029 · 07fd12c1 · ac70def9 · ac70def9
Commit ac70def9 authored Apr 03, 2019 by chenxin
9 changed files
--- a/dist/static/css/main.8ce26202a5818d2582855010d34beb8a.css
+++ b/dist/static/css/main.8ce26202a5818d2582855010d34beb8a.css
--- a/dist/static/js/main.4a128354e764a56e1d8f.js
+++ b/dist/static/js/main.4a128354e764a56e1d8f.js
--- a/dist/static/js/main.799a9ffc0d992190e2b3.js
+++ b/dist/static/js/main.799a9ffc0d992190e2b3.js
--- a/dist/static/js/vendor.41e915fffb6fa2b1b49e.js
+++ b/dist/static/js/vendor.41e915fffb6fa2b1b49e.js
--- a/dist/static/js/vendor.a8b8c5e580989634279c.js
+++ b/dist/static/js/vendor.a8b8c5e580989634279c.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/App.vue
+++ b/src/App.vue
 <template>
  <div id="app">
-    <dm-udesk></dm-udesk>
    <keep-alive :include="include">
      <router-view></router-view>
    </keep-alive>

--- a/src/views/game/dzp/form.vue
+++ b/src/views/game/dzp/form.vue
@@ -13,12 +13,12 @@
        <el-radio v-model="form.skinType" :label="2" :disabled="isInfo">红色</el-radio>
        <el-radio v-model="form.skinType" :label="3" :disabled="isInfo">霓虹灯</el-radio>
        <el-radio v-model="form.skinType" :label="0" :disabled="isInfo">自定义</el-radio>
-        <span class="regular-font-color pl20">
+        <!-- <span class="regular-font-color pl20">
          <b class="blue cursor-pointer">模板皮肤下载</b>
          <el-popover placement="top-start" width="200" trigger="hover" title="banner图片定制化：" content="下载后修改为需要使用的样式,重新上传banner图的图片">
            <i class="el-icon-question fz16 blue el-popover__reference" slot="reference"></i>
          </el-popover>
-        </span>
+        </span> -->
      </el-form-item>
      <el-form-item label="banner图片" prop="gameImage">
        <dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" :limit="{ type: true, width: 750, height: 350 }" tips="图片上传尺寸：750*350"></dm-upload-avatar>

--- a/src/views/game/ggk/form.vue
+++ b/src/views/game/ggk/form.vue
@@ -13,12 +13,12 @@
        <el-radio v-model="form.skinType" :label="2" :disabled="isInfo">红色</el-radio>
        <el-radio v-model="form.skinType" :label="3" :disabled="isInfo">霓虹灯</el-radio>
        <el-radio v-model="form.skinType" :label="0" :disabled="isInfo">自定义</el-radio>
-        <span class="regular-font-color pl20">
+        <!-- <span class="regular-font-color pl20">
          <b class="blue cursor-pointer">模板皮肤下载</b>
          <el-popover placement="top-start" width="200" trigger="hover" title="banner图片定制化：" content="下载后修改为需要使用的样式,重新上传banner图的图片">
            <i class="el-icon-question fz16 blue el-popover__reference" slot="reference"></i>
          </el-popover>
-        </span>
+        </span> -->
      </el-form-item>
      <el-form-item label="banner图片" class="width50" prop="gameImage">
        <dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" :limit="{ type: true, width: 750, height: 350 }" tips="图片上传尺寸：750*350"></dm-upload-avatar>