diff --git a/src/assets/home/notice_1.png b/src/assets/home/notice_1.png new file mode 100644 index 0000000..18d727e Binary files /dev/null and b/src/assets/home/notice_1.png differ diff --git a/src/assets/home/notice_2.png b/src/assets/home/notice_2.png new file mode 100644 index 0000000..865728a Binary files /dev/null and b/src/assets/home/notice_2.png differ diff --git a/src/assets/home/notice_3.png b/src/assets/home/notice_3.png new file mode 100644 index 0000000..4cb1b1d Binary files /dev/null and b/src/assets/home/notice_3.png differ diff --git a/src/assets/home/notice_4.png b/src/assets/home/notice_4.png new file mode 100644 index 0000000..25340cd Binary files /dev/null and b/src/assets/home/notice_4.png differ diff --git a/src/assets/home/notice_5.png b/src/assets/home/notice_5.png new file mode 100644 index 0000000..affc2a5 Binary files /dev/null and b/src/assets/home/notice_5.png differ diff --git a/src/assets/home/notice_tag_1.png b/src/assets/home/notice_tag_1.png new file mode 100644 index 0000000..8f1fac5 Binary files /dev/null and b/src/assets/home/notice_tag_1.png differ diff --git a/src/assets/home/notice_tag_2.png b/src/assets/home/notice_tag_2.png new file mode 100644 index 0000000..fdd27df Binary files /dev/null and b/src/assets/home/notice_tag_2.png differ diff --git a/src/components/bindGoods.vue b/src/components/bindGoods.vue index 2903ffb..1305a8e 100644 --- a/src/components/bindGoods.vue +++ b/src/components/bindGoods.vue @@ -102,7 +102,8 @@ export default { item.selected = false if(item.skus){ Object.entries(item.skus).forEach(([key, val]) => { - item.skus[key] = `${val.title} ¥${val.price}`; + item.skus[key] = val.title + if(val.price) item.skus[key] = `${val.title} ¥${val.price}`; }); } }); diff --git a/src/components/site/addSiteStep/step2.vue b/src/components/site/addSiteStep/step2.vue index d4eea0e..16da867 100644 --- a/src/components/site/addSiteStep/step2.vue +++ b/src/components/site/addSiteStep/step2.vue @@ -28,7 +28,7 @@ :options="taobaoList" :options_null="!taobaoList.length"> @@ -157,7 +157,7 @@
-
+

店铺授权

