Merge remote-tracking branch 'origin/build' into build

project/activeAnalysis/app/AppMarketingActivity/components/Add.vue

@@ -83,6 +83,19 @@
             <el-form-item prop="round4ActiveLimit" label="第四轮抽奖限制日活天数" :rules="[{required: true, message: '请输入', trigger: 'change'}]">
               <el-input-number size="small" v-model="form.round4ActiveLimit" :min="1"></el-input-number>
             </el-form-item>
+            <el-form-item prop="beginTime5" label="第五轮抽奖开始时间" :rules="[{required: true, message: '第五轮抽奖开始时间', trigger: 'change'}]">
+              <el-date-picker
+                v-model="form.beginTime5"
+                type="datetime"
+                style="width: 100%"
+                size="small"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="第五轮抽奖开始时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="round5ActiveLimit" label="第五轮抽奖限制日活天数" :rules="[{required: true, message: '请输入', trigger: 'change'}]">
+              <el-input-number size="small" v-model="form.round5ActiveLimit" :min="1"></el-input-number>
+            </el-form-item>
             <el-form-item style="width: 100%;" prop="wxQrcode" label="微信插件二维码" :rules="[{required: true, message: '请上传', trigger: 'change'}]">
               <ai-uploader
                 :instance="instance"
@@ -117,6 +130,7 @@
                         <el-radio :label="2">第二轮</el-radio>
                         <el-radio :label="3">第三轮</el-radio>
                         <el-radio :label="4">第四轮</el-radio>
+                        <el-radio :label="5">第五轮</el-radio>
                       </el-radio-group>
                     </div>
                     <div class="prize-item">
@@ -176,11 +190,13 @@
           beginTime2: '',
           beginTime3: '',
           beginTime4: '',
+          beginTime5: '',
           endTime: '',
           round1ActiveLimit: '',
           round2ActiveLimit: '',
           round3ActiveLimit: '',
           round4ActiveLimit: '',
+          round5ActiveLimit: '',
           wxQrcode: [],
           prizes: []
         },

project/activeAnalysis/app/AppMarketingActivity/components/Detail.vue

@@ -22,7 +22,9 @@
               <ai-info-item label="第三轮抽奖限制日活天数" :value="info.round3ActiveLimit"></ai-info-item>
               <ai-info-item label="第四轮抽奖开始时间" :value="info.beginTime4"></ai-info-item>
               <ai-info-item label="第四轮抽奖限制日活天数" :value="info.round4ActiveLimit"></ai-info-item>
-              <ai-info-item label="微信插件二维码" :value="info.round4ActiveLimit">
+              <ai-info-item label="第五轮抽奖开始时间" :value="info.beginTime5"></ai-info-item>
+              <ai-info-item label="第五轮抽奖限制日活天数" :value="info.round5ActiveLimit"></ai-info-item>
+              <ai-info-item label="微信插件二维码">
                 <ai-uploader
                   :instance="instance"
                   disabled
@@ -69,7 +71,7 @@
               <template #left>
                 <ai-download
                   :instance="instance"
-                  url="/appmarketingactivityinfo/exportSignUpList"
+                  url="/app/appmarketingactivityinfo/exportSignUpList"
                   :params="{
                     ...search,
                     activityId: params.id
@@ -117,7 +119,7 @@
                 </ai-select>
                 <ai-download
                   :instance="instance"
-                  url="/appmarketingactivityinfo/exportTaffleList"
+                  url="/app/appmarketingactivityinfo/exportTaffleList"
                   :params="{
                     ...prizeSearch,
                     activityId: params.id

project/activeAnalysis/app/AppMarketingActivity/components/List.vue

@@ -37,12 +37,12 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="options" width="180px" fixed="right" label="操作" align="center">
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-              <el-button type="text" @click="remove(row.id)">删除</el-button>
+              <!-- <el-button type="text" @click="remove(row.id)">删除</el-button> -->
             </div>
           </template>
         </el-table-column>