1. 完成登录得改造

src/api/login.js

@@ -45,8 +45,8 @@ export function logout() {
     method: 'post'
   })
 }
-
-// 获取验证码
+ 
+// 获取验证码 （密码登录）
 export function getCodeImg() {
   return request({
     url: '/system/captcha/generate',
@@ -57,3 +57,31 @@ export function getCodeImg() {
     timeout: 20000
   })
 }
+
+// 获取验证码
+export function getCodeNum(data) {
+  return request({
+    url: '/merchant/merchantAuth/sendSmsCode',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data,
+    timeout: 20000
+  })
+}
+
+export function loginCode(username, code) {
+  const data = {
+    username,
+    code
+  }
+  return request({
+    url: '/merchant/merchantAuth/loginByCode',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}

src/api/tourism/scenicAreaManagement/attractionInfo.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 分页查询
+export const pageList = (query) => {
+  return request({
+    url: '/merchantDetail/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+export const ticketPageList = (query) => {
+  return request({
+    url: '/goods/goods/pageList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增/修改
+export const saveAndEdit = (data) => {
+  return request({
+    url: '/goods/goods/insertOrUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除模板
+export const deleteById = (id) => {
+  return request({
+    url: '/goods/goods/deleteById',
+    method: 'delete',
+    params: {id:id}
+  })
+}
+
+// 修改上/下架状态
+export const updateStatus = (query) => {
+  return request({
+    url: '/goods/goods/updateStatus',
+    method: 'get',
+    params: query
+  })
+}
+
+// id获取详情
+export function getSelectById(id) {
+  return request({
+    url: '/goods/goods/selectById?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获取行政区划
+export function basePositionApi(data) {
+  return request({
+    url: '/system/basePosition/list',
+    method: 'get',
+    params:data
+  })
+}

src/store/modules/user.js

@@ -1,4 +1,4 @@
-import { login, logout, getInfo } from '@/api/login'
+import { login, logout, getInfo,loginCode } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const user = {
@@ -36,13 +36,23 @@ const user = {
       const code = userInfo.code
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
-          setToken(res.data.access_token)
-          commit('SET_TOKEN', res.data.access_token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
+        if(userInfo.loginType == 1){ // 密码登录
+          login(username, password, code, uuid).then(res => {
+            setToken(res.data.access_token)
+            commit('SET_TOKEN', res.data.access_token)
+            resolve()
+          }).catch(error => {
+            reject(error)
+          })
+        }else { // 验证码登录
+          loginCode(username,  code).then(res => {
+            setToken(res.data.access_token)
+            commit('SET_TOKEN', res.data.access_token)
+            resolve()
+          }).catch(error => {
+            reject(error)
+          })
+        }
       })
     },
 

src/views/login.vue

@@ -1,68 +1,134 @@
 <template>
   <div class="login" :class="processClass">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title"> {{loginTitle}}</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+    <div class="login-box">
+      <div class="login-from-bgm">
+        <img :src="require('@/assets/login/from_left.png')" alt="">
+      </div>
+      <div class="login-from-box">
+        <div class="login-from-title">
+          <img :src="require('@/assets/login/from_title.png')" alt="">
+          <span> {{loginTitle}}</span>
         </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
+        
+        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+          <div class="login-from-tab">
+            <div 
+            v-for="(item,index) in loginTypeList"
+            :key="index"
+            @click="setLoginType(item)"
+            :class="[ item.type == loginForm.loginType ? 'login-from-tab-action' : '' ]"
+            >
+              <span>{{ item.name }}</span>
+              <span></span>
+            </div>
+          </div>
+          <!--  账号登录  -->
+          <div style="min-height: calc( 100% - 200px );width: 100%;" v-if="loginForm.loginType == 1">
+            <el-form-item prop="username">
+              <el-input
+                v-model="loginForm.username"
+                type="text"
+                auto-complete="off"
+                placeholder="账号"
+              >
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+              <el-input
+                v-model="loginForm.password"
+                type="password"
+                auto-complete="off"
+                placeholder="密码"
+                @keyup.enter.native="handleLogin"
+              >
+                <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="code" v-if="captchaEnabled">
+              <el-input
+                v-model="loginForm.code"
+                auto-complete="off"
+                placeholder="验证码"
+                style="width: 63%"
+                @keyup.enter.native="handleLogin"
+              >
+                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+              </el-input>
+              <div class="login-code">
+                <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+              </div>
+            </el-form-item>
+            <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+          </div>
+          <!--  验证码登录  -->
+          <div style="min-height: calc( 100% - 200px );width: 100%;" v-if="loginForm.loginType == 2">
+            <el-form-item prop="phone">
+              <el-input
+                v-model="loginForm.phone"
+                type="text"
+                auto-complete="off"
+                placeholder="手机号"
+                @keyup.enter.native="getCode()"
+              >
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="code" v-if="captchaEnabled">
+              <el-input
+                v-model="loginForm.code"
+                auto-complete="off"
+                placeholder="验证码"
+                style="width: 63%"
+                @keyup.enter.native="handleLogin"
+              >
+                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+              </el-input>
+              <div class="login-code">
+                <el-button
+                  :loading="codeLoading"
+                  size="medium"
+                  type="primary"
+                  style="width:100%;background: linear-gradient( 90deg, #34F8F3 0%, #1AA0F2 100%);"
+                  @click="getCode"
+                  round
+                >
+                  <span v-if="!codeLoading && !codeType">获取验证码</span>
+                  <span v-if="!codeLoading && codeType == 2">重新获取</span>
+                  <span v-if="codeLoading">重新获取</span>
+                  <span v-if="!codeLoading && codeType == 1">{{ codeEffectiveTime }}s后重新获取</span>
+                </el-button>
+              </div>
+            </el-form-item>
+          </div> 
+          <el-form-item style="width:100%;">
+              <el-button
+                :loading="loading"
+                size="medium"
+                type="primary"
+                style="width:100%;background: linear-gradient( 90deg, #34F8F3 0%, #1AA0F2 100%);"
+                @click.native.prevent="handleLogin"
+                round
+              >
+                <span v-if="!loading">登 录</span>
+                <span v-else>登 录 中...</span>
+              </el-button>
+              <div style="float: right;" v-if="register">
+                <router-link class="link-type" :to="'/register'">立即注册</router-link>
+              </div>
+            </el-form-item>
+        </el-form>
+      </div>
+    </div>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2023 达泽科技 All Rights Reserved.</span>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
+import { getCodeImg,getCodeNum } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 
@@ -77,12 +143,19 @@ export default {
         password: "admin123",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
+
+        loginType: 1,
+        phone: null,
       },
       loginRules: {
         username: [
           { required: true, trigger: ["change","blur"], message: "请输入您的账号" }
         ],
+        phone: [
+          { required: true, trigger: ["change","blur"], message: "请输入您的账号" },
+          { pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: ["change","blur"] }
+        ],
         password: [
           { required: true, trigger: ["change","blur"], message: "请输入您的密码" }
         ],
@@ -94,7 +167,17 @@ export default {
       // 注册开关
       register: false,
       redirect: undefined,
-      processClass: ''
+      processClass: '',
+
+      // 登录类型
+      loginTypeList: [
+        { name: '密码登录', type: 1 },
+        { name: '验证码登录', type: 2 },
+      ],
+      codeLoading: false,// 加载获取验证码
+      codeTime: false, // 验证码失效时间
+      codeType: null, // 获取验证码是否成功的标识 0: 失败  1： 成功
+      codeEffectiveTime: 60,
     };
   },
   watch: {
@@ -123,15 +206,50 @@ export default {
   },
   methods: {
     getCode() {
-      getCodeImg().then(res => {
-        // this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
-        // if (this.captchaEnabled) {
-        //   this.codeUrl =  res.data.captchaImage;
-        //   this.loginForm.uuid = res.data.captchaKey;
-        // }
-        this.codeUrl =  res.data.captchaImage;
-        this.loginForm.uuid = res.data.captchaKey;
-      });
+      if(this.loginForm.loginType == 1) { // 密码登录
+        getCodeImg().then(res => {
+          this.codeUrl =  res.data.captchaImage;
+          this.loginForm.uuid = res.data.captchaKey;
+        }).catch(()=> {
+          this.codeUrl =  null;
+          this.loginForm.uuid = null;
+        })
+      }else if(this.loginForm.loginType == 2) { // 验证码登录
+        // 定义手机号格式的正则表达式
+        var regExp = /^1[3456789]\d{9}$/;
+        if( this.codeType == 1 || !regExp.test(this.loginForm.phone)) {
+          if(!regExp.test(this.loginForm.phone)) {
+            this.$refs.loginForm.validateField(['phone'])
+          }
+          return
+        }
+        if(this.codeLoading || this.codeEffectiveTime != 60 || this.codeType == 1) return
+        this.codeEffectiveTime = 60
+
+        if( this.codeTime ) {
+          clearInterval(this.codeTime)
+        }
+        this.codeLoading = true
+        getCodeNum({
+          "mobile": this.loginForm.phone
+        }).then(res => {
+          this.codeType = 1
+          this.codeLoading = false
+          this.codeEffectiveTime = 60
+          this.codeTime = setInterval(()=>{
+            this.codeEffectiveTime = this.codeEffectiveTime - 1
+            if( this.codeEffectiveTime <= 0 ) {
+              this.codeType = null
+              clearInterval(this.codeTime)
+              this.codeEffectiveTime = 60
+            }
+          },1000)
+        }).catch(()=> {
+          this.codeType = 2
+          this.codeLoading = false
+        })
+      }
+      
     },
     getCookie() {
       const username = Cookies.get("username");
@@ -140,23 +258,29 @@ export default {
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+        loginType: 1,
       };
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
+          if(this.loginForm.loginType == 1){
+            if (this.loginForm.rememberMe) {
+              Cookies.set("username", this.loginForm.username, { expires: 30 });
+              Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
+              Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+            } else {
+              Cookies.remove("username");
+              Cookies.remove("password");
+              Cookies.remove('rememberMe');
+            }
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
+            if( this.codeTime ) {
+              clearInterval(this.codeTime)
+            }
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;
@@ -166,6 +290,14 @@ export default {
           });
         }
       });
+    },
+    /**  选择登录方式  */
+    setLoginType(item) {
+      this.$set( this.loginForm, 'loginType', item.type)
+      this.$set( this.loginForm, 'code', null)
+      this.$nextTick(()=>{
+        this.$refs.loginForm.clearValidate()
+      })
     }
   }
 };
@@ -179,6 +311,95 @@ export default {
   height: 100%;
   background-size: cover;
 }
+
+.login-box {
+  display: flex;
+  height: 602px;
+  .login-from-bgm {
+    width: 872px;
+    height: 100%;
+    box-sizing: border-box;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  .login-from-box {
+    width: 602px;
+    height: 100%;
+    box-sizing: border-box;
+    background-image: url(../assets/login/from_right.png);
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    display: flex;
+    flex-direction: column;
+    .login-from-title {
+      display: flex;
+      align-items: center;
+      padding: 34px 0 0 48px;
+      img {
+        width: 46px;
+        height: 42px;
+      }
+      span {
+        font-family: SourceHanSansCN, SourceHanSansCN;
+        font-weight: 500;
+        font-size: 30px;
+        color: #FFFFFF;
+        margin-left: 15px;
+      }
+    }
+
+    .login-from-tab {
+      width: 100%;
+      display: flex;
+      padding: 10px 20px 30px;
+      >div {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        cursor: pointer;
+        >span:first-child {
+          color: #fff;
+          font-family: SourceHanSansCN, SourceHanSansCN;
+          font-weight: 400;
+          font-size: 22px;
+          color: #FFFFFF;
+        }
+        >span:last-child {
+          color: #fff;
+          width: 40px;
+          height: 4px;
+          margin-top: 5px;
+        }
+        
+      }
+
+      >div:first-child {
+        padding-right: 20px;
+      }
+
+      >div:last-child {
+        padding-left: 20px;
+      }
+      .login-from-tab-action {
+        >span:first-child {
+          font-family: SourceHanSansCN, SourceHanSansCN;
+          font-weight: bold;
+          font-size: 22px;
+        }
+        >span:last-child {
+          background: linear-gradient( 225deg, #FFFFFF 0%, #FFFFFF 100%);
+          border-radius: 3px;
+        }
+      }
+    }
+  }
+}
+
 .login-prod{
   background-image: url("../assets/images/login-bg-img.png") !important;
 }
@@ -196,10 +417,16 @@ export default {
 
 .login-form {
   border-radius: 6px;
-  background: rgba(255,255,255,0.62);
+  //background: rgba(255,255,255,0.62);
   backdrop-filter: blur(5px);
-  width: 400px;
-  padding: 25px 25px 5px 25px;
+  width: 100%;
+  height: calc( 100% - 100px );
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 25px 120px 25px;
+  box-sizing: border-box;
   .el-input {
     height: 38px;
     input {
@@ -211,6 +438,16 @@ export default {
     width: 14px;
     margin-left: 2px;
   }
+  .el-input__inner {
+    border-radius: 29px;
+    border: 1px solid #FFFFFF;
+    --color-bgm: 'none';
+    background-color: var(--color-bgm);
+    color: #fff;
+  }
+  .el-checkbox__input.is-checked + .el-checkbox__label {
+    color: #ffffff;
+  } 
 }
 .login-tip {
   font-size: 13px;

src/views/register.vue

@@ -61,7 +61,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 达泽科技 All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -152,7 +152,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url("../assets/images/login-background.png");
   background-size: cover;
 }
 .title {

src/views/tourism/scenicAreaManagement/contentManagement/attractionInfo.vue

@@ -0,0 +1,273 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="票务名称">
+          <el-input
+            v-model="queryParams.goodsName"
+            placeholder="请输入票务名称"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+                v-hasPermi="['ticketMr:ticketMr:add']"
+              >新增</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table ref="tables" v-loading="loading" :data="dataList" border>
+        <el-table-column label="序号" align="center" type="index" width="60"></el-table-column>
+        <el-table-column label="票务名称" align="center" prop="goodsName" />
+        <el-table-column label="销售价" align="center">
+          <template slot-scope="scope">
+            <span>￥{{ scope.row.salePrice }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否限购" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" v-if="scope.row.goodsPerform.buyAstrict > -1">是</el-tag>
+            <el-tag type="danger" v-if="scope.row.goodsPerform.buyAstrict == -1">否</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="销售渠道" align="center">
+          <template slot-scope="scope">
+            <span>{{ 
+            (scope.row.goodsPerform.channelWx == 0 ? '小程序' : '') + 
+            ' ' + 
+            (scope.row.goodsPerform.channelWindow == 0 ? '窗口' : '') +
+            ' ' + 
+            (scope.row.goodsPerform.channelAutoSale == 0 ? '自助售/取票机' : '')}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否可退" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" v-if="scope.row.goodsPerform.backStatus == 0">可退</el-tag>
+            <el-tag type="danger" v-if="scope.row.goodsPerform.backStatus == 1">不可退</el-tag>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="销售有效期" align="center">
+          <template slot-scope="scope">
+            <span>{{ 
+              scope.row.goodsPerform && scope.row.goodsPerform.saleBeginTime && scope.row.goodsPerform.saleEndTime ? 
+              scope.row.goodsPerform.saleBeginTime +'--'+ scope.row.goodsPerform.saleEndTime :
+              '-'
+            }}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="状态" align="center">
+          <template slot-scope="scope">
+            <el-switch
+              @change="ionlineApi(scope.row)"
+              v-model="scope.row.switchValue"
+              :active-value="0"
+              active-color="#13ce66"
+              inactive-color="#ff4949">
+            </el-switch>
+          </template>
+        </el-table-column>
+  
+        <el-table-column label="添加时间" align="center" prop="createTime" width="160" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+  
+        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="openDetails(scope.row)"
+              v-hasPermi="['ticketMr:ticketMr:details']"
+            >详情</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.status != 0"
+              v-hasPermi="['ticketMr:ticketMr:edit']"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDelete(scope.row,scope.index)"
+              v-hasPermi="['ticketMr:ticketMr:delete']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+  
+      <!-- 新增/编辑弹框 -->
+      <add-and-edit
+        ref="addAndEdit"
+        @getList="getList"
+      />
+  
+      <!-- 详情 -->
+      <details-dia ref="detailsDia"></details-dia>
+  
+    </div>
+  </template>
+  
+  <script>
+  
+  import { pageList, deleteById, updateStatus } from '@/api/tourism/scenicAreaManagement/attractionInfo'
+  import addAndEdit from "./dialog/addAndEdit";
+  import detailsDia from "./dialog/details.vue";
+  
+  export default {
+    name: "agreement",
+    dicts: ['agreement_type'],
+    components: { addAndEdit, detailsDia },
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 用户表格数据
+        dataList: null,
+        // 弹出层标题
+        title: "",
+  
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          type: undefined,
+          goodsType: 2,
+          classifyId: 1
+        },
+        statusList: [
+          {id: 1, name: '未发布', value: 0},
+          {id: 2, name: '发布', value: 1},
+          {id: 3, name: '下架', value: 2},
+        ],
+        visibleStatus: false,
+        newObj: {},
+        visibleType: ''
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询列表 */
+      getList() {
+        this.loading = true;
+        pageList(this.addDateRange(this.queryParams, this.dateRange))
+        .then(response => {
+            this.dataList = response.data.rows;
+            this.dataList.forEach(item =>{
+              item.switchValue = item.status;
+            })
+            this.total = response.data.total;
+            this.loading = false;
+          }
+        );
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.dateRange = [];
+        this.$set(this.queryParams, 'goodsName', '');
+        this.queryParams.pageNum = 1;
+        this.handleQuery();
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.$refs["addAndEdit"].openDialog("新增数据", null);
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.$refs["addAndEdit"].openDialog("修改数据", row);
+      },
+      /** 详情按钮操作 */
+      openDetails(row) {
+        this.$refs["detailsDia"].openDialog("详情", row);
+      },
+  
+      /** 发布或者取消发布按钮操作 */
+      ionlineApi(row) {
+        try {
+          updateStatus({ id: row.id, status: row.status == 0 ? 1 : 0 }).then((res) => {
+            if (res.code == 200) {
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+              this.getList();
+            }
+          });
+        }catch (e) {
+          this.getList();
+        }
+      },
+  
+      // 修改是否启用
+      changeStatus(row) {
+        console.log(row)
+      },
+  
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        this.$modal.confirm('是否确认删除数据票务名称为"' + row.goodsName + '"的数据项？').then(function() {
+          return deleteById(row.id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+      },
+      /** 查看按钮操作 */
+      seeCenter(obj, type) {
+        this.visibleStatus = true
+        this.visibleType = type;
+        this.newObj = obj;
+      }
+    }
+  };
+  </script>
+  

src/views/tourism/scenicAreaManagement/contentManagement/dialog/addAndEdit.vue

@@ -0,0 +1,294 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="800px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog">
+      <el-form v-if="open" :model="form" ref="form" :rules="rules" label-width="120px">
+        
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="cancel">取消</el-button>
+      <el-button
+        type="primary"
+        @click="submitForm"
+        v-loading.fullscreen.lock="loading"
+        element-loading-text="提交中..."
+        element-loading-spinner="el-icon-loading"
+        element-loading-background="rgba(0, 0, 0, 0.8)"
+      >
+        <span v-if="loading">提交中...</span>
+        <span v-else>保存</span>
+      </el-button>
+    </span>
+    <!-- 添加或修改对话框 End -->
+  </el-dialog>
+</template>
+
+<script>
+import { saveAndEdit, getSelectById } from '@/api/tourism/scenicAreaManagement/attractionInfo'
+export default {
+  name: "addAndEdit",
+  dicts: [],
+  data() {
+    return {
+      title: "",
+      model: "EDIT", // 弹出模式   
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+        type: "",
+        content: "",
+        isAuth: '1',
+        backTime: '1',
+        goodsPerform: {}
+      },
+      rules: {
+        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
+      }
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      this.reset();
+      this.activeName = '01';
+      if (obj){
+        this.title = "编辑票务管理";
+        this.getSelectByIdApi(obj)
+      }else{
+        this.title = "添加票务管理";
+        this.$nextTick(() => {
+          this.$refs["form"].clearValidate();
+        });
+      }
+    },
+    /** 获取详情 */
+    getSelectByIdApi(row) {
+      const id = row.id
+      getSelectById(id).then(response => {
+        const obj = response.data;
+        this.$nextTick(() => {
+          this.form = {}
+        });
+      });
+    },
+    /** 价格输入事件 */
+    changePriceAmount(key) {
+      if(this.form[key] * 1 < 0){
+        this.$message.error("输入需大于或等于0!");
+        this.$set(this.form, key, '');
+        return false
+      }
+    },
+    /**
+     * 保存
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    submitForm() {
+      this.$refs["form"].validate(async (valid) => {
+        if (valid) {
+          try {
+            let postMap = {
+              goodsPerform: {},
+              performRefundRule: {}
+            }
+            if(this.form.id){
+              postMap.id = this.form.id;
+            }
+            postMap.goodsName = this.form.goodsName;
+            postMap.isAuth = this.form.isAuth;
+            postMap.goodsPerform.verificationSpeaker = this.form.verificationSpeaker;
+            postMap.goodsPerform.beforeTime = this.form.beforeTime;
+            postMap.goodsPerform.detail = this.form.detail;
+
+
+            postMap.salePrice = this.form.salePrice;
+            postMap.goodsPerform.buyAstrict = this.form.buyAstrictType == '1' ? this.form.buyAstrict : '-1';
+            if(!(this.form.channelWx || this.form.channelWindow || this.form.channelAutoSale)){
+              this.$message.error("请选择销售渠道!");
+              return false;
+            }
+            postMap.taxRate = this.form.taxRate
+            postMap.goodsPerform.channelWx = this.form.channelWx ? 0 : 1;
+            postMap.goodsPerform.channelWindow = this.form.channelWindow  ? 0 : 1;
+            postMap.goodsPerform.channelAutoSale = this.form.channelAutoSale  ? 0 : 1;
+            postMap.goodsPerform.backStatus = this.form.backStatus;
+            if(this.form.backStatus == '0') {
+              postMap.performRefundRule.days = this.form.days;
+              postMap.performRefundRule.hour = this.form.hour;
+            }
+            postMap.goodsType = 2;
+            postMap.classifyId = 1;
+            postMap.classifyName = "门票类";
+            postMap.saleArea = this.form.saleArea&&this.form.saleArea.length>0?this.form.saleArea:[]
+            postMap.goodsPerform.stopSaleTime = this.form.stopSaleTime
+            if(this.form.saleTimeAll && this.form.saleTimeAll.length > 0) {
+              postMap.goodsPerform.saleBeginTime = this.form.saleTimeAll[0];
+              postMap.goodsPerform.saleEndTime = this.form.saleTimeAll[1];
+            }
+
+            this.loading = true;
+            const { code } = await saveAndEdit({ ...postMap });
+            if (code === 200) {
+              this.$message.success("操作成功!");
+              this.$emit("getList");
+              this.cancel();
+            }
+          } catch (error) {
+          } finally {
+            this.loading = false;
+          }
+        }
+      });
+    },
+    /**
+     * 重置
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    reset() {
+      this.$set(this.form, 'id', '');
+      this.$set(this.form, 'goodsName', '');
+      this.$set(this.form, 'isAuth', '1');
+      this.$set(this.form, 'verificationSpeaker', '');
+      this.$set(this.form, 'detail', '');
+      this.$set(this.form, 'goodsPerform', {});
+      this.$set(this.form, 'salePrice', '');
+      this.$set(this.form, 'buyAstrictType', '1');
+      this.$set(this.form, 'buyAstrict', '');
+      this.$set(this.form, 'channelWx', '');
+      this.$set(this.form, 'channelWindow', '');
+      this.$set(this.form, 'beforeTime', '');
+
+      this.$set(this.form, 'backStatus', '');
+      this.$set(this.form, 'backTime', '1');
+      this.$set(this.form, 'taxRate', '');
+      this.$set(this.form, 'backStatus', '');
+      this.$set(this.form, 'days', '');
+      this.$set(this.form, 'hour', '');
+      this.$set(this.form, 'saleArea', '');
+      this.$set(this.form, 'stopSaleTime', '');
+      this.$set(this.form, 'saleTimeAll', '');
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      // this.reset();
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+.el-table{
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+}
+
+.area-container {
+  min-height: 400px;
+}
+
+::v-deep .area-wrap-city.el-cascader {
+  line-height: normal;
+  .el-input {
+    cursor: pointer;
+    width: 100% !important;
+    height: 28px !important;
+    .el-input__inner {
+      display: none !important;
+    }
+    span.el-input__suffix {
+      position: inherit !important;
+      i.el-input__icon {
+        line-height: inherit;
+        margin-left: 5px;
+      }
+    }
+
+    .el-input__wrapper {
+      box-shadow: none;
+      input {
+        display: none;
+      }
+    }
+  }
+
+  .el-cascader__tags {
+    display: none;
+  }
+}
+
+.area-city-popper {
+  .el-cascader-panel {
+    .el-scrollbar.el-cascader-menu {
+      .el-cascader-menu__wrap.el-scrollbar__wrap {
+        height: 315px;
+      }
+    }
+  }
+}
+</style>
+<style>
+.custom-class-box {
+  z-index: 999999 !important;
+}
+</style>

src/views/tourism/scenicAreaManagement/contentManagement/dialog/details.vue

@@ -0,0 +1,114 @@
+<!--
+ * @Description: 详情弹框
+ * @Author: Sugar.
+ * @Date: 2023-11-24 13:55:00
+ * @LastEditors: Sugar.
+ * @LastEditTime: 2023-11-24 13:55:00
+ * @FilePath: \cattle_webui\src\views\ticket\ticketMr\dialog\details.vue
+ * @Copyright: Copyright (c) 2016~2023 by Sugar., All Rights Reserved.
+-->
+<template>
+  <el-dialog
+    title="票务详情"
+    :visible.sync="open"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @close="cancel"
+  >
+    <div class="dialog" v-if="form">
+      
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="cancel">关闭</el-button>
+    </span>
+
+  </el-dialog>
+</template>
+
+<script>
+import { getSelectById } from "@/api/tourism/scenicAreaManagement/attractionInfo";
+export default {
+  name: "detailsDia",
+  data() {
+    return {
+      title: "编辑",
+      model: "EDIT",
+      open: false,
+      loading: false,
+      form: {
+        id: undefined,
+      },
+      performerVisible: false,
+      performerList: []
+    };
+  },
+  methods: {
+    /**
+     * 打开弹框
+     * @date 2023-11-22
+     * @param {any} obj
+     * @returns {any}
+     */
+    openDialog(title, obj) {
+      this.open = true;
+      if (obj){
+        this.getSelectByIdApi(obj)
+      }
+    },
+    /** 获取详情 */
+    getSelectByIdApi(row) {
+      const id = row.id
+      getSelectById(id).then(response => {
+        this.form = response.data;
+      });
+    },
+    /**
+     * 关闭弹框
+     * @date 2023-11-22
+     * @returns {any}
+     */
+    cancel() {
+      this.open = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  padding: 0 30px;
+  max-height: 65vh;
+  overflow-y: auto;
+}
+.dialog {
+  padding: 0 30px;
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+  .title-class{
+    font-size: 16px;
+    font-weight: bold;
+    color: black;
+    margin-bottom: 20px;
+    margin-top: 20px;
+  }
+  .item-class{
+    margin-bottom: 20px;
+  }
+}
+</style>

src/views/tourism/scenicAreaManagement/contentManagement/navigationManagement.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        这个是导览管理
+    </div>
+</template>