-
+
+
+
+
+
跳过
@@ -346,23 +355,68 @@ import GuipInput from '@/components/GuipInput.vue';
import GuipRadio from '@/components/GuipRadio.vue';
import GuipSelect from '@/components/GuipSelect.vue';
import GuipSwitch from '@/components/GuipSwitch.vue';
-// import GuipDialog from '@/components/GuipDialog.vue';
+import GuipDialog from '@/components/GuipDialog.vue';
+import PaymentMethod from '@/components/paymentMethod.vue';
+import DomainModal from '@/components/domainModal.vue';
// import GuipTable from '@/components/GuipTable.vue';
export default {
+ components: {
+ GuipButton,
+ GuipFormItem,
+ GuipInput,
+ GuipRadio,
+ GuipSelect,
+ Footer,
+ GuipSwitch,
+ GuipDialog,
+ PaymentMethod,
+ DomainModal
+ // GuipTable
+ },
data() {
return {
+ dialogTitle:'编辑',
+ dialogVisible1:false,
+ paymentList: [
+ {
+ type: '1',
+ name: '小知攻城狮',
+ num: '1520574481 (wx1bda8b3d08d169cb)',
+ flag: true
+ },
+ {
+ type: '2',
+ name: '自收款',
+ num: 'wangyong@kuailebanshou.com',
+ flag: true
+ },
+ {
+ type: '3',
+ name: '店铺收款',
+ num: '轻歌曼舞82',
+ flag: false
+ },
+ {
+ type: '4',
+ name: '京东收款',
+ num: 'celunwen',
+ flag: false
+ },
+ ],
currentPage: 1, //当前页
pageSize: 5, //每页的容量
total: 0, //列表总数
- dialogVisible: false,
+ dialogVisible: false,//是否展示弹框
+ showCancelButton: true, // 控制是否显示取消按钮
+ showCloseButton: true, // 控制是否显示关闭按钮
activeStep: 3,//当前步骤条
has_store: '1',//是否是初次授权 还是已有店铺 大于0 已有店铺
distribution_channel: '0',//销售渠道 是否为电商 0 非电商 >0 电商
- payment_method_list:[//收款方式
+ payment_method_list: [//收款方式
],
- add_chachong_list:[//查重服务
+ add_chachong_list: [//查重服务
],
distribution_channel_options: [
@@ -384,11 +438,11 @@ export default {
{ title: "步骤 3", 'desc': '', 'wait': '@/assets/register/step3_null.svg', 'checked': '@/assets/register/step3_ing.svg', 'finish': '@/assets/register/step_success.svg' }
],
tableData1: [
- { id: 1, name: '商品A1', stock: 100, price: 50, price_popover: false, edit_price: '', type: 'a', num: '1', edit_num: '',num_popover:false, homeFlag: true },
- { id: 2, name: '商品B1', stock: 200, price: 80, word: 1000, price_popover: false, edit_price: '', editWord: '', type: 'a', num: '2', edit_num: '',num_popover:false, homeFlag: true },
- { id: 3, name: '商品C1', stock: 150, price: 120, price_popover: false, edit_price: '', type: 'b', num: '2', edit_num: '',num_popover:false, homeFlag: false },
- { id: 1, name: '商品A2', stock: 100, price: 50, price_popover: false, edit_price: '', type: 'a', num: '3', edit_num: '',num_popover:false, homeFlag: false },
- { id: 2, name: '商品B2', stock: 200, price: 80, word: 1000, price_popover: false, edit_price: '', editWord: '', type: 'a', num: '0', edit_num: '',num_popover:false, homeFlag: true },
+ { id: 1, name: '万方大学生版', stock: 100, price: 50, price_popover: false, edit_price: '', type: 'a', num: '1', edit_num: '', num_popover: false, homeFlag: true, payment: '0' },
+ { id: 2, name: '维普检测版', stock: 200, price: 80, word: 1000, price_popover: false, edit_price: '', editWord: '', type: 'a', num: '2', edit_num: '', num_popover: false, homeFlag: true, payment: '1' },
+ { id: 3, name: '商品C1', stock: 150, price: 120, price_popover: false, edit_price: '', type: 'b', num: '2', edit_num: '', num_popover: false, homeFlag: false, payment: '0' },
+ { id: 1, name: '商品A2', stock: 100, price: 50, price_popover: false, edit_price: '', type: 'a', num: '3', edit_num: '', num_popover: false, homeFlag: false, payment: '0' },
+ { id: 2, name: '商品B2', stock: 200, price: 80, word: 1000, price_popover: false, edit_price: '', editWord: '', type: 'a', num: '0', edit_num: '', num_popover: false, homeFlag: true },
{ id: 3, name: '商品C2', stock: 150, price: 120, price_popover: false, edit_price: '', type: 'b', num: '1', edit_num: '' },
{ id: 1, name: '商品A3', stock: 100, price: 50, price_popover: false, edit_price: '', type: 'a' },
{ id: 2, name: '商品B3', stock: 200, price: 80, word: 1000, price_popover: false, edit_price: '', editWord: '', type: 'a' },
@@ -438,25 +492,37 @@ export default {
options_zhifubao: [],
};
},
- components: {
- GuipButton,
- GuipFormItem,
- GuipInput,
- GuipRadio,
- GuipSelect,
- Footer,
- GuipSwitch
- // GuipDialog,
- // GuipTable
- },
methods: {
+ showDomainModal(){
+ this.dialogVisible1 = true
+ },
+ yumingInput(){
+ this.dialogVisible1 = true;
+ },
+ // 确认按钮事件
+ handleConfirm() {
+ this.$message.success('点击了确认按钮');
+ this.dialogVisible = false;
+ },
+ // 取消按钮事件
+ handleCancel() {
+ this.$message.warning('点击了取消按钮');
+ this.dialogVisible = false;
+ },
+ // 关闭弹框事件
+ handleClose() {
+ this.$message.info('弹框已关闭');
+ this.dialogVisible = false;
+ },
+ dialogVisibleChange(data) {
+ console.log(data, 'data098908090');
+ },
handleSizeChange(val) {
this.pageSize = val
},
handleCurrentChange(val) {
this.currentPage = val
},
-
popshow() {
var ariaEls = document.querySelectorAll('.el-popover')
ariaEls.forEach((item) => {
@@ -468,48 +534,48 @@ export default {
item.removeAttribute('aria-hidden')
})
},
- // 表格首页开关
- onSwitchChange(row){
- console.log(row,'------flag');
+ // 表格首页开关
+ onSwitchChange(row) {
+ console.log(row, '------flag');
row.homeFlag = !row.homeFlag;
this.$set(this.tableData1, row)
},
// 点击价格单元格时触发
- handlePriceClick(row, index,type) {
+ handlePriceClick(row, index, type) {
// 关闭其他行的弹框
this.tableData.forEach((item, i) => {
if (i !== index) {
- item[type+ '_popover'] = false;
+ item[type + '_popover'] = false;
}
});
// 打开当前行的弹框
- row[type+ '_popover']= true;
- row['edit_'+type] = row[type]
+ row[type + '_popover'] = true;
+ row['edit_' + type] = row[type]
// row.edit_price = row.price; // 初始化输入框的值
},
// 保存价格
- savePrice(row,type) {
- if (type=='price' && row.edit_price === '') {
+ savePrice(row, type) {
+ if (type == 'price' && row.edit_price === '') {
this.$message.warning('价格不能为空');
return;
}
- if (type == 'word' &&row.word && row.editWord === '') {
+ if (type == 'word' && row.word && row.editWord === '') {
this.$message.warning('字符不能为空');
return;
}
if (row.edit_word) {
row.word = row.edit_word
}
- row[type] = row['edit_'+type]; // 更新价格
- row[type+'_popover'] = false; // 关闭弹框
+ row[type] = row['edit_' + type]; // 更新价格
+ row[type + '_popover'] = false; // 关闭弹框
this.$message.success('保存成功');
this.$set(this.tableData1, row)
console.log('保存价格:', this.tableData1, row.price);
// 这里可以调用接口保存修改后的价格
},
// 取消编辑
- cancelEdit(row,type) {
- row[type+'_popover'] = false; // 关闭弹框
+ cancelEdit(row, type) {
+ row[type + '_popover'] = false; // 关闭弹框
this.$message.info('已取消编辑');
},
random() {
@@ -570,6 +636,11 @@ export default {
} else {
return "未开始";
}
+ },
+ popPayMentModal(row) {
+ this.dialogVisible = true;
+ this.dialogTitle = row.name + '-收款方式'
+ console.log(row, '=====');
}
}
};
@@ -720,17 +791,40 @@ export default {
}
+.normal_payment,
+.self_payment {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ padding: 2px 10px;
+ border-radius: 4px;
+ background: #F6F7FA;
+ box-sizing: border-box;
+ border: 1px solid #DFE2E6;
+ letter-spacing: 0.08em;
+ color: #626573;
+}
+
+.self_payment {
+ border: 1px solid #BFDAFF;
+ background: #F2F7FF;
+ color: #006AFF;
+}
+
.table-wrap {
span {
color: #1E2226;
}
- .edit_icon{
+
+ .edit_icon {
display: none;
transition: all .3s;
margin-left: 8px;
}
- .el-table__row:hover{
- .edit_icon{
+
+ .el-table__row:hover {
+ .edit_icon {
display: block;
transition: all .3s;
}
diff --git a/src/views/elementGroups.vue b/src/views/elementGroups.vue
index 3a74195..571a8bc 100644
--- a/src/views/elementGroups.vue
+++ b/src/views/elementGroups.vue
@@ -304,9 +304,10 @@ export default {
},
data() {
return {
+
date1:'',
switchValue: true,
- dialogVisible: false,//是否展示弹框
+ dialogVisible: true,//是否展示弹框
showCancelButton: true, // 控制是否显示取消按钮
showCloseButton: true, // 控制是否显示关闭按钮
form: {