Skip to content

A
admin-base
Commit e9d96da5 authored by 赵茹林's avatar 赵茹林
Browse files
Options

修复标签页弹窗bug 

更新静态文件CDN链接
parent d0797f22
Show whitespace changes
Inline Side-by-side
Showing with 254 additions and 312 deletions
index.html
View file @ e9d96da5
...@@ -4,17 +4,16 @@ ...@@ -4,17 +4,16 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="referrer" content="never"> <meta name="referrer" content="never">
<link rel="stylesheet" href="https:////at.alicdn.com/t/font_746649_x1rivf5f5.css"> <link rel="stylesheet" href="https://at.alicdn.com/t/font_746649_x1rivf5f5.css">
<link rel="stylesheet" href="https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css"> <link rel="stylesheet" href="https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css">
<title>唱唱启蒙-后台</title> <title>唱唱启蒙-后台</title>
</head> </head>
<body> <body>
<!-- 先引入 Vue --> <!-- 先引入 Vue -->
<script src="https://cdn.bootcss.com/vue/2.5.17/vue.js"></script> <script src="https://lib.baomitu.com/vue/2.5.17/vue.min.js"></script>
<!-- <script src="https://cdn.bootcss.com/vue/2.5.17/vue.min.js"></script> --> <script src="https://lib.baomitu.com/vuex/3.0.1/vuex.min.js"></script>
<script src="https://unpkg.com/vuex@3.0.1"></script>
<!-- 引入组件库 --> <!-- 引入组件库 -->
<script src="https://cdn.bootcss.com/axios/0.18.0/axios.min.js"></script> <script src="https://lib.baomitu.com/axios/0.18.0/axios.min.js"></script>
<script src="https://lib.baomitu.com/element-ui/2.7.2/index.js"></script> <script src="https://lib.baomitu.com/element-ui/2.7.2/index.js"></script>
<div id="app"></div> <div id="app"></div>
</body> </body>
......
src/components/framework/address-picker/Address.vue
View file @ e9d96da5
...@@ -2,58 +2,34 @@ ...@@ -2,58 +2,34 @@
<div class="address"> <div class="address">
<section style="width:100%; height: 100%;"> <section style="width:100%; height: 100%;">
<el-form :model='form' class='demo-ruleForm' ref='form' label-width="100px" :rules='rules'> <el-form :model='form' class='demo-ruleForm' ref='form' label-width="100px" :rules='rules'>
<el-row :gutter='20'>
<el-col :span='20'>
<el-form-item prop='name' label="收货人"> <el-form-item prop='name' label="收货人">
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter='20'>
<el-col :span='20'>
<el-form-item prop='mobile' label="手机号"> <el-form-item prop='mobile' label="手机号">
<el-input v-model="form.mobile"></el-input> <el-input v-model="form.mobile"></el-input>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter='20' class='address'>
<el-col :span='20'>
<el-form-item prop='province' label="省"> <el-form-item prop='province' label="省">
<el-select v-model='form.province' placeholder='请选择省' @change='proChange'> <el-select v-model='form.province' placeholder='请选择省' @change='proChange'>
<el-option v-for='item in provinces' :key='item.value' :value='item.value' :label="item.label"> <el-option v-for='item in provinces' :key='item.value' :value='item.value' :label="item.label">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter='20' class='address'>
<el-col :span='20'>
<el-form-item prop='city' label="市"> <el-form-item prop='city' label="市">
<el-select v-model='form.city' placeholder='请选择市' @change='cityChange'> <el-select v-model='form.city' placeholder='请选择市' @change='cityChange'>
<el-option v-for='item in cities' :key='item.value' :value='item.value' :label="item.label"> <el-option v-for='item in cities' :key='item.value' :value='item.value' :label="item.label">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter='20' class='address'>
<el-col :span='20'>
<el-form-item prop='district' label="县／区"> <el-form-item prop='district' label="县／区">
<el-select v-model='form.district' placeholder='请选择区/县' @change='districtChange'> <el-select v-model='form.district' placeholder='请选择区/县' @change='districtChange'>
<el-option v-for='item in districts' :key='item.value' :value='item.value' :label="item.label"> <el-option v-for='item in districts' :key='item.value' :value='item.value' :label="item.label">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row :gutter='20' class='address'>
<el-col :span='20'>
<el-form-item prop='detail' label="详细地址"> <el-form-item prop='detail' label="详细地址">
<el-input placeholder='请填写详细地址' :number='true' v-model='form.detail'> <el-input placeholder='请填写详细地址' :number='true' v-model='form.detail'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</section> </section>
</div> </div>
...@@ -61,13 +37,15 @@ ...@@ -61,13 +37,15 @@
<script> <script>
import Address from './addr.js' import Address from './addr.js'
let type = 1 let type = 1
// let provinceValue = 2 // let provinceValue = 2
// let cityValue = 52 // let cityValue = 52
//根据apid查找对象 //根据apid查找对象
function findcity(item) { function findcity(item) {
return item.type == type; return item.type == type;
} }
function findChildren(list, value) { function findChildren(list, value) {
let filtered = list.filter((item) => { let filtered = list.filter((item) => {
return item.value === value return item.value === value
...@@ -77,6 +55,7 @@ ...@@ -77,6 +55,7 @@
// console.log(filtered) // console.log(filtered)
return filtered[0].children return filtered[0].children
} }
//筛选出各省级对象 //筛选出各省级对象
let pObj = Address.filter(findcity) let pObj = Address.filter(findcity)
...@@ -92,14 +71,14 @@ ...@@ -92,14 +71,14 @@
}, },
computed: { computed: {
cities: function () { cities: function () {
if(this.form.province){ if (this.form.province) {
return findChildren(pObj, this.form.province) return findChildren(pObj, this.form.province)
} else { } else {
return [] return []
} }
}, },
districts: function () { districts: function () {
if(this.form.city){ if (this.form.city) {
return findChildren(this.cities, this.form.city) return findChildren(this.cities, this.form.city)
} else { } else {
return [] return []
...@@ -109,12 +88,12 @@ ...@@ -109,12 +88,12 @@
data() { data() {
return { return {
rules: { rules: {
province: [{ required: true, message: '请选择省份', trigger: 'change' }], province: [{required: true, message: '请选择省份', trigger: 'change'}],
city: [{ required: true, message: '请选择城市', trigger: 'change' }], city: [{required: true, message: '请选择城市', trigger: 'change'}],
district: [{ required: true, message: '请选择区/县', trigger: 'change' }], district: [{required: true, message: '请选择区/县', trigger: 'change'}],
detail: [{ required: true, message: '请填写详细地址', trigger: 'change' }], detail: [{required: true, message: '请填写详细地址', trigger: 'change'}],
name: [{ required: true, message: '请填写收货人', trigger: 'change' }], name: [{required: true, message: '请填写收货人', trigger: 'change'}],
mobile: [{ required: true, message: '请填写手机号', trigger: 'change' }] mobile: [{required: true, message: '请填写手机号', trigger: 'change'}]
}, },
form: { form: {
province: this.province, province: this.province,
...@@ -159,7 +138,7 @@ ...@@ -159,7 +138,7 @@
// this.form.mobile = this.mobile // this.form.mobile = this.mobile
// } // }
// console.log(this.form) // console.log(this.form)
this.form={ this.form = {
province: this.province, province: this.province,
city: this.city, city: this.city,
district: this.district, district: this.district,
......
src/components/monthOrder/newDialog.vue
View file @ e9d96da5
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
:visible.sync="newdialogObj.show" :visible.sync="newdialogObj.show"
width="70%"> width="70%">
<el-form ref="form" :model="form" label-width="120px" :rules="rules"> <el-form ref="form" :model="form" label-width="120px" :rules="rules">
<el-row>
<el-col :span="10">
<el-form-item label="商品名称" prop="goods_id"> <el-form-item label="商品名称" prop="goods_id">
<el-select v-model="form.goods_id" placeholder="请选择" @change="onOptionChange"> <el-select v-model="form.goods_id" placeholder="请选择" @change="onOptionChange">
<el-option <el-option
...@@ -18,7 +17,6 @@ ...@@ -18,7 +17,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<!-- <el-col :span="10"> <!-- <el-col :span="10">
<el-form-item label="期数名称" prop="periods_id"> <el-form-item label="期数名称" prop="periods_id">
<el-select v-model="form.periods_id" placeholder="请选择"> <el-select v-model="form.periods_id" placeholder="请选择">
...@@ -31,16 +29,13 @@ ...@@ -31,16 +29,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
</el-row>
<el-row> <el-form-item label="用户ID" prop="user_id">
<el-col :span="10">
<el-form-item label="用户ID" prop="user_id" >
<el-input width='100' v-model="form.user_id"></el-input> <el-input width='100' v-model="form.user_id"></el-input>
<el-button type="success" @click="onAddUser">+添加用户</el-button> <el-button type="success" @click="onAddUser">+添加用户</el-button>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="10"> <el-form-item label="添加推广人">
<el-form-item label="添加推广人" >
<!-- <el-input v-model="form.invite_id"></el-input> --> <!-- <el-input v-model="form.invite_id"></el-input> -->
<el-select <el-select
v-model="form.invite_id" v-model="form.invite_id"
...@@ -57,10 +52,8 @@ ...@@ -57,10 +52,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="支付类型" prop="order_type"> <el-form-item label="支付类型" prop="order_type">
<el-select v-model="form.order_type" placeholder="请选择"> <el-select v-model="form.order_type" placeholder="请选择">
<el-option <el-option
...@@ -72,16 +65,10 @@ ...@@ -72,16 +65,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="实付金额(元)" prop="money">
<el-col :span="10">
<el-form-item label="实付金额(元)" prop="money" >
<el-input-number v-model="form.money"></el-input-number> <el-input-number v-model="form.money"></el-input-number>
</el-form-item> </el-form-item>
</el-col> <el-form-item label="支付时间" prop="pay_at">
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="支付时间" prop="pay_at" >
<el-date-picker <el-date-picker
v-model="form.pay_at" v-model="form.pay_at"
type="datetime" type="datetime"
...@@ -90,31 +77,21 @@ ...@@ -90,31 +77,21 @@
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input type="textarea" v-model="form.desc"></el-input> <el-input type="textarea" v-model="form.desc"></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="10" v-if="form.order_type!=2">
<el-form-item label="订单号"> <el-form-item label="订单号">
<el-input v-model="form.out_trade_no"></el-input> <el-input v-model="form.out_trade_no"></el-input>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<vue-address :province="form.province" :city="form.city" :district="form.district" :detail="form.address" :mobile="form.receive_mobile" :name="form.receive_name" @change="handlerAddressChange"> <vue-address :province="form.province" :city="form.city" :district="form.district" :detail="form.address" :mobile="form.receive_mobile" :name="form.receive_name" @change="handlerAddressChange">
</vue-address> </vue-address>
</el-col>
</el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="newdialogObj.show = false">取 消</el-button> <el-button @click="newdialogObj.show = false">取 消</el-button>
<el-button type="primary" @click="saveAddOrder(form)">确定</el-button> <el-button type="primary" @click="saveAddOrder(form)">确定</el-button>
</div> </div>
<el-dialog :modal="false" :visible.sync="addShow" > <el-dialog :modal="false" :visible.sync="addShow">
<el-form label-width="90px"> <el-form label-width="90px">
<!--<el-form-item label="用户id">--> <!--<el-form-item label="用户id">-->
<!--<el-input v-model="addId"></el-input>--> <!--<el-input v-model="addId"></el-input>-->
......
src/components/system/tag.vue
View file @ e9d96da5
...@@ -2,19 +2,15 @@ ...@@ -2,19 +2,15 @@
<div class="admin-refresh" v-loading="loading"> <div class="admin-refresh" v-loading="loading">
<div class="section-search search-single"> <div class="section-search search-single">
<el-form ref="searchFrom" :model="searchFrom" label-width="80px" inline> <el-form label-width="80px" inline>
<el-form-item> <el-form-item>
<!--<el-cascader
style="width: 280px" placeholder="选择标签"
:props="searchProps" clearable></el-cascader>-->
<el-input placeholder="输入标签名搜索" v-model="filterText"></el-input> <el-input placeholder="输入标签名搜索" v-model="filterText"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div class="search-btn-wrapper"> <div class="search-btn-wrapper">
<!--<el-button @click="onSearch" type="primary" plain>搜索</el-button>--> <!--<el-button @click="onSearch" type="primary" plain>搜索</el-button>-->
<el-button @click="dialogToggle" type="warning" plain>高级搜索</el-button> <el-button @click="dialogUser.show = !dialogUser.show;" type="warning" plain>高级搜索</el-button>
<!--<el-button v-if="!$store.state.readonly" @click="onAdd" type="success" plain>新增标签</el-button>--> <!--<el-button v-if="!$store.state.readonly" @click="onAdd" type="success" plain>新增标签</el-button>-->
</div> </div>
</el-form-item> </el-form-item>
...@@ -25,7 +21,7 @@ ...@@ -25,7 +21,7 @@
<el-tree <el-tree
:data="treeData" :data="treeData"
node-key="id" ref="tagTree" node-key="id" ref="tagTree"
:props="tagProps" :props="{children: 'children', label: 'name'}"
:indent="40" :indent="40"
@node-expand="tagExpand" @node-expand="tagExpand"
@node-collapse="tagCollapse" @node-collapse="tagCollapse"
...@@ -52,38 +48,46 @@ ...@@ -52,38 +48,46 @@
</el-tree> </el-tree>
</div> </div>
<el-dialog :title="dialog.title" :visible.sync="dialog.show" width="800px" title="高级搜索"> <el-dialog :title="dialog.title" :visible.sync="dialog.show" width="500px">
<el-form ref="dialogForm" :rules="dialog.form.rules" :model="dialog.form" label-width="100px">
<el-form-item label="ID：" prop="id" style="display: none;">
<el-input v-model="dialog.form.id" maxlength="10" type="text"></el-input>
</el-form-item>
<el-form-item label="PID：" prop="pid" style="display: none;">
<el-input v-model="dialog.form.pid" maxlength="10" type="text"></el-input>
</el-form-item>
<el-form-item label="标签名称：" prop="name">
<el-input v-model="dialog.form.name" maxlength="10" type="text"></el-input>
</el-form-item>
<el-form-item label="标签备注：" prop="cover">
<el-input v-model="dialog.form.cover" maxlength="50" type="textarea" :rows="3"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogToggle">取消</el-button>
<el-button type="primary" @click="dialogSave">确定</el-button>
</span>
</el-dialog>
<el-dialog :visible.sync="dialogUser.show" width="800px" title="高级搜索">
<div style="display: flex;margin-bottom: 20px;"> <div style="display: flex;margin-bottom: 20px;">
<el-button style="margin-right: 20px; width: 70px;" type="primary" v-if="!$store.state.readonly && $store.state.export" plain :disabled="!tableData.length" @click="exportExcel">导出</el-button> <el-button style="margin-right: 20px; width: 70px;" type="primary" v-if="!$store.state.readonly && $store.state.export" plain :disabled="!tableData.length" @click="exportExcel">导出</el-button>
<el-cascader <el-cascader
style="width: calc(100% - 90px)" placeholder="选择标签" clearable @change="conditionsChange" style="width: calc(100% - 90px)" placeholder="选择标签" clearable @change="conditionsChange"
:options="treeDataOrigin" :props="{ value: 'id', label: 'name', multiple: true, checkStrictly: true }"></el-cascader> :options="treeDataOrigin" :props="{ value: 'id', label: 'name', multiple: true, checkStrictly: true }"></el-cascader>
</div> </div>
<el-table :data="tableData" border> <el-table :data="tableData" border>
<el-table-column className="f-c" label="用户"> <el-table-column className="f-c" label="用户">
<template slot-scope="scope"> <template slot-scope="scope">
<img class="avatar" :src="scope.row.avatar">{{scope.row.nickname}}<br>(ID:{{scope.row.user_id}}) <img class="avatar" :src="scope.row.avatar">{{scope.row.nickname}}<br>(ID:{{scope.row.user_id}})
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="baby_name" label="宝宝名称"></el-table-column> <el-table-column prop="baby_name" label="宝宝名称"></el-table-column>
<el-table-column prop="birthday" label="宝宝生日"></el-table-column> <el-table-column prop="birthday" label="宝宝生日"></el-table-column>
<el-table-column prop="sex" label="宝宝性别" :formatter="sexFormatter"></el-table-column> <el-table-column prop="sex" label="宝宝性别" :formatter="sexFormatter"></el-table-column>
<el-table-column prop="mobile" label="手机号码"></el-table-column> <el-table-column prop="mobile" label="手机号码"></el-table-column>
<!--<el-table-column label="操作" v-if="!$store.state.readonly" width="100">
<template slot-scope="scope">
<el-button size="mini" plain type="primary" @click="onEdit(scope.row)">编辑</el-button>
</template>
</el-table-column>-->
</el-table> </el-table>
<page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/> <page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
<!--<span slot="footer" class="dialog-footer">
<el-button @click="dialogToggle">取消</el-button>
<el-button type="primary" @click="dialogSave">确定</el-button>
</span>-->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -99,28 +103,15 @@ ...@@ -99,28 +103,15 @@
conditions: [], conditions: [],
filterText: '', filterText: '',
tagProps: {
children: 'children',
label: 'name'
},
tagExpanded: [0], tagExpanded: [0],
tagExpandedWait: '', tagExpandedWait: '',
searchFrom: {
id: '',
name: '',
mobile: '',
id_card: '',
type: '',
status: '',
start_in: '',
over_in: ''
},
startTime: [],
tableData: [], tableData: [],
treeData: [], treeData: [],
treeDataOrigin: [], treeDataOrigin: [],
dialogUser: {
show: false
},
dialog: { dialog: {
title: '', title: '',
show: false, show: false,
...@@ -173,19 +164,18 @@ ...@@ -173,19 +164,18 @@
this.getUserData() this.getUserData()
}, },
getUserData(){ getUserData(){ // 搜索用户
let json = { let json = {
conditions: JSON.stringify(this.conditions), conditions: JSON.stringify(this.conditions),
limit: this.limit, limit: this.limit,
page: this.nowPage page: this.nowPage
} }
getTagUserApi(json).then(res=>{ getTagUserApi(json).then(res=>{
this.tableData = res.list this.tableData = res.list
}) })
}, },
filterNode(value, data) { filterNode(value, data) { // 搜索标签
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
...@@ -239,21 +229,20 @@ ...@@ -239,21 +229,20 @@
}); });
}, },
tagExpand(data, node, el) { tagExpand(data, node, el) { // 标签展开（记录树的状态）
//console.log(node) //console.log(node)
if (node.expanded) { if (node.expanded) {
this.tagExpanded.push(node.data.id) this.tagExpanded.push(node.data.id)
} }
}, },
tagCollapse(data, node, el) { // 标签收起（记录树的状态）
tagCollapse(data, node, el) {
//console.log(node) //console.log(node)
if (node.expanded) { if (node.expanded) {
this.tagExpanded.splice(this.tagExpanded.findIndex(item => item == node.data.id), 1) this.tagExpanded.splice(this.tagExpanded.findIndex(item => item == node.data.id), 1)
} }
}, },
getData() { getData() { // 获取标签
getTagApi().then(res => { getTagApi().then(res => {
this.treeDataOrigin = res; this.treeDataOrigin = res;
this.treeData = [{ this.treeData = [{
...@@ -266,7 +255,6 @@ ...@@ -266,7 +255,6 @@
weight: 0, weight: 0,
}] }]
}); });
}, },
onAdd(node) { onAdd(node) {
...@@ -281,10 +269,9 @@ ...@@ -281,10 +269,9 @@
}); });
}, },
onEdit(node,data) { onEdit(node, data) {
console.log(el) //console.log(node)
console.log(node) //console.log(data)
console.log(data)
let item = node.data; let item = node.data;
this.dialogToggle(); this.dialogToggle();
this.dialogReset(); this.dialogReset();
...@@ -302,7 +289,7 @@ ...@@ -302,7 +289,7 @@
}, },
conditionsChange(val){ conditionsChange(val){
console.log(val); //console.log(val);
let arr = []; let arr = [];
if(val.length) { if(val.length) {
val.forEach(v => { val.forEach(v => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment