Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/shop/components/extend.vue

@@ -7,6 +7,7 @@
                     {{ row.row.type == 'text' ? '文本' : '图片' }}
                 </template>
             </el-table-column>
+            <el-table-column label="描述" prop="name"> </el-table-column>
             <el-table-column label="key" prop="autokey"> </el-table-column>
             <el-table-column label="value" prop="value">
                 <template v-slot="row">
@@ -34,7 +35,10 @@
                     <el-radio v-model="form.type" label="text">文本</el-radio>
                     <el-radio v-model="form.type" label="img">图片</el-radio>
                 </el-form-item>
-                <el-form-item label="自定义key">
+                
+                <el-form-item label="描述">
+                    <el-input v-model="form.name" placeholder="请输入内容"></el-input>
+                </el-form-item>   <el-form-item label="自定义key">
                     <el-input v-model="form.autokey" placeholder="请输入内容"></el-input>
                 </el-form-item>
                 <el-form-item label="上传图片" v-if="form.type == 'img'">

src/views/shop/components/goxcx.vue

@@ -0,0 +1,123 @@
+<template>
+    <div>
+        <el-button type="primary" @click="dialogVisible = true">
+            新增
+        </el-button>
+        <!--表格渲染-->
+        <el-table ref="table" :data="tableData" style="width: 100%;">
+            <el-table-column prop="name" label="页面名称" />
+            <el-table-column prop="path" label="页面路径" />
+            <el-table-column prop="status" label="状态">
+                <template v-slot="scope">
+                    {{ scope.row.status == 1 ? "可见" : "不可见" }}
+                </template>
+            </el-table-column>
+            <el-table-column prop="createTime" label="创建日期" />
+            <el-table-column label="操作" width="200">
+                <template v-slot="scope">
+                    <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+                    <el-popconfirm title="确定删除吗？" @confirm="delHandle(scope.row.id)">
+                        <el-button type="text" round slot="reference">
+                            删除
+                        </el-button>
+                    </el-popconfirm>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- <div class="">
+            <el-pagination :total="tableData.length" layout="total,  prev, pager, next, jumper"></el-pagination>
+        </div> -->
+        <!-- 增减余额弹窗 -->
+        <el-dialog :title="title + '页面'" :visible.sync="dialogVisible" width="30%">
+            <el-form ref="form" :model="form" label-width="80px">
+                <el-form-item label="页面名称">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item> <el-form-item label="页面路径">
+                    <el-input v-model="form.path"></el-input>
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-radio-group v-model="form.status">
+                        <el-radio :label="1">可见</el-radio>
+                        <el-radio :label="2">不可见</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="sumbit">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import { miniAppPagesget, miniAppPagespost, miniAppPagesput, miniAppPagesdelete } from '@/api/goxcx'
+export default {
+    data() {
+        return {
+            tableData: [],
+            form: {
+                name: "",
+                path: "",
+                status: 1,
+            },
+            title: '新增',
+            dialogVisible: false
+        }
+    },
+    mounted() {
+        this.getList()
+    },
+    watch: {
+        'form.type': (n, o) => {
+            if (n == 'img') {
+            }
+        }
+    },
+
+    methods: {
+        async sumbit() {
+            this.dialogVisible = false
+            if (this.title == '新增') {
+                await miniAppPagespost(this.form)
+
+                this.$message({
+                    message: '添加成功',
+                    type: 'success'
+                })
+            } else {
+                await miniAppPagesput(this.form)
+
+                this.$message({
+                    message: '编辑成功',
+                    type: 'success'
+                })
+            }
+            this.form = {
+                status: 1
+            }
+            this.getList()
+        },
+        // 编辑
+        async edit(item) {
+            this.title = '编辑'
+            this.dialogVisible = true
+            this.form = item
+        },
+        // 删除
+        async delHandle(pagesId) {
+            let res = await miniAppPagesdelete(pagesId)
+            this.$message({
+                message: '删除成功',
+                type: 'success'
+            })
+            this.getList()
+        },
+        async getList() {
+            let res = await miniAppPagesget()
+            this.tableData = res
+        },
+
+    }
+}
+</script>
+<style></style>

src/views/shop/shop_configuration.vue

@@ -6,6 +6,7 @@
             <!-- <el-tab-pane label="通知配置" name="3"></el-tab-pane> -->
             <el-tab-pane label="安全设置" name="4"></el-tab-pane>
             <el-tab-pane label="扩展参数" name="5"></el-tab-pane>
+            <el-tab-pane label="跳转小程序" name="6"></el-tab-pane>
             
         </el-tabs>
         <shopInfo v-if="activeName == 1" />
@@ -13,6 +14,7 @@
         <notice v-if="activeName == 3" />
         <securitySetting v-if="activeName == 4" />
         <extend v-if="activeName == 5" />
+        <goxcx v-if="activeName == 6" />
         
     </div>
 </template>
@@ -23,11 +25,12 @@ import shopSetting from './components/shopSetting'
 import notice from './components/notice'
 import securitySetting from './components/securitySetting'
 import extend from './components/extend'
+import goxcx from './components/goxcx'
 export default {
     components: {
         shopInfo,
         shopSetting,
-        notice,securitySetting,extend
+        notice,securitySetting,extend,goxcx
     },
     data() {
         return {