@@ -176,7 +176,7 @@ :options="pddList" :options_null="!pddList.length"> @@ -235,7 +235,7 @@ :options="jdList" :options_null="!jdList.length"> @@ -499,46 +499,59 @@ export default { }) }, changeSelectWeixin(item) { + if(this.bindWxpayId === item.payid){ + this.bindWxpayId = 0 + this.selectWxpay = null + return true + } this.bindWxpayId = item.payid; this.selectWxpay = item; - console.log(this.bindWxpayId, 'bindWxpayId'); - console.log(this.selectWxpay, 'selectWxpay'); - - this.selectedItem = { ...item }; - console.log(this.selectedItem, 'this.selectedItem===='); }, changeSelectAlipay(item) { + if(this.bindAlipayId === item.payid){ + this.bindAlipayId = 0 + this.selectAlipay = null + return true + } this.bindAlipayId = item.payid; this.selectAlipay = item; - - this.selectedItem = { ...item }; }, changeSelectTaobao(item) { + if(this.bindTaobaoId === item.payid){ + this.bindTaobaoId = 0 + this.selectTaobao = null + return true + } this.bindTaobaoId = item.payid; this.selectTaobao = item; - - this.selectedItem = { ...item }; }, changeSelectJindong(item) { + if(this.bindJdId === item.payid){ + this.bindJdId = 0 + this.selectJd = null + return true + } this.bindJdId = item.payid; this.selectJd = item; - - this.selectedItem = { ...item }; }, changeSelectPdd(item) { + if(this.bindPddId === item.payid){ + this.bindPddId = 0 + this.selectPdd = null + return true + } this.bindPddId = item.payid; this.selectPdd = item; - - this.selectedItem = { ...item }; }, goBindPay(type) { this.addPayType = type; this.isShowAddPay = true; this.authToken = this.token; }, - handleEvent() { - this.getPayList() - this.getAddablePays() + handleEvent(data) { + this.isShowAddPay = data + // this.getPayList() + // this.getAddablePays() }, jumpStep(){ this.$router.push('/') diff --git a/src/components/site/addSiteStep/step3.vue b/src/components/site/addSiteStep/step3.vue index 388cf24..3131905 100644 --- a/src/components/site/addSiteStep/step3.vue +++ b/src/components/site/addSiteStep/step3.vue @@ -3,10 +3,8 @@

服务列表

-
- 添加查重服务 - 添加写作辅助 - 添加AIGC +
+ 添加{{item}}
@@ -173,11 +171,11 @@ export default { PromptText, GuipDialog, PaymentMethod, GuipTable, GuipSwitch, SvgIcon, GuipInput, GuipButton - }, data(){ return { token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3NTI2NDY1NDUsIm5iZiI6MTc1MjY0NjU0NSwiZXhwIjoxNzU1MjM4NTQ1LCJ1c2VyIjoic3VidXNlciIsImxvZ2luX3R5cGUiOjAsImFpZCI6IjEifQ.G-Is-x9qPMiV_urOlDPQVRjfAIozySxL5EK2k82d46k', + addProd: {}, serviceList:[], tableLoading:false, currentPage: 1, //当前页 @@ -252,9 +250,12 @@ export default { } }).then(response => { that.tableLoading = false - if(response.status && response.data.service_list.length>0){ + if(response.status){ that.$nextTick(() => { - that.serviceList = response.data.service_list + that.addProd = response.data.add_proids + if(response.data.service_list){ + that.serviceList = response.data.service_list + } }) } }).catch(error => { diff --git a/src/components/site/serviceSetting/priceSet.vue b/src/components/site/serviceSetting/priceSet.vue index deb0d27..80b1d17 100644 --- a/src/components/site/serviceSetting/priceSet.vue +++ b/src/components/site/serviceSetting/priceSet.vue @@ -4,37 +4,191 @@ {{info.type_desc}}-价格设置
-
-

网页支付与售价

- + + + + + +
+ +
+ 网页支付与售价 + 供货价:{{ serviceAddInfo.supply_price }}{{ serviceAddInfo.supply_price_warning }} +
+
-
-
-

售价管理

-

供货价格:3.5元/篇

+
+
售价管理
+
+
+
+ +
+
+ +
+
+
+
+ +
-
- - - +
+ +
-
-
+ +
+
+ 重置 + 保存 +
+ +
+ + +
+ +
+ {{ serviceAddInfo.shop_name }}支付管理 + +
+
+
+
+
售价管理
+
+
+
+ +
+
+ +
+
+
+
+ + +
+
+ + +
+
+ +
+
+ 重置 + 保存
-
- 保存 + +
+ +
+ 关联电商商品 + 必须关联,且确保服务与{{ serviceAddInfo.shop_name }}电商商品一致 +
+
+
+ + 添加宝贝 +
+
+
+
+ +
+
+ {{ row.title }} +
+
+
+ ¥{{ row.price }} + {{ row.sec_title }} +
+
+ 删除 + 默认商品 +
+
+
+
+
+
+ + + + + + 您确定要删除吗?删除后所有绑定都会删除 +
@@ -43,6 +197,9 @@ import GuipButton from "@/components/GuipButton.vue"; import GuipInput from "@/components/GuipInput.vue"; import GuipSelect from "@/components/GuipSelect.vue"; +import bindGoods from "@/components/bindGoods.vue"; +import GuipDialog from "@/components/GuipDialog.vue"; +import PromptText from "@/components/PromptText.vue"; export default { name: 'priceSet', @@ -55,92 +212,241 @@ export default { components: { GuipSelect, GuipInput, - GuipButton + GuipButton, + PromptText, + bindGoods, + GuipDialog }, data(){ return { token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3NTI2NDY1NDUsIm5iZiI6MTc1MjY0NjU0NSwiZXhwIjoxNzU1MjM4NTQ1LCJ1c2VyIjoic3VidXNlciIsImxvZ2luX3R5cGUiOjAsImFpZCI6IjEifQ.G-Is-x9qPMiV_urOlDPQVRjfAIozySxL5EK2k82d46k', info:{}, - //添加按钮样式 - saveBtnStyleObj: { - width: '144px', - height: '46px', - borderRadius: '4px', - background: '#006AFF', - }, - options: [{ - value: '选项1', - label1: '黄金hhhhhh', - id1: '1', - id2: '啊11哈哈', - label: '黄金糕' - }, { - value: '选项2', - id1: '12', - id2: '啊22哈哈', - label1: '双皮奶hhhhhhhhh', - label: '双皮奶' - }, { - value: '选项3', - id1: '13', - id2: '啊33哈哈', - label1: '蚵仔煎hhhhhhhhh', - label: '蚵仔煎' - }, { - value: '选项4', - id1: '14', - id2: '啊444哈哈', - label1: '双皮奶hhhhhhhhh', - label: '龙须面' - }, { - value: '选项5', - id1: '155', - id2: '啊55哈哈', - label1: '双皮奶hhhhhhhhh', - label: '北京烤鸭' - }], - form: { - username: '', - language: '', - domain_set: '', - domainSuffix: '11', - domainSuffix1: '.chachongz.com', - card: '1', - input1: '跨年的烟火,绽放天空', - input2: '', - input3: '', - }, + uid: 0, + type: 0, + serviceAddInfo:{}, + service_unit:'', + bindList: [], + showBind: false, + pati: '', + pageCode: '', + dialogDelBindConfim: false, } }, mounted() { this.info = JSON.parse(JSON.stringify(this.serviceInfo)) + if(Object.keys(this.info).length>0){ + this.uid = this.info.uid + this.type = this.info.type + this.getServiceAddInfo() + this.getServiceBindGoods() + } }, methods:{ - saveConfirm() { - let obj = {} - obj.uid = this.info.uid - obj.type = this.info.type - obj.logo_bgcolor = this.tabColor.replace('#','') - obj.link_btn_color = this.themeColor.replace('#','') - obj.selected_nav_bgcolor = this.navColor.replace('#','') - + //获得要添加的服务信息 + getServiceAddInfo() { + const that = this + that.$http('POST', '/agentnew/ajax_get_service_add_info', { + uid: that.uid, + type: that.type, + }, { + headers: { + 'Auth': this.token + } + }).then(response => { + if (response.status) { + that.$nextTick(() => { + that.serviceAddInfo = response.data + that.service_unit = that.serviceAddInfo.unit + //拼多多渠道查询商品所需参数初始化 + if (that.serviceAddInfo.shop_name === '拼多多') this.initPddParam(that.uid) + }) + return true + } + that.$message.error(response.info); + }).catch(error => { + console.error(error, 'error') + }) + }, + //查询绑定的宝贝 + getServiceBindGoods() { const that = this - this.$http('POST', '/agentnew/ajax_update_service_style', obj,{ - headers:{ + that.$http('POST', '/agentnew/ajax_get_service_bind_goods', { + uid: that.uid, + type: that.type, + }, { + headers: { 'Auth': this.token } }).then(response => { - if(response.status){ + if (response.status && response.data) { + that.$nextTick(() => { + that.bindList = response.data + }) + } + }).catch(error => { + console.error(error, 'error') + }) + }, + handleUnitName(){ + this.serviceAddInfo.unit_name = this.serviceAddInfo.set_units[this.service_unit] + }, + resetPrice() { + this.info.price = '' + this.info.unit_num = '' + this.info.b_unit_price = '' + this.info.b_unit_num = '' + }, + savePrice() { + const that = this + //非字符计费 + if(that.service_unit !== '0') { + that.info.unit_num = 1 + that.info.base_unit_num = '' + that.info.base_unit_price = '' + } + this.$http('POST', "/agentnew/ajax_set_service_price", { + uid: that.uid, + type: that.type, + unit: that.service_unit, + unit_num: that.info.unit_num, + unit_price: that.info.price, + b_unit_num: that.info.base_unit_num, + b_unit_price: that.info.base_unit_price, + }, { + headers: { + 'Auth': this.token + } + }).then(response => { + if (response.status) { that.$message.success('保存成功'); + return true; + } + that.$message.error(response.info); + }).catch(error => { + console.error(error, 'error') + }) + }, + resetShopPrice() { + this.info.unit_piece = '' + this.info.unit_num = '' + this.info.b_unit_piece = '' + this.info.b_unit_num = '' + }, + saveShopPrice() { + const that = this + //非字符计费 单位默认为 1 + //非字符计费 + if(that.service_unit !== '0') { + that.info.unit_num = 1 + that.info.base_unit_num = '' + that.info.base_unit_piece = '' + } + this.$http('POST', "/agentnew/ajax_set_service_price", { + uid: that.uid, + type: that.type, + unit: that.service_unit, + unit_num: that.info.unit_num, + unit_piece: that.info.unit_piece, + b_unit_num: that.info.base_unit_num, + b_unit_piece: that.info.base_unit_piece, + }, { + headers: { + 'Auth': this.token + } + }).then(response => { + if (response.status) { + that.$message.success('保存成功'); + return true; + } + that.$message.error(response.info); + }).catch(error => { + console.error(error, 'error') + }) + }, + //------绑定相关 start------ + bindGoods() { + this.showBind = true + }, + handleBind(bindRes) { + this.showBind = false + if (bindRes) this.getServiceBindGoods() + }, + async getPddPageCode(uid) { + const that = this + return await that.$http('POST', '/agentnew/ajax_get_pdd_page_code', { + uid: uid, + }, { + headers: { + 'Auth': this.token + } + }).then(response => { + return response.data + }).catch(error => { + console.error(error, 'error') + }) + }, + async initPddParam(uid) { + if (typeof window.PDD_OPEN_init === 'function') { + this.pageCode = await this.getPddPageCode(uid) - let color_info = {} - color_info.logo_bgcolor = obj.logo_bgcolor - color_info.link_btn_color = obj.link_btn_color - color_info.selected_nav_bgcolor = obj.selected_nav_bgcolor - that.info.color_info = color_info - - that.$emit('saveEvent', that.info) + await window.PDD_OPEN_init({ code: this.pageCode }) + this.pati = await window.PDD_OPEN_getPati() + } else { + console.error('PDD_OPEN_init 不存在,SDK 未正确加载'); + } + }, + handleDelBindClick(row, index) { + this.dialogDelBindConfim = true + this.delRow.index = index + this.delRow.row = row + }, + handleDelBindCancel() { + this.dialogDelBindConfim = false + }, + handleDelBindConfirm() { + const that = this + this.dialogDelBindConfim = false + this.$http('POST', '/agentnew/ajax_del_bind_service_goods', { + uid: that.uid, + type: that.type, + numiid: that.delRow.row.num_iid, + skuid: that.delRow.row.sku_id, + paytype: that.delRow.row.pay_type, + }, { + headers: { + 'Auth': this.token + } + }).then(response => { + if (response.status) { + that.$message.success('删除成功'); + this.$nextTick(() => { + that.bindList.splice(that.delRow.index, 1); + }) + return true; + } + that.$message.error(response.info); + }).catch(error => { + console.error(error, 'error') + }) + }, + handleDefaultConfirm(id) { + const that = this + this.$http('POST', '/agentnew/ajax_default_bind_setting', { + uid: that.uid, + type: that.type, + id: id, + }, { + headers: { + 'Auth': this.token + } + }).then(response => { + if (response.status) { + that.$message.success('设置成功'); + that.bindList.forEach((item) => { + item.is_default = '0' + if (item.id === id) item.is_default = '1' + }); return true; } that.$message.error(response.info); @@ -148,27 +454,126 @@ export default { console.error(error, 'error') }) }, + //------绑定相关 end------ } } \ No newline at end of file diff --git a/src/components/site/serviceSetting/reportSeoSet.vue b/src/components/site/serviceSetting/reportSeoSet.vue index 5a3db23..0c74482 100644 --- a/src/components/site/serviceSetting/reportSeoSet.vue +++ b/src/components/site/serviceSetting/reportSeoSet.vue @@ -11,7 +11,7 @@
- diff --git a/src/components/site/serviceSetting/showSet.vue b/src/components/site/serviceSetting/showSet.vue index 1bbc807..be7f320 100644 --- a/src/components/site/serviceSetting/showSet.vue +++ b/src/components/site/serviceSetting/showSet.vue @@ -14,12 +14,12 @@
- - diff --git a/src/components/site/serviceSetting/submitSeoSet.vue b/src/components/site/serviceSetting/submitSeoSet.vue index 74b8892..8ef984f 100644 --- a/src/components/site/serviceSetting/submitSeoSet.vue +++ b/src/components/site/serviceSetting/submitSeoSet.vue @@ -11,7 +11,7 @@
- diff --git a/src/router/index.js b/src/router/index.js index 17221f1..8fdeb75 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,6 +52,16 @@ const routes = [{ } }, { + path: '/agent/supplyList', + name: '首页', + component: () => import( /* webpackChunkName: "register" */ '../views/agent/supplyList.vue'), + isFirst: true, //是否属于一级路由 + meta: { + title: '首页', //面包屑名称(此页面确认不需要放置在面包屑可以不添加此属性;如果获取不到title 会自动 获取 name 作为面包屑名称) + hideBreadcrumb: true // 是否隐藏面包屑 + } + }, + { path: '/register', name: 'register', // this generates a separate chunk (about.[hash].js) for this route diff --git a/src/views/agent/home.vue b/src/views/agent/home.vue index b550874..c11b84d 100644 --- a/src/views/agent/home.vue +++ b/src/views/agent/home.vue @@ -8,11 +8,11 @@ 查看更多
-
- +
+
- {{ item.label }} -

{{ item.desc }}

+ {{ item.title }} +

{{ item.content }}

@@ -57,18 +57,19 @@

供货价格

-
+
- - {{ classification_name }} + + {{ classifyId2Name[classify_id] }}
详情
-
-

{{ veritem.name }}

-

+

+

{{ ver2info[verid].name }}

+

+

{{ type2name[type] }} {{ supplyPriceList[type].price }}元 / {{ supplyPriceList[type].unit_format }}

@@ -129,11 +130,11 @@

使用指南 - 查看全部 + 查看全部

-

我想将商品绑定淘宝店应该怎么做?

-

基于成交量的推广支持

-

二级、裂变分销,发展代理网络

+

微信支付在平台使用的常见问题?

+

自定义域名设置步骤说明

+

3级分销

联系客服

@@ -158,8 +159,10 @@ export default { // 表格加载 tableLoading: true, type2name:[], - serviceClassifications: [], - serviceClassificationServices: [], + classifyId2Name: [], + classifyId2Vers: [], + ver2types: [], + ver2info: [], supplyPriceList: [], serviceList: [], @@ -168,6 +171,7 @@ export default { expireServices: [], walletList: [], + noticeList: [], isShowSpec: false, @@ -215,6 +219,7 @@ export default { this.getSaleStats() this.getExpireServices() this.getWalletList() + this.getNoticeList() }, methods: { getSupplyServiceList() { @@ -231,9 +236,11 @@ export default { this.tableLoading = false this.$nextTick(() => { that.serviceList = response.data.list + this.classifyId2Name = response.data.classifyid2name; + this.classifyId2Vers = response.data.classifyid2vers; + this.ver2types = response.data.ver2types; + this.ver2info = response.data.ver2info; this.type2name = response.data.type2name; - this.serviceClassifications = response.data.service_classification; - this.serviceClassificationServices = response.data.service_classification_services; this.supplyPriceList = response.data.supply_price; }) }).catch(error => { @@ -285,6 +292,21 @@ export default { console.error(error, 'error') }) }, + getNoticeList(){ + this.$http('POST', '/agentnew/ajax_get_notice_list', { + + },{ + headers:{ + 'Auth': this.token + } + }).then(response => { + this.$nextTick(() => { + this.noticeList = response.data + }) + }).catch(error => { + console.error(error, 'error') + }) + }, lookTaoBaoExpire() { // 查看淘宝账号 location.href = '/agent/payList' @@ -331,6 +353,10 @@ a { } +.faq { + color: #8A9099; +} + .home-wrap { padding: 12px; @@ -508,8 +534,12 @@ a { } } - .item-list { + .mt-16 { margin-top: 16px; + } + + .item-list { + // margin-top: 16px; text-align: left; line-height: 18px; diff --git a/src/views/agent/siteBaseSetting.vue b/src/views/agent/siteBaseSetting.vue index b7cde36..be9e2d6 100644 --- a/src/views/agent/siteBaseSetting.vue +++ b/src/views/agent/siteBaseSetting.vue @@ -73,18 +73,21 @@
+
微信收款
- + + - - - - -
@@ -140,12 +121,12 @@
支付宝收款
- + - - - - + +
京东店铺
- + :options_null="!jdList.length" + @change="changeSelectJindong" > - - - - -
+ +
淘宝/天猫店铺
- + :options_null="!taobaoList.length" + @change="changeSelectTaobao" > - - - - -
+ +
拼多多店铺
- + :options_null="!pddList.length" + @change="changeSelectPdd" > - - - - -
@@ -478,9 +388,6 @@ export default { domainTypes: [], domainPrefix: '', siteDomain: '', - - options_weixin_null: {}, - select_placeholder_weixin: '暂无收款账号,稍后配置', } }, computed: { @@ -688,63 +595,52 @@ export default { cancleUpdateSiteInfo() { this.getSiteInfo(); }, - changeNormalWeixin() { - - }, - changeSelectWeixin(item, flag) { - if (flag) { - this.select_placeholder_weixin = this.options_weixin_null.desc; - return + changeSelectWeixin(item) { + console.log(item, 'item') + if(this.bindWxpayId === item.payid){ + this.bindWxpayId = 0 + this.selectWxpay = null + return true } + this.bindWxpayId = item.payid; this.selectWxpay = item; - console.log(this.bindWxpayId, 'bindWxpayId'); - console.log(this.selectWxpay, 'selectWxpay'); - - this.selectedItem = { ...item }; - console.log(this.selectedItem, 'this.selectedItem===='); }, - changeSelectAlipay(item, flag) { - if (flag) { - this.select_placeholder_weixin = this.options_weixin_null.desc; - return + changeSelectAlipay(item) { + if(this.bindAlipayId === item.payid){ + this.bindAlipayId = 0 + this.selectAlipay = null + return true } this.bindAlipayId = item.payid; this.selectAlipay = item; - console.log(this.bindWxpayId, 'bindWxpayId'); - - this.selectedItem = { ...item }; - console.log(this.selectedItem, 'this.selectedItem===='); }, - changeSelectTaobao(item, flag) { - if (flag) { - this.select_placeholder_weixin = this.options_weixin_null.desc; - return + changeSelectTaobao(item) { + if(this.bindTaobaoId === item.payid){ + this.bindTaobaoId = 0 + this.selectTaobao = null + return true } this.bindTaobaoId = item.payid; this.selectTaobao = item; - - this.selectedItem = { ...item }; }, - changeSelectJindong(item, flag) { - if (flag) { - this.select_placeholder_weixin = this.options_weixin_null.desc; - return + changeSelectJindong(item) { + if(this.bindJdId === item.payid){ + this.bindJdId = 0 + this.selectJd = null + return true } this.bindJdId = item.payid; this.selectJd = item; - - this.selectedItem = { ...item }; }, - changeSelectPdd(item, flag) { - if (flag) { - this.select_placeholder_weixin = this.options_weixin_null.desc; - return + changeSelectPdd(item) { + if(this.bindPddId === item.payid){ + this.bindPddId = 0 + this.selectPdd = null + return true } this.bindPddId = item.payid; this.selectPdd = item; - - this.selectedItem = { ...item }; }, // 销售渠道 domainTypeChange(type) { diff --git a/src/views/agent/siteServiceAdd.vue b/src/views/agent/siteServiceAdd.vue index a433fb9..b8f167f 100644 --- a/src/views/agent/siteServiceAdd.vue +++ b/src/views/agent/siteServiceAdd.vue @@ -1,7 +1,7 @@