update: 图片分享

src/components/upload/avatar.vue

@@ -2,9 +2,10 @@
   <div class="dm-avatar">
     <label class="dm-avatar__upload " :class="{ 'is-disabled': disabled || unused }" :style="`width:${width}px;height:${height}px;`" v-loading="loading">
       <input type="file" style="display:none;" :disabled="disabled || unused" accept="image/gif, image/jpeg,image/png" ref="uploader" v-upload="this" />
-      <img v-show="model.imgUrl && showImg" :src="model.imgUrl || ''" :class="className" class="dm-avatar__img" />
+      <img v-show="model.imgUrl && showImg" :src="model.imgUrl || ''" :class="className" style="object-fit: contain" class="dm-avatar__img" />
       <i class="el-icon-plus dm-avatar__icon" v-show="!model.imgUrl" :style="'line-height:' + height + 'px;'"></i>
     </label>
+    <div v-if="name" style="font-size:14px;color:#303133;line-height:1;margin-bottom:10px">{{ name }}</div>
     <div class="dm-avatar__tips" :style="tipsStyle">{{ tips }}</div>
   </div>
 </template>
@@ -24,6 +25,7 @@ export default {
         };
       }
     },
+    name: String,
     unused: {
       // 是否禁用
       type: Boolean,

src/views/ecm/form.vue

@@ -423,7 +423,7 @@
       <section class="dm-form__wrap" v-if="xsxsFlag == 1">
         <h3 class="dm-title__label">
           <span class="inline-block mr10">营销分析设置</span>
-          <span class="gray fz12">开启后，可用于统计这次线索挖掘计划的收益情况。</span>
+          <span class="gray fz12">开启后，可用于统计这次营销计划的触达转化收益情况。</span>
           <!-- <el-switch :disabled="!isAdd" v-model="analyseConfig.open_flag" :active-value="1" :inactive-value="0" @change="onChangeAnalyseConfig($event, true)"></el-switch> -->
         </h3>
         <div style="padding-bottom:10px;color:#303133">
@@ -449,15 +449,19 @@
                   <span>分析天数</span>
                   <el-tooltip slot="label" open-delay="200" placement="top">
                     <i style="cursor:pointer;color:#909399;font-size:14px;" class="iconfont icon-xinxixianshi"></i>
-                    <div slot="content" style="width:340px;line-height: 22px;">设置从触达到客户的那天起，{{ analyseConfig.marke_days || '--' }}天以内会被纳入到数据分析中</div>
+                    <div slot="content" style="width:340px;line-height: 22px;">设置从客户被成功触达的那天起，{{ analyseConfig.marke_days || '--' }}天以内的转化会被作为此营销计划的转化收益</div>
                   </el-tooltip>
                 </label>
               </div>
               <span class="mr10">触达日期起</span>
-              <el-input-number :disabled="!isAdd" controls-position="right" class="w150" :min="1" :max="31" step-strictly v-model="analyseConfig.marke_days"></el-input-number>
+              <el-input-number :disabled="!isAdd" controls-position="right" class="w150" :min="1" :max="90" step-strictly v-model="analyseConfig.marke_days"></el-input-number>
               <span class="ml10">天之内</span>
             </div>
-            <div style="margin-top:6px;color:#A5A7AD;font-size:12px;margin-left:164px">最长 31 天，最短 1 天 (以自然日计算)</div>
+            <div style="margin-top:6px;color:#A5A7AD;font-size:12px;margin-left:164px">
+              最短 1 天，最长 90 天 (以自然日计算)
+              <br />
+              注：时间越长，会员的转化与此次营销的相关度越低，分析触达日期起&lt;31天内的转化数据更为合理，请酌情填写分析天数。
+            </div>
             <div class="mt20" v-show="[1, 2].includes(form.effectType)">
               <div class="w150 text-right inline-block mr10">
                 <label class="cursor">

src/views/game/common/share.vue

@@ -8,7 +8,10 @@
       </el-radio-group>
     </el-form-item>
     <el-form-item v-if="form.shareFlag === 1" label="分享图" prop="shareImg.imgUrl" class="width50" :rules="{ required: true, message: '请上传分享图片', trigger: 'blur' }">
-      <dm-upload-avatar :limit="{ maxSize: 1 }" :model.sync="form.shareImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：200*200，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
+      <dm-upload-avatar :limit="{ maxSize: 1 }" name="H5分享图" :model.sync="form.shareImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：200*200，格式为jpg/png/gif。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
+    </el-form-item>
+    <el-form-item v-if="form.shareFlag === 1" prop="shareAppImg.imgUrl" class="width50">
+      <dm-upload-avatar :limit="{ maxSize: 1 }" name="小程序分享图" :model.sync="form.shareAppImg" fileType="fileShare" label="上传图片" tips="图片建议尺寸：320*240，格式为jpg/png。图片大小不超过1MB，点击图片可重新上传。" :disabled="isInfo"></dm-upload-avatar>
     </el-form-item>
     <el-form-item v-if="form.shareFlag === 1" label="分享标题" prop="shareTitle" class="width50" :rules="{ required: true, message: '标题不能为空', trigger: 'blur' }">
       <dm-input v-model="form.shareTitle" class="w400" placeholder="请输入分享标题" :disabled="isInfo" :maxlength="20"></dm-input>
@@ -34,6 +37,11 @@ export default {
             code: '',
             imgUrl: '', // eslint-disable-line
             wxImg: ''
+          },
+          shareAppImg: {
+            code: '',
+            imgUrl: '', // eslint-disable-line
+            wxImg: ''
           }
         };
       }

