diff --git a/src/components/paymentMethod.vue b/src/components/paymentMethod.vue index 2dff3f6..579220e 100644 --- a/src/components/paymentMethod.vue +++ b/src/components/paymentMethod.vue @@ -3,10 +3,11 @@
- - - - + + + + +

{{ item.name }}

@@ -32,12 +33,6 @@ export default { }, data(){ return { - payImg:{ - '1':'@/assets/register/weixin_pay.png', - '2':'@/assets/register/zhifubao_pay.png', - '3':'@/assets/register/taobao_pay.png', - '4':'@/assets/register/jingdong_pay.png', - }, list:[], drag: false, } diff --git a/src/components/site/addSiteStep/step3.vue b/src/components/site/addSiteStep/step3.vue index d95ab62..c98df49 100644 --- a/src/components/site/addSiteStep/step3.vue +++ b/src/components/site/addSiteStep/step3.vue @@ -12,7 +12,7 @@
- + - - - - + + + + - + + - + + + + - + + +
编辑 @@ -140,8 +117,14 @@ + :total="serviceList.length"> + + + + +
@@ -156,13 +139,15 @@ @@ -292,4 +430,12 @@ export default { } } } +.custom-popover { + position: fixed !important; + // max-height: 290px; + // overflow-y: auto; + margin-top: 0 !important; + margin-left: 0 !important; + transform: none !important; +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 697aaa0..040489d 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -132,7 +132,7 @@ const routes = [{ path: '/agent/siteAddFinally', name: '添加站点-添加服务', isFirst: true, - component: () => import( /* webpackChunkName: "siteList" */ '../views/agent/siteAddFinally.vue'), + component: () => import( /* webpackChunkName: "siteList" */ '../views/agent/siteServiceAdd.vue'), meta: { title: '添加服务', breadcrumbParent: '添加站点', diff --git a/src/views/agent/siteServiceAdd.vue b/src/views/agent/siteServiceAdd.vue index 6de22ea..a433fb9 100644 --- a/src/views/agent/siteServiceAdd.vue +++ b/src/views/agent/siteServiceAdd.vue @@ -59,7 +59,7 @@
-
+
{ - that.serviceInfo.status = false + that.$nextTick(() => { + //设置默认计费方式 + that.serviceInfo.unit = that.serviceAddInfo.unit + //默认未开启 + that.serviceInfo.status = false + }) if (response.status && response.data) { that.$nextTick(() => { that.serviceInfo = response.data.service_info that.serviceInfo.status = true + + console.log(that.serviceInfo,'ccc') }) that.getServiceBindGoods() } + console.log(that.serviceInfo,'aaa') }).catch(error => { console.error(error, 'error') }) diff --git a/src/views/agent/siteServiceList.vue b/src/views/agent/siteServiceList.vue index 524afd5..561c33d 100644 --- a/src/views/agent/siteServiceList.vue +++ b/src/views/agent/siteServiceList.vue @@ -89,7 +89,7 @@ placement="bottom" trigger="manual" :append-to-body="false" :visible-arrow="true" popper-class="custom-popover" @show="popshow" >
- +

输入＞0的数，越小排序越前；重复则新者优先；0则默认排序

取消 @@ -372,25 +372,24 @@ export default { saveEdit(row, type) { row[type + 'PopoverVisible'] = false; // 关闭弹框 if(type == 'price') this.savePrice(row) - if(type == 'sort') this.saveUpdateInfo(row, true) + if(type == 'sort') this.saveSort(row) }, // 取消编辑 cancelEdit(row, type) { row[type + 'PopoverVisible'] = false; this.popoverFlag = false // row[type + '_popover'] = false; // 关闭弹框 - this.$Message.info('已取消编辑'); + // this.$Message.info('已取消编辑'); }, random() { var randomNumber = Math.random(); return randomNumber }, - savePrice(row){ + async savePrice(row){ if (row.price === '') { this.$message.warning('价格不能为空'); return; } - row.price_desc = getServicePriceDesc(row.price, row.price_unit, row.price_unit_num); let obj = {} obj.uid = this.uid @@ -402,43 +401,28 @@ export default { obj.unit_piece = row.price } - this.saveRequest('/agentnew/ajax_set_service_price', obj, row) + const res = await this.saveRequest('/agentnew/ajax_set_service_price', obj) + if(res) row.price_desc = getServicePriceDesc(row.price, row.price_unit, row.price_unit_num); }, - onSwitchChange(row){ - row.is_index_display = row.is_index_display == "1" ? "0" : "1" - this.saveUpdateInfo(row) - }, - saveUpdateInfo(row, resort = false){ + async onSwitchChange(row){ + console.log(row) let obj = {} obj.uid = this.uid obj.type = row.type - obj.sort_id = row.sort_id obj.is_index_display = row.is_index_display - obj.is_display_price = row.is_display_price - obj.is_recommend = row.is_recommend - this.saveRequest('/agentnew/ajax_update_service_show', obj, row, resort) + const res = await this.saveRequest('/agentnew/ajax_update_service_show', obj) + if(!res) row.is_index_display = row.is_index_display === "1" ? "0" : "1" }, - saveRequest(url, obj, row, resort = false){ - const that = this - this.$http('POST', url, obj,{ - headers:{ - 'Auth': this.token - } - }).then(response => { - if(response.status){ - that.$message.success('保存成功'); - this.$nextTick(() => { - that.$set(that.serviceList, row) - if(resort){ - this.sortServiceList() - } - }) - return true; - } - that.$message.error(response.info); - }).catch(error => { - console.error(error, 'error') - }) + async saveSort(row){ + let obj = {} + obj.uid = this.uid + obj.type = row.type + obj.sort_id = row.sort_id + const res = await this.saveRequest('/agentnew/ajax_update_service_show', obj) + if(res) { + row.sort_id = row.edit_sort_id; + this.sortServiceList() + } }, sortServiceList() { const sortable = this.serviceList @@ -454,6 +438,23 @@ export default { return row; }); }, + async saveRequest(url, obj){ + const that = this + return await this.$http('POST', url, obj,{ + headers:{ + 'Auth': this.token + } + }).then(response => { + if(response.status){ + that.$message.success('保存成功'); + return true; + } + that.$message.error(response.info); + return false; + }).catch(error => { + console.error(error, 'error') + }) + }, popPayMentModal(row){ this.dialogVisible = true; this.dialogTitle = row.type_desc + '-收款方式' @@ -483,7 +484,7 @@ export default { this.payList = payList }, // 确认按钮事件 - handleConfirm() { + async handleConfirm() { this.dialogVisible = false; let obj = {} @@ -504,9 +505,10 @@ export default { }); obj.info = obj.info.substr(1, obj.info.length-1); - if(hasClose) this.editRow.payment_method_desc = '自定义支付'; - - this.saveRequest('/agentnew/ajax_payment_switch', obj, this.editRow) + const res = await this.saveRequest('/agentnew/ajax_payment_switch', obj, this.editRow) + if(res && hasClose) { + this.editRow.payment_method_desc = '自定义支付'; + } }, // 取消按钮事件 handleCancel() {