Browse Source

1. 修复

MONSTER-ygh 1 year ago
parent
commit
e5140f9ac2

+ 4 - 2
src/views/tourism/membershipManagement/electronicMembership/detailsBox/memberInformationDetails.vue

@@ -44,7 +44,9 @@
           <div class="form-title"><span>会员信息</span></div>
           <div style="display: flex;">
             <el-form-item label="会员类型:">
-              <span style="display: block;min-width: 250px;">{{ form.type }}</span>
+              <span style="display: block;min-width: 250px;">
+                <dict-tag :options="dict.type.tourism_memberInformation_user_type" :value="form.type"/>
+              </span>
             </el-form-item>
             <el-form-item label="会员卡号:">
               <span style="display: block;min-width: 250px;">{{ form.name }}</span>
@@ -84,7 +86,7 @@ import {
 
 export default {
   name: "addAndEdit",
-  dicts: ['tourism_memberInformation_sex'],
+  dicts: ['tourism_memberInformation_sex','tourism_memberInformation_user_type'],
   data() {
     return {
       title: "",

+ 8 - 5
src/views/tourism/membershipManagement/electronicMembership/formBox/membershipLevelForm.vue

@@ -170,10 +170,10 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "请输入等级名称", trigger: ["change","blur"] }],
-        logo: [{ required: true, message: "上传图片", trigger: ["change","blur"] }],
-        upIntegral: [{ required: true, message: "输入所需积分值", trigger: ["change","blur"] }],
-        discount: [{ required: true, message: "输入基本折扣", trigger: ["change","blur"] }],
-        integralRatio: [{ required: true, message: "输入积分成长系数", trigger: ["change","blur"] }],
+        logo: [{ required: true, message: "上传图片", trigger: ["change","blur"] }],
+        upIntegral: [{ required: true, message: "输入所需积分值", trigger: ["change","blur"] }],
+        discount: [{ required: true, message: "输入基本折扣", trigger: ["change","blur"] }],
+        integralRatio: [{ required: true, message: "输入积分成长系数", trigger: ["change","blur"] }],
       },
       scenicAreaProducts: [],// 景点产品关联
 
@@ -332,7 +332,10 @@ export default {
 
     /** 填加单品  */
     addClassifyList(){
-      let list = JSON.parse(JSON.stringify(this.form.classifyList))
+      let list = []
+      if(this.form.classifyList) {
+        list = JSON.parse(JSON.stringify(this.form.classifyList))
+      }
       list.push({
         classifyId: null,
         discount: null,

+ 1 - 1
src/views/tourism/orderManagement/ticketOrdersAll/detailsBox/ticketOrdersDetails.vue

@@ -37,7 +37,7 @@
               <span style="display: block; min-width: 250px;">{{ form.memberMobile }}</span>
             </el-form-item>
             <el-form-item label="身份证号:">
-              <span style="display: block; min-width: 250px;">{{ "--" }}</span>
+              <span style="display: block; min-width: 250px;">{{ form.idcard}}</span>
             </el-form-item>
           </div>
 

+ 2 - 2
src/views/tourism/orderManagement/ticketOrdersAll/ticketOrders.vue

@@ -35,10 +35,10 @@
             <el-form-item label="游玩时间" prop="performTime">
               <el-date-picker
                 v-model="queryParams.performTime"
-                type="datetimerange"
+                type="daterange"
                 range-separator="至"
                 start-placeholder="开始日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd"
                 end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>

+ 4 - 4
src/views/tourism/scenicAreaManagement/contentManagement/attractionInfoManagement.vue

@@ -132,7 +132,7 @@
   import { 
     listTableApi, 
     delTableParamsApi, 
-    addTableApi
+    updateTableApi
   } from "@/api/CURD";
   import addAndEdit from "./formBox/attractionInfoManagementForm.vue"
   export default {
@@ -156,7 +156,7 @@
           upload: '',// 导入地址
           download:'', // 下载模板地址
           export: '',// 导出地址
-          edit: '/merchant/merchantPoints/insertOrUpdate', // 编辑地址
+          updateStatus: '/merchant/merchantPoints/updateStatus', // 编辑地址
         },
         // 遮罩层
         loading: true,
@@ -286,8 +286,8 @@
       openAttraction(row) {
         console.log("row======",row)
         this.$modal.confirm(`是否确认${row.status == 2 ? '关闭' : '打开'} ${row.name}景点吗?`).then( () => {
-          return addTableApi(this.configUrl.edit,{
-            ...row,
+          return updateTableApi(this.configUrl.updateStatus,{
+            id: row.id,
             status: row.status == 1 ? 2 : 1
           });
         }).then(() => {

+ 4 - 4
src/views/tourism/scenicAreaManagement/navigationManagement/scenicGuide.vue

@@ -52,8 +52,8 @@
               v-model="scope.row.status" 
               @changeFun="openAttraction(scope.row)" 
               :disabled="false"
-              :active-value="1"
-              :inactive-value="0"
+              :active-value="0"
+              :inactive-value="1"
                />
             </template>
           </el-table-column>
@@ -271,14 +271,14 @@ export default {
     /** 开/闭 园 */
     openAttraction(row) {
       console.log("row======",row)
-      this.$modal.confirm(`是否确认${row.status == 0 ? '启用' : '禁用'} ${row.name}点位吗?`).then( () => {
+      this.$modal.confirm(`是否确认${row.status == 1 ? '启用' : '禁用'} ${row.name}点位吗?`).then( () => {
         return addTableApi(this.configUrl.edit,{
           ...row,
           status: row.status == 0 ? 1 : 0
         });
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess(`${row.status == 0 ? '启用' : '禁用'}成功`);
+        this.$modal.msgSuccess(`${row.status == 1 ? '启用' : '禁用'}成功`);
       }).catch((e) => {
         console.error("失败====",e)
       });