src/views/game/dzp/form.vue

@@ -160,6 +160,7 @@ import editAlertMixin from '../common/editAlertMixin.js';
 import prizeMixins from '../common/prizeMixins.js';
 import dmShare from '../common/share.vue';
 import dmThreshold from '../common/threshold.vue';
+const appImg = 'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/lALPDgfLSk0gYNTM8M0BQA_320_240.png_720x720g.jpg';
 export default {
   mixins: [editAlertMixin, prizeMixins],
   data() {
@@ -203,6 +204,11 @@ export default {
           imgUrl: require("../common/img/share/dzp.png"), // eslint-disable-line
           wxImg: ''
         },
+        shareAppImg: {
+          code: '',
+          imgUrl: appImg, // eslint-disable-line
+          wxImg: ''
+        },
         // 参与门槛
         memberType: 0,
         gameActivityAttendConditionId: '',
@@ -425,7 +431,7 @@ export default {
         }
         // 分享
         if (gameDetail.shareFlag === 1) {
-          const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId } = gameDetail.shareSetting;
+          const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId, shareImgUrlMini } = gameDetail.shareSetting;
           this.form = Object.assign(this.form, {
             shareTitle,
             shareTextInfo,
@@ -434,6 +440,11 @@ export default {
               code: shareImgFieldCode,
               imgUrl: shareImgUrl,
               wxImg: shareImgUrlWX
+            },
+            shareAppImg: {
+              code: '',
+              imgUrl: shareImgUrlMini || appImg,
+              wxImg: shareImgUrlMini || appImg
             }
           });
         }
