Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!253

src/views/business/marketing/components/ActivityTable.vue

@@ -21,12 +21,22 @@
         <el-table-column label="用户昵称" prop="nickName" min-width="80" />
         <el-table-column label="抽奖码" prop="code" min-width="80" />
         <el-table-column label="抽奖码获取时间" prop="createdTime" min-width="85">
-          <template slot-scope="row">
-            <div>{{ parseTime(row.createdTime) }}</div>
+          <template slot-scope="scope">
+            <div>{{ parseTime(scope.row.createdTime) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="奖级" prop="awardsName" min-width="50" >
+          <template slot-scope="scope">
+            <div v-if="scope.row.prizeName != ''">{{ scope.row.awardsName }}</div>
+            <div v-else> -- </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="奖品名称" prop="prizeName" min-width="85" >
+          <template slot-scope="scope">
+            <div v-if="scope.row.prizeName != ''">{{ scope.row.prizeName }}</div>
+            <div v-else> -- </div>
           </template>
         </el-table-column>
-        <el-table-column label="奖级" prop="awardsName" min-width="50" />
-        <el-table-column label="奖品名称" prop="prizeName" min-width="85" />
       </el-table>
       <pagination
         v-show="marketingTotal > 0"
@@ -77,7 +87,6 @@ export default {
     getMarketingData() {
       this.loading = true;
       getMarketingData(this.ids.id ).then((res) => {
-        console.log(res.rows)
         this.marketingList = res.rows
         this.marketingTotal = res.total;
         this.loading = false;

src/views/business/ticket/create.vue

@@ -20,15 +20,10 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="图片" prop="picUrl">
-            <image-upload
-              v-model="ticketPicUrl"
-              :limit="1"
-              :file-size="0.2"
-              @change="$refs.form.validateField(['picUrl'])"
-            />
+            <Upload v-model="ticketPicUrl" :limit="3" @change="$refs.form.validateField(['picUrl'])"/>
           </el-form-item>
           <div class="tip">
-            上传1张图片，支持jpg、png格式上传，大小不超过200k；
+            请上传图片，png格式；线上盲票第1张为奖品图，第2张为主题图，第3张为奖品和主题的合成图（尺寸长宽比1:1）；线下盲票仅需上传盲票图
           </div>
           <el-form-item label="面值" prop="facePrice">
             <el-input
@@ -153,6 +148,7 @@
   </div>
 </template>
 <script>
+import Upload from '@/components/DragImageUpload'
 import { publicFileGetUrl } from "@/api/common";
 import CustomFieldsMixin from "@/mixins/CustomFields";
 import { ticketBoxCreate, setListDetail, ticketBoxDetail} from "@/api/business/ticket";
@@ -172,6 +168,7 @@ export default {
     CouponAdd,
     CouponPkgAdd,
     CoinAdd,
+    Upload
   },
   data() {
     return {
@@ -301,14 +298,14 @@ export default {
       }
       ticketBoxDetail(data).then(res => {
         const { awardsList, type, title, picUrl, facePrice, salePrice, quantity, pkgUnit, pkgSalePrice, saleCommRate, saleChannelType, channelList } = res.data
-        this.form = { 
+        this.form = {
           disabled:true,
           title, picUrl, quantity, pkgUnit, saleCommRate, saleChannelType,
           channelIdList: channelList.map(item => item.channelId),
           type: JSON.parse(type).value,
-          facePrice:accDiv(facePrice, 100), 
-          salePrice:accDiv(salePrice, 100),  
-          pkgSalePrice:accDiv(pkgSalePrice, 100) 
+          facePrice:accDiv(facePrice, 100),
+          salePrice:accDiv(salePrice, 100),
+          pkgSalePrice:accDiv(pkgSalePrice, 100)
         }
         if(awardsList){
           awardsList.forEach((item) => {