商城内部链接选择

admin-ui/.env.development

@@ -7,10 +7,10 @@ ENV = 'development'
 
 # VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
 # VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
-# VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
-# VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
+# VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+# VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API_HOST = 'http://192.168.5.176:9801/'
+VUE_APP_BASE_API = 'http://192.168.5.176:9801/'
 
 
 # 路由懒加载

admin-ui/src/views/app/banner/index.vue

@@ -41,7 +41,7 @@
 
         <Page uri="/app/banner/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="ID" align="center" prop="id" />
-            <el-table-column label="图片" align="center" prop="imgUrl" width="100">
+            <el-table-column label="图片" align="center" prop="imgUrl" width="110">
                 <template slot-scope="scope">
                     <el-image style="width: 80px; height: 80px" :src="scope.row.imgUrl" :preview-src-list="[scope.row.imgUrl]"> </el-image>
                 </template>
@@ -72,7 +72,8 @@
             <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
             <el-table-column label="修改人" align="center" prop="updateBy" />
             <el-table-column label="修改时间" align="center" prop="createTime" width="180" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="排序" align="center" prop="sort" width="100" />
+            <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="[bannerType == 0 ? 'app:banner:edit' : 'app:launchAdver:edit']">修改</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="[bannerType == 0 ? 'app:banner:remove' : 'app:launchAdver:remove']">删除</el-button>
@@ -123,7 +124,10 @@
                     </el-col>
                     <el-col :span="24" v-if="form.clickType == '3'">
                         <el-form-item label="跳转内容" prop="redirectContent">
-                            <el-input v-model="form.redirectContent" placeholder="请输入内部页面路径" />
+                            <!-- <el-input v-model="form.redirectContent" placeholder="请输入内部页面路径" /> -->
+                             <el-select v-model="form.redirectContent" placeholder="请选择内部页面路径">
+                                <el-option v-for="item in tabList" :key="item.url" :label="item.name" :value="item.url" />
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24" v-if="bannerType == 3">
@@ -140,6 +144,11 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="24" v-if="bannerType == 3">
+                        <el-form-item label="排序">
+                            <el-input-number v-model="form.sort" :min="1" step="1" :max="10000"></el-input-number>
+                        </el-form-item>
+                    </el-col>
                 </el-form>
             </el-row>
             <div slot="footer" class="dialog-footer">
@@ -152,6 +161,9 @@
 
 <script>
 import { listBanner, getBanner, delBanner, addBanner, updateBanner } from '@/api/app/banner'
+import {
+    groupDataListApi
+} from "@/api/system/group";
 
 export default {
     name: 'Banner',
@@ -229,7 +241,8 @@ export default {
                     }
                 ]
             },
-            bannerType: ''
+            bannerType: '',
+            tabList: []
         }
     },
     created() {
@@ -237,6 +250,16 @@ export default {
         this.queryParams.bannerType = this.bannerType
         this.form.bannerType = this.bannerType
         this.getList()
+
+        groupDataListApi({
+            page: 1,
+            limit: 100,
+            gid: 5
+        }).then(async (res) => {
+            this.tabList = res.rows;
+        }).catch((res) => {
+            this.$message.error(res.msg);
+        });
     },
     methods: {
         onClickTypeChange() {
@@ -296,7 +319,8 @@ export default {
                 imgUrl: null,
                 clickType: null,
                 redirectContent: null,
-                status: '0'
+                status: '0',
+                sort: 0
             }
             this.resetForm('form')
         },

admin-ui/src/views/recharge/type/index.vue

@@ -2,8 +2,8 @@
     <div class="app-container">
         <el-card class="box-card" shadow="never">
             <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="80px">
-                <el-form-item label="规则名称" prop="title">
-                    <el-input v-model="queryParams.title" placeholder="请输入规则名称" clearable prefix-icon="el-icon-search" style="width: 240px" @keyup.enter.native="handleQuery" />
+                <el-form-item label="套餐名称" prop="title">
+                    <el-input v-model="queryParams.title" placeholder="请输入套餐名称" clearable prefix-icon="el-icon-search" style="width: 240px" @keyup.enter.native="handleQuery" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -16,15 +16,15 @@
             <div slot="header" class="clearfix">
                 <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
-                        <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['recharge:type:add']">新增规则</el-button>
+                        <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd" v-hasPermi="['recharge:type:add']">新增套餐</el-button>
                     </el-col>
                     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
                 </el-row>
             </div>
 
             <Page uri="/mapi/recharge/type/list" :request-params="queryParams" ref="pagination">
-                <el-table-column label="规则编号" align="center" prop="id" min-width="100" />
-                <el-table-column label="规则名称" align="center" prop="title" min-width="160" :show-overflow-tooltip="true" />
+                <el-table-column label="套餐编号" align="center" prop="id" min-width="100" />
+                <el-table-column label="套餐名称" align="center" prop="title" min-width="160" :show-overflow-tooltip="true" />
                 <el-table-column label="充值金额" align="center" min-width="120">
                     <template slot-scope="scope">
                         <span class="amount">¥{{ scope.row.rechargeAmount }}</span>
@@ -71,8 +71,8 @@
                     </div>
                     <el-row :gutter="20">
                         <el-col :span="12">
-                            <el-form-item label="规则名称" prop="title">
-                                <el-input v-model="form.title" placeholder="请输入规则名称" />
+                            <el-form-item label="套餐名称" prop="title">
+                                <el-input v-model="form.title" placeholder="请输入套餐名称" />
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
@@ -189,7 +189,7 @@ export default {
             showSearch: true,
             // 总条数
             total: 0,
-            // 充值规则管理表格数据
+            // 充值套餐管理表格数据
             typeList: [],
             // 弹出层标题
             title: '',
@@ -218,7 +218,7 @@ export default {
         this.getList()
     },
     methods: {
-        /** 查询充值规则管理列表 */
+        /** 查询充值套餐管理列表 */
         getList() {
             this.$nextTick(() => {
                 this.$refs.pagination.handleSearch(true)
@@ -269,7 +269,7 @@ export default {
         handleAdd() {
             this.reset()
             this.open = true
-            this.title = '添加充值规则管理'
+            this.title = '添加充值套餐管理'
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
@@ -278,7 +278,7 @@ export default {
             getType(id).then((response) => {
                 this.form = response.data
                 this.open = true
-                this.title = '修改充值规则管理'
+                this.title = '修改充值套餐管理'
             })
         },
         /** 提交按钮 */
@@ -305,7 +305,7 @@ export default {
         handleDelete(row) {
             const ids = row.id || this.ids
             this.$modal
-                .confirm('是否确认删除充值规则管理编号为"' + ids + '"的数据项？')
+                .confirm('是否确认删除充值套餐管理编号为"' + ids + '"的数据项？')
                 .then(function () {
                     return delType(ids)
                 })