1. 修复bug

src/views/monitor/logininfor/index.vue

@@ -112,9 +112,9 @@
         </template>
       </el-table-column>
       <el-table-column label="操作信息" align="center" prop="msg" :show-overflow-tooltip="true" />
-      <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+      <el-table-column label="登录日期" align="center" prop="accessTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginTime) }}</span>
+          <span>{{ parseTime(scope.row.accessTime) }}</span>
         </template>
       </el-table-column>
     </el-table>

src/views/tourism/marketingActivities/couponManagement.vue

@@ -60,7 +60,7 @@
             </el-table-column>
             <el-table-column label="领取限制" align="center" key="receiveNum" prop="receiveNum" v-if="columns[6].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <span>{{ `每人限领取${scope.row.receiveNum}张` }}</span>
+                <span>{{ scope.row.receiveType==1?'不限': `每人限领取${scope.row.receiveNum}张` }}</span>
               </template>
             </el-table-column>
             <el-table-column label="使用有效期" align="center" key="balance" prop="balance" v-if="columns[7].visible" :show-overflow-tooltip="true">

src/views/tourism/marketingActivities/detailsBox/couponManagementDetails.vue

@@ -71,7 +71,7 @@
                         </div>
                       </el-radio>
                     </div>
-                    <div style="display: flex;align-items: center;margin-top: 25px;">
+                    <div style="display: flex;align-items: center;">
                       <el-radio style="display: flex;align-items: center;" :label="2">
                         <div style="display: flex;align-items: center;"> 
                           <el-form-item label="" label-width="0" :prop="'useDay'">
@@ -153,8 +153,7 @@
                 </selectMemberInformation>
               </el-form-item>
               <el-form-item label="领取限制：" prop="receiveType" label-width="200px">
-                <div style="display: flex;align-items: center;">
-                  <el-radio-group v-model="form.receiveType" class="details-is-disabled" @input="radioInput">
+                <el-radio-group v-model="form.receiveType" class="details-is-disabled" @input="radioInput">
                     <div style="display: flex;align-items: center;">
                       <el-radio :label="1">不限</el-radio>
                       <el-radio style="display: flex;align-items: center;" :label="2">
@@ -165,8 +164,7 @@
                         </el-form-item>
                       </el-radio>
                     </div>
-                  </el-radio-group>
-                </div>
+                </el-radio-group>
               </el-form-item>
               <el-form-item label="会员积分抵扣同时使用：" prop="isAdd" label-width="200px">
                 <el-radio-group v-model="form.isAdd" class="details-is-disabled">

src/views/tourism/marketingActivities/formBox/eventManagementForm.vue

@@ -172,8 +172,8 @@ export default {
         image: [{ required: true, message: "请上传封面", trigger: ["change","blur"] }],
         eventTime: [{ required: true, message: "请选择活动起止时间", trigger: ["change","blur"] }],
         templateId: [{ required: true, message: "请选择模板", trigger: ["change","blur"] }],
-        couponVoList: [{ required: true, message: "请选择优惠券", trigger: ["change","blur"] }],
-        performVoList: [{ required: true, message: "请选择景区门票", trigger: ["change","blur"] }],
+        couponVoList: [{ required: false, message: "请选择优惠券", trigger: ["change","blur"] }],
+        performVoList: [{ required: false, message: "请选择景区门票", trigger: ["change","blur"] }],
       },
 
       activeName: 'first',

src/views/tourism/marketingActivities/formBox/templateManagementForm.vue

@@ -185,7 +185,7 @@ export default {
         name: [{ required: true, message: "请输入模板名称", trigger: ["change","blur"] }],
         appletPath: [{ required: true, message: "请输入页面路径", trigger: ["change","blur"] }],
         backImage: [{ required: true, message: "请上传背景图1", trigger: ["change","blur"] }],
-        backImage2: [{ required: true, message: "请上传背景图2", trigger: ["change","blur"] }],
+        backImage2: [{ required: false, message: "请上传背景图2", trigger: ["change","blur"] }],
         productBg: [{ required: true, message: "请选择产品区域背景色值", trigger: ["change","blur"] }],
       },
 

src/views/tourism/marketingActivities/model/selectMemberInformation.vue

@@ -5,7 +5,7 @@
             <div class="c_left_tag" v-if="modalDetails.length>0">
                 <el-tag class="tag" size="closable" v-for="(item, index) in modalDetails" :key="index"
                     @close="handleCloseCopy(item)" closable>
-                    {{ item.name }}
+                    {{ item.name }}({{ item.memberCode }})
                     </el-tag>
             </div>
             <span style="color: #c0c0c0;" v-else>请点击添加，选择会员号</span>
@@ -63,7 +63,7 @@
                                 @change="(val)=>changeCheckbox(item,index,val)"
                                     :key="index">{{
                                         item.name
-                                    }}</el-checkbox>
+                                    }}--(会员号：{{ item.memberCode }})</el-checkbox>
                             </div>
                             
                         </div>

src/views/tourism/marketingActivities/templateManagement.vue

@@ -103,7 +103,7 @@
         },
         configUrl: {
           list: '/merchant/merchantTemplate/pageList', // 列表地址
-          delect: '/merchant/merchantActivityInfo/deleteById', // 删除地址
+          delect: '/merchant/merchantTemplate/deleteById', // 删除地址
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
@@ -200,7 +200,6 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.id || this.ids;
-        return
         this.$modal.confirm('是否确认删除数据项？').then( () => {
           return delTableParamsApi(this.configUrl.delect,{
             id: ids

src/views/tourism/productManagement/formBox/scenicAreaTicketsSpecsForm.vue

@@ -89,7 +89,19 @@
                   </el-radio-group>
                 </div>
               </el-form-item>
-              <el-form-item label="消费日期：" prop="useExpireDateRadio">
+              <!-- <el-form-item label="日期类型：" :prop="'dayTypeRadio'">
+                <div style="display: flex;align-items: center;">
+                  <el-radio-group v-model="form.dayTypeRadio">
+                    <div style="display: flex;align-items: center;">
+                      <el-radio label="-1">日历票</el-radio>
+                      <el-radio style="display: flex;align-items: center;" label="-2">
+                        <span>期票,日期范围内使用</span>
+                      </el-radio>
+                    </div>
+                  </el-radio-group>
+                </div>
+              </el-form-item> -->
+              <el-form-item label="游玩日期：" prop="useExpireDateRadio">
                 <el-radio-group v-model="form.useExpireDateRadio" @input="radioInputs">
                   <div style="display: flex;flex-direction: column;padding-top: 10px;">
                     <div>
@@ -553,7 +565,7 @@ export default {
         params.dayType = params.dayType?params.dayType.join('~'):null
       }
 
-      if(params.useExpireDateRadio == 1) { // 消费日期
+      if(params.useExpireDateRadio == 1) { // 游玩日期
         params['useExpireDate'] = JSON.stringify({
           type: 1,
           value: ''