@@ -570,13 +581,14 @@ export default {
           // 游戏分享
           let shareSetting = {};
           if (this.form.shareFlag) {
-            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId } = this.form;
+            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId, shareAppImg } = this.form;
             shareSetting = {
               shareTitle,
               shareTextInfo,
               shareImgUrl: shareImg.imgUrl,
               shareImgFieldCode: shareImg.code,
-              shareImgUrlWX: shareImg.wxImg
+              shareImgUrlWX: shareImg.wxImg,
+              shareImgUrlMini: shareAppImg.imgUrl
             };
             if (this.isEdit) {
               shareSetting.GameShareSettingId = gameShareSettingId;

src/views/game/ggk/form.vue

@@ -144,6 +144,7 @@ import dmUploadAvatar from '@/components/upload/avatar';
 import editAlertMixin from '../common/editAlertMixin.js';
 import dmShare from '../common/share.vue';
 import dmThreshold from '../common/threshold.vue';
+const appImg = 'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/lALPDgfLSk0kJx3M8M0BQA_320_240.png_720x720g.jpg';
 export default {
   mixins: [editAlertMixin, prizeMixins],
   data() {
@@ -187,6 +188,11 @@ export default {
           imgUrl: require("../common/img/share/ggk.png"), // eslint-disable-line
           wxImg: ''
         },
+        shareAppImg: {
+          code: '',
+          imgUrl: appImg, // eslint-disable-line
+          wxImg: ''
+        },
         // 参与门槛
         gameActivityAttendConditionId: '',
         tipTitle: '尚未满足游戏参与条件，请多多努力。',
@@ -427,7 +433,7 @@ export default {
 
       // 分享
       if (gameDetail.shareFlag === 1) {
-        const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId } = gameDetail.shareSetting;
+        const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId, shareImgUrlMini } = gameDetail.shareSetting;
         this.form = Object.assign(this.form, {
           shareTitle,
           shareTextInfo,
@@ -436,6 +442,11 @@ export default {
             code: shareImgFieldCode,
             imgUrl: shareImgUrl,
             wxImg: shareImgUrlWX
+          },
+          shareAppImg: {
+            code: '',
+            imgUrl: shareImgUrlMini || appImg,
+            wxImg: shareImgUrlMini || appImg
           }
         });
       }
@@ -556,13 +567,14 @@ export default {
           let shareSetting = {};
           // 游戏分享
           if (this.form.shareFlag) {
-            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId } = this.form;
+            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId, shareAppImg } = this.form;
             shareSetting = {
               shareTitle,
               shareTextInfo,
               shareImgUrl: shareImg.imgUrl,
               shareImgFieldCode: shareImg.code,
-              shareImgUrlWX: shareImg.wxImg
+              shareImgUrlWX: shareImg.wxImg,
+              shareImgUrlMini: shareAppImg.imgUrl
             };
             if (this.isEdit) {
               shareSetting.GameShareSettingId = gameShareSettingId;

src/views/game/klfl/form.vue

@@ -217,6 +217,7 @@ import config from '@/config';
 import dmShare from '../common/share.vue';
 import dmThreshold from '../common/threshold.vue';
 let result = {};
+const appImg = 'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/lALPDhJzxjugiiXM8M0BQA_320_240.png_720x720g.jpg';
 export default {
   mixins: [editAlertMixin],
   data() {
@@ -268,6 +269,11 @@ export default {
           imgUrl: require("../common/img/share/klfl.png"), // eslint-disable-line
           wxImg: ''
         },
+        shareAppImg: {
+          code: '',
+          imgUrl: appImg, // eslint-disable-line
+          wxImg: ''
+        },
         // 参与门槛
         memberType: 0,
         gameActivityAttendConditionId: '',
@@ -541,7 +547,7 @@ export default {
 
               // 分享
               if (result.game.shareFlag === 1) {
-                const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId } = result.game.shareSetting;
+                const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId, shareImgUrlMini } = result.game.shareSetting;
                 this.form = Object.assign(this.form, {
                   shareTitle,
                   shareTextInfo,
@@ -550,6 +556,11 @@ export default {
                     code: shareImgFieldCode,
                     imgUrl: shareImgUrl,
                     wxImg: shareImgUrlWX
+                  },
+                  shareAppImg: {
+                    code: '',
+                    imgUrl: shareImgUrlMini || appImg,
+                    wxImg: shareImgUrlMini || appImg
                   }
                 });
               }
@@ -694,6 +705,7 @@ export default {
             shareImgUrlWX: this.form.shareImg.wxImg,
             shareTitle: this.form.shareTitle,
             shareTextInfo: this.form.shareTextInfo,
+            shareImgUrlMini: this.form.shareAppImg.imgUrl,
             strategyIds: this.tableList.map(v => v.gamePrizeStrategyId).join(','),
             gameActivityId: this.isEdit ? this.form.gameActivityId : '',
             activityCustom: {
@@ -711,13 +723,14 @@ export default {
           // 游戏分享
           let shareSetting = {};
           if (this.form.shareFlag) {
-            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId } = this.form;
+            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId, shareAppImg } = this.form;
             shareSetting = {
               shareTitle,
               shareTextInfo,
               shareImgUrl: shareImg.imgUrl,
               shareImgFieldCode: shareImg.code,
-              shareImgUrlWX: shareImg.wxImg
+              shareImgUrlWX: shareImg.wxImg,
+              shareImgUrlMini: shareAppImg.imgUrl
             };
             if (this.isEdit) {
               shareSetting.GameShareSettingId = gameShareSettingId;

src/views/game/ptyx/form.vue

@@ -125,6 +125,7 @@ import dmShare from '../common/share.vue';
 import dmThreshold from '../common/threshold.vue';
 let gameInfo = {};
 // 实例化一个全局的music
+const appImg = 'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/lALPDhJzxjujjZHM8M0BQA_320_240.png_720x720g.jpg';
 const music = new Audio();
 export default {
   name: 'ptyx-form',
@@ -174,6 +175,11 @@ export default {
           imgUrl: require("../common/img/share/ptyx.png"), // eslint-disable-line
           wxImg: ''
         },
+        shareAppImg: {
+          code: '',
+          imgUrl: appImg, // eslint-disable-line
+          wxImg: ''
+        },
         // 参与门槛
         memberType: 0,
         gameActivityAttendConditionId: '',
@@ -317,7 +323,7 @@ export default {
 
       // 分享
       if (gameInfo.shareFlag === 1) {
-        const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId } = gameInfo.shareSetting;
+        const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId, shareImgUrlMini } = gameInfo.shareSetting;
         this.form = Object.assign(this.form, {
           shareTitle,
           shareTextInfo,
@@ -326,6 +332,11 @@ export default {
             code: shareImgFieldCode,
             imgUrl: shareImgUrl,
             wxImg: shareImgUrlWX
+          },
+          shareAppImg: {
+            code: '',
+            imgUrl: shareImgUrlMini || appImg,
+            wxImg: shareImgUrlMini || appImg
           }
         });
       }
@@ -465,13 +476,14 @@ export default {
           // 游戏分享
           let shareSetting = {};
           if (this.form.shareFlag) {
-            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId } = this.form;
+            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId, shareAppImg } = this.form;
             shareSetting = {
               shareTitle,
               shareTextInfo,
               shareImgUrl: shareImg.imgUrl,
               shareImgFieldCode: shareImg.code,
-              shareImgUrlWX: shareImg.wxImg
+              shareImgUrlWX: shareImg.wxImg,
+              shareImgUrlMini: shareAppImg.imgUrl
             };
             if (this.isEdit) {
               shareSetting.GameShareSettingId = gameShareSettingId;

src/views/game/znm/form.vue

@@ -105,6 +105,7 @@ import editAlertMixin from '../common/editAlertMixin.js';
 import dmShare from '../common/share.vue';
 import dmThreshold from '../common/threshold.vue';
 let cardType = 'firstStrategy';
+const appImg = 'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/lALPDhJzxjudO2LM8M0BQA_320_240.png_720x720g.jpg';
 export default {
   mixins: [editAlertMixin],
   data() {
@@ -144,6 +145,11 @@ export default {
           imgUrl: require("../common/img/share/znm.png"), // eslint-disable-line
           wxImg: ''
         },
+        shareAppImg: {
+          code: '',
+          imgUrl: appImg, // eslint-disable-line
+          wxImg: ''
+        },
         // 参与门槛
         memberType: 0,
         gameActivityAttendConditionId: '',
@@ -276,7 +282,7 @@ export default {
       });
       // 分享
       if (gameDetail.shareFlag === 1) {
-        const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId } = gameDetail.shareSetting;
+        const { shareTitle, shareTextInfo, shareImgFieldCode, shareImgUrl, shareImgUrlWX, gameShareSettingId, shareImgUrlMini } = gameDetail.shareSetting;
         this.form = Object.assign(this.form, {
           shareTitle,
           shareTextInfo,
@@ -285,6 +291,11 @@ export default {
             code: shareImgFieldCode,
             imgUrl: shareImgUrl,
             wxImg: shareImgUrlWX
+          },
+          shareAppImg: {
+            code: '',
+            imgUrl: shareImgUrlMini || appImg,
+            wxImg: shareImgUrlMini || appImg
           }
         });
       }
@@ -366,6 +377,7 @@ export default {
             shareImgUrl: this.form.shareImg.imgUrl, //	是	string	分享图片 url
             shareImgFieldCode: this.form.shareImg.code, //	是	string	分享图片 code
             shareImgUrlWX: this.form.shareImg.wxImg, //	是	string	分享图片 wx
+            shareImgUrlMini: this.form.shareAppImg.imgUrl,
             shareTitle: this.form.shareTitle, //	是	string	分享标题
             shareTextInfo: this.form.shareTextInfo, //	是	string	分享描述
             shareFlag: this.form.shareFlag || 0
@@ -379,13 +391,14 @@ export default {
           let shareSetting = {};
           // 游戏分享
           if (this.form.shareFlag) {
-            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId } = this.form;
+            const { shareTitle, shareTextInfo, shareImg, gameShareSettingId, shareAppImg } = this.form;
             shareSetting = {
               shareTitle,
               shareTextInfo,
               shareImgUrl: shareImg.imgUrl,
               shareImgFieldCode: shareImg.code,
-              shareImgUrlWX: shareImg.wxImg
+              shareImgUrlWX: shareImg.wxImg,
+              shareImgUrlMini: shareAppImg.imgUrl
             };
             if (this.isEdit) {
               shareSetting.GameShareSettingId = gameShareSettingId;