From b805002bcb61b11c847762bcf7842ebb351a3b46 Mon Sep 17 00:00:00 2001 From: liudan <18634735655@163.com> Date: Tue, 23 Apr 2024 00:23:40 +0800 Subject: [PATCH] 11 --- api/store.js | 5 +- api/user.js | 2 +- pages/store/settled/index.vue | 28 ++- pages/user/index.vue | 20 +- pages/users/promoter-list/index.vue | 360 ++++++++++++++++------------ static/images/reco.png | Bin 0 -> 825 bytes 6 files changed, 247 insertions(+), 168 deletions(-) create mode 100644 static/images/reco.png diff --git a/api/store.js b/api/store.js index 4db9397..9f241a8 100644 --- a/api/store.js +++ b/api/store.js @@ -530,4 +530,7 @@ export function priceRuleApi(id) { noAuth: true }); } - +// 商户协议 +export function getConfigText(id) { + return request.get(`agreement/${id}`); +} diff --git a/api/user.js b/api/user.js index c6780ca..461b8c7 100644 --- a/api/user.js +++ b/api/user.js @@ -715,4 +715,4 @@ export function getUserGroup(data) { // 获取列表 export function getNoticeList() { return request.get(`notice/list`) -} \ No newline at end of file +} diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index a10907f..30e196b 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -102,7 +102,7 @@ 已阅读并同意 - + @@ -111,7 +111,7 @@ -
{{isType ? '店铺类型说明' : '商户入驻协议'}}
+
{{isType ? '店铺类型说明' : '品质与服务承诺书'}}
@@ -153,7 +153,8 @@ merClassifly, getGoodsDetails, updateGoodsRecord, - getStoreTypeApi + getStoreTypeApi, + getConfigText } from '@/api/store.js'; import { getCaptcha, @@ -199,7 +200,8 @@ successful: false, keyCode: "", codeVal: "", - protocol: this.sys_intention_agree, + // protocol: this.sys_intention_agree, + protocol:"", timer: "", index: 0, index1: 0, @@ -219,6 +221,7 @@ }, mer_i_id: null, // 商户申请id isType: false, + originText:'' }; }, beforeDestroy() { @@ -242,6 +245,7 @@ this.getGoodsDetails(options.mer_i_id) }) } + this.getConfigTextHandle() }, onShow() {}, onReady() {}, @@ -253,13 +257,15 @@ this.isType = false; this.showProtocol = true; // 获取配置 - this.protocol = this.sys_intention_agree + // this.protocol = this.sys_intention_agree + this.protocol = this.originText }, /*获取发票说明*/ getAgreement() { let that = this that.showProtocol = true; - that.isType = true + that.isType = true; + that.protocol = "" getAgreementApi('sys_merchant_type').then(res => { that.protocol = res.data.sys_merchant_type }) @@ -559,7 +565,7 @@ title: '请选择商户分类' }); if (!that.isAgree) return that.$util.Tips({ - title: '请勾选并同意入驻协议' + title: '请勾选并同意品质与服务承诺书' }); if (that.isShowCode && !that.codeVal) return that.$util.Tips({ title: '请填写图片验证码' @@ -567,6 +573,12 @@ that.validate = true; return true; }, + getConfigTextHandle(){ + getConfigText('sys_merchant_serve').then(res=>{ + + this.originText = res.data.sys_merchant_serve + }) + }, jumpToList() { uni.navigateTo({ url: "/pages/store/applicationRecord/index" @@ -584,7 +596,7 @@ title: '请输入正确的手机号码' }); if (!this.isAgree) return this.$util.Tips({ - title: '请勾选并同意入驻协议' + title: '请勾选并同意品质与服务承诺书' }); this.$refs.verify.show(); } diff --git a/pages/user/index.vue b/pages/user/index.vue index a5738f2..7d63250 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -57,6 +57,9 @@ + + 推荐人：{{recommendPeopleText}} + 绑定手机号 @@ -293,7 +296,8 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; - import { getMenuList, getUserInfo, setVisit,getUserGroup } from '@/api/user.js'; + + import { getMenuList, getUserInfo, setVisit,getUserGroup, spreadPeople} from '@/api/user.js'; import { getVersion } from "@/api/public"; import { orderData } from '@/api/order.js' import { mapGetters } from "vuex"; @@ -414,12 +418,13 @@ contribution:0, huitong:0, }, - show:false + show:false, + recommendPeopleText:'-' } }, onLoad() { - + this.spreadPeopleHandle() }, onReady() { this.isNodes++; @@ -456,6 +461,15 @@ } }, methods: { + spreadPeopleHandle(){ + spreadPeople({page:1,limit:10}).then(res=>{ + + if(res.data.spread){ + this.recommendPeopleText = res.data.spread.nickname + } + + }) + }, closeHandle(){ this.show = false diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue index c11b412..07cd159 100644 --- a/pages/users/promoter-list/index.vue +++ b/pages/users/promoter-list/index.vue @@ -1,7 +1,7 @@ diff --git a/static/images/reco.png b/static/images/reco.png new file mode 100644 index 0000000000000000000000000000000000000000..3b1d9a273e4fc5a30f4a44ec746358f411595169 GIT binary patch literal 825 zcmV-91IGM`P)Px%^GQTORCr$PoIhw2Q5?s=@9L#cR76mylyp!qmq{ps=;YK%aB`_mk}8U8mx@Fv zn&>7}(jYD>xLA>5H44(jrEL%dDT0eqD6KUS{DU;T_qCTx((5IytyAyuI|#YF|Mx!m zzTf+M3jcAX)3Dql$)lE~Pik5{Bolz@(p0+uw2?sdgW7k~z4HBAgwqYTwPC96!Sv|+ zhu!`7t8w+3I9~Wrx*Pe|{2FDd$3-pQre{!od0IVxqx`k}*R7jC`DCuDxt@hY;P@N}X*OerI!)lG7 zf``VEeY9|g#NK~36{6q>0q&pfvEvKBhCwT}o?=D85mj({>_CUzwtEy%z10rOCXKx) zI06dpAA#K+PmF=8*H@?jHmVnWV?2?EQmNH$w*WQ<@XhhVeN@)Nx@{E&`!?1Hz}`?O z))AXQptmf54Fa5bk;qZ03&9x?0c;51%y`6CYa|7*p@6dmr%Ymx05%Y?hO1U=aAm~??-0Ny0_JxQFdLH_(u-cZXDjN% zB#jvXZ1Sc%jb{SbWWdB#0c>k)F0<(?)`!Q_BPZR2G|A9mUB~&>SxYG!A1e*y~W&A zDtMq!02=~W6NPWuJ%xO+B7g&DcnxWypMQ1TGsqWzhmQk`f+MbAkhz7KomVh1vE1sc zw*ZbRV2zSXUS7;iKi=pNzW|ON;0nq6&`a0mYeOLc9JIO7eMiTf1|KN8cjt!RectS= zH$=hPOu?FP0sJ7