lilei il y a 4 ans
Parent
commit
29aee26235

+ 6 - 6
src/config/router.config.js

@@ -247,8 +247,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '营销',
-      icon: 'gift'
-      // permission: 'M_winingRecord_list'
+      icon: 'gift',
+      permission: 'M_market'
     },
     children: [
       {
@@ -257,8 +257,8 @@ export const asyncRouterMap = [{
         component: () => import(/* webpackChunkName: "market" */ '@/views/market/winingRecord.vue'),
         meta: {
           title: '中奖记录',
-          icon: 'file-done'
-          // permission: 'M_winingRecord_list'
+          icon: 'file-done',
+          permission: 'M_winingRecord'
         }
       },
       {
@@ -267,8 +267,8 @@ export const asyncRouterMap = [{
         component: () => import(/* webpackChunkName: "market" */ '@/views/market/lotterySettings.vue'),
         meta: {
           title: '大转盘设置',
-          icon: 'edit'
-          // permission: 'M_lotterySettings'
+          icon: 'edit',
+          permission: 'M_lottery_list'
         }
       }
     ]

+ 48 - 21
src/views/market/addlotterySetModal.vue

@@ -40,7 +40,7 @@
       >
         <h3 class="form-titles">基础设置</h3>
         <a-row :gutter="48">
-          <a-col :span="6">
+          <a-col :span="12">
             <!-- participantsNum>0 有参与人数时不可编辑 -->
             <a-form-model-item ref="activeName" label="活动名称" prop="activeName">
               <a-input
@@ -52,7 +52,7 @@
                 placeholder="15个字以内"/>
             </a-form-model-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="12">
             <a-form-model-item ref="time" label="活动时间" prop="time">
               <a-range-picker
                 :disabled="participantsNum>0||taskParticipantsNum>0||state==1"
@@ -65,7 +65,7 @@
               />
             </a-form-model-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="12">
             <a-form-model-item
               ref="peopleLimitCount"
               label="抽奖人次"
@@ -91,7 +91,7 @@
               </a-checkbox>
             </a-form-model-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="12">
             <a-form-model-item ref="purchaseTimesGold" label="付费抽奖规则" prop="purchaseTimesGold">
               每次抽奖需要支付
               <a-input-number
@@ -110,7 +110,7 @@
         </a-row>
 
         <a-row :gutter="48">
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-model-item ref="prizeDesc" label="奖品说明" prop="prizeDesc">
               <a-input
                 :disabled="state==1"
@@ -121,7 +121,7 @@
                 type="textarea" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-model-item ref="activeLimitDesc" label="抽奖条件" prop="activeLimitDesc">
               <a-input
                 :disabled="state==1"
@@ -132,7 +132,7 @@
                 type="textarea" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="12">
             <a-form-model-item ref="activeDesc" label="抽奖说明" prop="activeDesc">
               <a-input
                 :disabled="state==1"
@@ -146,16 +146,18 @@
         </a-row>
 
         <h3 class="form-titles">奖品设置</h3>
-        <div class="form-item">
-          <a-form-model-item style="margin: 0;" ref="prizeClsNum" label="请选择转盘类型" prop="prizeClsNum">
-            <a-select style="width: 300px;" :disabled="participantsNum>0||state==1" @change="zpTypeChange" v-model="form.prizeClsNum" placeholder="请选择转盘类型">
-              <a-select-option :key="6" :value="6">
-                六等分
-              </a-select-option>
-            </a-select>
-          </a-form-model-item>
-        </div>
-        <div style="padding: 0 5px;">
+        <a-row :gutter="48">
+          <a-col :span="12">
+            <a-form-model-item ref="prizeClsNum" label="转盘类型" prop="prizeClsNum">
+              <a-select style="width: 300px;" :disabled="participantsNum>0||state==1" @change="zpTypeChange" v-model="form.prizeClsNum" placeholder="请选择转盘类型">
+                <a-select-option :key="6" :value="6">
+                  六等分
+                </a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <div style="padding: 0 35px;">
           <a-row
             type="flex"
             align="middle"
@@ -180,6 +182,7 @@
               奖品图片
             </a-col>
           </a-row>
+          <div v-if="form.luckyDrawPrizeList.length" style="height: 1px;background-color: #eee;margin: 10px 0 20px;" ></div>
           <a-row
             type="flex"
             align="middle"
@@ -189,7 +192,10 @@
             :gutter="10"
           >
             <a-col span="1">
-              <a-form-model-item>
+              <a-form-model-item
+                :label-col=" { span: 0 }"
+                :wrapper-col=" { span: 24 }"
+              >
                 <span class="red" v-if="state==0">*</span> 奖品{{ index+1 }}
               </a-form-model-item>
             </a-col>
@@ -462,9 +468,9 @@ export default {
       loading: false,
       isShow: this.showEditModal,
       titleText: '活动',
-      formLayout: 'vertical',
-      labelCol: {},
-      wrapperCol: {},
+      formLayout: 'horizontal',
+      labelCol: { span: 4 },
+      wrapperCol: { span: 14 },
 	    state: 0, // 活动状态
       participantsNum: 0, // 抽奖参与人数
       taskParticipantsNum: 0,
@@ -708,6 +714,27 @@ export default {
       padding: 15px 25px;
       height: 600px;
       overflow: auto;
+      .upload-file .ant-upload.ant-upload-select-picture-card, .upload-file .ant-upload-list-picture-card .ant-upload-list-item{
+        width: 40px;
+        height: 40px;
+      }
+      .upload-file .ant-upload-list-picture-card-container{
+        width: 40px;
+        height: 40px;
+      }
+      .upload-file{
+        height: 40px!important;
+      }
+      .upload-file .ant-upload-select-picture-card i{
+            font-size: 16px;
+            margin-top: 10px;
+      }
+      .ant-upload.ant-upload-select-picture-card > .ant-upload{
+        padding: 0;
+      }
+      .upload-file .ant-upload.ant-upload-select-picture-card, .upload-file .ant-upload-list-picture-card .ant-upload-list-item{
+        padding: 0;
+      }
     }
     .ant-input[disabled]{
       background: #F8F8F8;

+ 5 - 2
src/views/market/lotterySettings.vue

@@ -37,6 +37,7 @@
         icon="plus"
         class="addBtn"
         @click="showModal"
+        v-if="$hasPermissions('B_lottery_new')"
         id="lotterySet-showModal"
       >新增</a-button>
     </div>
@@ -54,9 +55,10 @@
           id="lotterySet-handleEdit"
           :title="record.state==1?'查看':'编辑'"
           class="actionBtn icon-blues"
+          v-if="$hasPermissions('B_lottery_view')||$hasPermissions('B_lottery_edit')"
           @click="handleEdit(record)" />
         <a-icon
-          v-if="record.participantsNum===0 && record.state==0"
+          v-if="record.participantsNum===0 && record.state==0 && $hasPermissions('B_lottery_del')"
           type="delete"
           id="lotterySet-handleDel"
           title="删除"
@@ -71,9 +73,10 @@
           checkedChildren="启用"
           unCheckedChildren="禁用"
           id="lotterySet-changeFlagHandle"
+          v-if="$hasPermissions('B_lottery_enable')"
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)" />
-        <!-- <span v-if="!$hasPermissions('B_lotterySet_enable')">--</span> -->
+        <span v-else>--</span>
       </span>
       </span>
     </s-table>

+ 2 - 2
src/views/market/winingRecord.vue

@@ -55,14 +55,14 @@
           type="rocket"
           id="winRecord-sendGood"
           title="发货"
-          v-if="record.prizeType=='GOODS'&&record.state=='WAIT_SEND_EXPRESS'"
+          v-if="record.prizeType=='GOODS'&&record.state=='WAIT_SEND_EXPRESS'&&$hasPermissions('B_winingRecord_sendGood')"
           class="actionBtn icon-blues"
           @click="sendGood(record)" />
         <a-icon
           type="eye"
           id="winRecord-handleView"
           title="详情"
-          v-else-if="record.prizeType=='GOODS'&&record.state=='FINISH'"
+          v-else-if="record.prizeType=='GOODS'&&record.state=='FINISH'&&$hasPermissions('B_winingRecord_view')"
           class="actionBtn icon-green"
           @click="handleView(record)" />
         <span v-else>--</span>