From 3464c6fe6167dec49edff803dc3b0a411ffd5e52 Mon Sep 17 00:00:00 2001 From: liangjin <liangjin@finlean.com> Date: Wed, 21 Apr 2021 21:30:08 +0800 Subject: [PATCH] 和微分套餐修改 --- /dev/null | 0 src/api/oldapi.js | 7 + static/img/product_sd.png | 0 src/router/routes.js | 5 src/views/old/store/wx-pay-score.vue | 23 +-- static/img/product_xhzw.png | 0 src/views/old/store/business-center.vue | 229 ++++++++++++++++++++++++------------- static/img/product_cl.png | 0 static/img/product_xyw.png | 0 static/img/product_xrw.png | 0 src/views/old/store/wx-test-code.vue | 58 +++++++++ static/img/product_zd.png | 0 12 files changed, 225 insertions(+), 97 deletions(-) diff --git a/src/api/oldapi.js b/src/api/oldapi.js index 421de97..149734e 100644 --- a/src/api/oldapi.js +++ b/src/api/oldapi.js @@ -142,6 +142,10 @@ wxScoreInit(data){ return $http.post('/cmccWxpay/init',data) }, + // 微信分初始化 + wxScoreInit2(data){ + return $http.post('/cmccWxpay/init2',data) + }, // 微信分订单列表 wxScoreList(data){ return $http.post('/cmccWxpay/list',data) @@ -172,4 +176,7 @@ wxScoreCreInit(data){ return $http.post('/cmccWxpay/creInit', data); }, + wxScoreCreInit2(data){ + return $http.post('/cmccWxpay/creInit2', data); + }, } diff --git a/src/assets/imgs/product_xhzw.png b/src/assets/imgs/product_xhzw.png deleted file mode 100755 index 3a42030..0000000 --- a/src/assets/imgs/product_xhzw.png +++ /dev/null Binary files differ diff --git a/src/assets/imgs/product_xrw.png b/src/assets/imgs/product_xrw.png deleted file mode 100755 index ce696e5..0000000 --- a/src/assets/imgs/product_xrw.png +++ /dev/null Binary files differ diff --git a/src/router/routes.js b/src/router/routes.js index c2ac3fb..ea23242 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -204,6 +204,11 @@ component:()=>import("@/views/old/store/wx-pay-score.vue") }, { + path:"/wx-test-code", + name:'wxTestCode', + component:()=>import("@/views/old/store/wx-test-code.vue") + }, + { path:"/wx-getWxQRCode", name:'wx-getWxQRCode', component:()=>import("@/views/old/store/getWxQRCode.vue") diff --git a/src/views/old/store/business-center.vue b/src/views/old/store/business-center.vue index 427e108..8075e0f 100644 --- a/src/views/old/store/business-center.vue +++ b/src/views/old/store/business-center.vue @@ -7,46 +7,44 @@ --> <template> <div class="hb-gmzf"> - <x-header :left-options="{backText: '', showBack: false}">和微分</x-header> - <div v-if="showHwfProd"> - <div class="tab"> - <div class="tab-index"> - <p class="tab-index-one">请选择手机号类型</p> - </div> + <div class="head"> + <div class="head-left"> </div> - <div class="order-xrw" v-if="showXrwType" @click="productPage(0)"> - <div class="order-xrw-create"> - <div class="order-xrw-create-icon"> - <img class="order-xrw-create-icon-image" src="../../../assets/imgs/product_xrw.png"></img> + <div class="head-mid"> + 和微分 + </div> + <div class="head-right" v-on:click="qrCodePage()"> + 授权测试 + </div> + </div> + <div class="tab"> + <van-tabs v-model="active" animated @click="onClick"> + <van-tab v-for="(item,index) in contTypeList" :title="item.name" :key="index" > + <div v-for="(childItem,index) in item.childList" :key="index"> + <div class="tab-head"> + <div class="tab-head-icon"> + </div> + <div class="tab-head-font"> + {{childItem.name}} + </div> + <div class="tab-head-remain"> + </div> </div> - <p class="order-xrw-create-text"> - 新入网号码 - </p> - <i class="iconfont iconyou tab-index-two" style="width:10%;height:30px;"></i> - </div> - </div> - <div class="order-xrw" style="margin-top: 30px" v-if="showXhzwType" @click="productPage(2)"> - <div class="order-xrw-create"> - <div class="order-xrw-create-icon"> - <img class="order-xrw-create-icon-image" src="../../../assets/imgs/product_xhzw.png"></img> + <div class="tab-index"> + <div class="tab-index-row"> + <div class="tab-index-row-main" v-for="(grandchildItem,index) in childItem.childList" :key="index" v-on:click="productPage(grandchildItem)"> + <div class="tab-index-row-icon"> + <img class="order-xrw-create-icon-image" :src="getIndexIcon(grandchildItem)"></img> + </div> + <div class="tab-index-row-font"> + {{grandchildItem.name}} + </div> + </div> + </div> + </div> </div> - <p class="order-xrw-create-text"> - 携号转网号码 - </p> - <i class="iconfont iconyou tab-index-two" style="width:10%;height:30px;"></i> - </div> - </div> - <div class="order-xrw" style="margin-top: 30px" v-if="showClType" @click="productPage(1)"> - <div class="order-xrw-create"> - <div class="order-xrw-create-icon"> - <img class="order-xrw-create-icon-image" src="../../../assets/imgs/product_cl.png"></img> - </div> - <p class="order-xrw-create-text"> - 存量号码 - </p> - <i class="iconfont iconyou tab-index-two" style="width:10%;height:30px;"></i> - </div> - </div> + </van-tab> + </van-tabs> </div> </div> </template> @@ -55,16 +53,18 @@ import { async } from 'q'; import Vue from 'vue'; import { Toast } from 'vant'; + import { Tab, Tabs } from 'vant'; + Vue.use(Tab); + Vue.use(Tabs); export default { components: { }, data() { return { + active:'', + contTypeList:[], mblNoTypeList:{}, - showHwfProd:false, - showXrwType:false, - showClType:false, - showXhzwType:false, + showHwfProd:false }; }, computed:{ @@ -78,23 +78,25 @@ } }, methods: { + getIndexIcon(item){ + let iconSrc = "/static/img/"+item.icon+".png"; + return iconSrc; + }, init(){ - this.$api.wxScoreCreInit().then(res => { - this.mblNoTypeList = res.body.mblNoTypeList|| {}; - this.mblNoTypeList.forEach(item => { - if(item.code == '0'){ - this.showXrwType = true; - }else if(item.code == '1'){ - this.showClType = true; - }else if(item.code == '2'){ - this.showXhzwType = true; - } - }); + this.$api.wxScoreCreInit2().then(res => { + this.contTypeList = res.body.contTypeList|| {}; }, err => err); }, - productPage(type){ + qrCodePage(){ + this.$router.push({ + path: "/wx-test-code", + query: "", + }) + }, + productPage(item){ let queryObj = { - mblNoType:type, + code:item.code, + mblNoType:item.mblNoType, } this.$router.push({ path: "/wx-pay-score", @@ -115,36 +117,103 @@ }; </script> <style lang="less" scoped> - .hb-gmzf { + .head { width: 100%; - height: 100%; - background: #FAFAFC; + height: 40px; + display: flex; + line-height: 40px; + background: #FFFFFF;; + text-align: center; + &-left{ + width: 33.3%; + height: 40px; + } + &-mid{ + width: 33.3%; + height: 40px; + font-size: 18px; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + } + &-right{ + width: 33.4%; + height: 40px; + font-size: 14px; + font-family: PingFang SC; + color: #333333; + } } .tab { width: 100%; - height: 200px; - background: url('../../../assets/imgs/hwf_bg.png'); - background-size: 100% 100%; + height: 100%; + &-head{ + margin: 20px 30px 20px 30px; + width: 100%; + height: 24px; + line-height: 24px; + &-icon{ + width: 3px; + margin-top: 3px; + float: left; + height: 18px; + background: #6C68FF; + } + &-font{ + width: 20%; + margin-left: 10px; + height: 20px; + float: left; + font-size: 16px; + font-family: PingFang SC; + font-weight: bold; + color: #333333; + } + &-remain{ + width: 70%; + float: left; + height: 20px; + } + } + .tab-index { + margin: 20px; + height: 110px; + line-height: 110px; + background: #FFFFFF; + box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.04); + border-radius: 16px; + &-row { + width:100%; + height: 100px; + line-height: 100px; + margin:0px 20px 0px 20px; + &-main { + width:22.5%; + height: 100%; + float: left; + text-align: center; + } + &-icon { + width:100%; + height: 30%; + &-image { + width:100%; + height:100%; + } + } + &-font { + width: 100%; + height: 30%; + font-size: 10px; + font-family: PingFang SC; + color: #333333; + } + } + } } - .tab-index { - width: 100%; - height: 40px; - line-height: 40px; - box-sizing: border-box; - padding: 100px 0px 0px 20px; - color: #ffffff; - i { - font-size: 36px; - } - &-one,&-two{ - width: 100%; - float: left; - box-sizing: border-box; - font-size: 20px; - } - } + @@ -177,12 +246,6 @@ font-size: 18px; font-family: PingFang SC; color: #333333; - } - &-arrow { - margin-right:10px; - width: 10%; - background: url('../../../assets/imgs/product_xrw.png'); - float: right; } } } diff --git a/src/views/old/store/wx-pay-score.vue b/src/views/old/store/wx-pay-score.vue index 468bcea..33e1e1a 100644 --- a/src/views/old/store/wx-pay-score.vue +++ b/src/views/old/store/wx-pay-score.vue @@ -106,7 +106,7 @@ clearable maxlength="11" type="number" - placeholder="手机号码" + placeholder="请输入手机号码" > <van-button v-if="mblNoType == 0 || mblNoType == 1" @@ -149,6 +149,7 @@ data() { return { creditId: '', + contType:'', contId: '', //合约id contSendCode: '', //合约code mblType: '', @@ -188,14 +189,16 @@ }, computed: {}, created() { + this.contType = this.$route.query.code; this.mblNoType = this.$route.query.mblNoType; - this.$api.wxScoreInit({ type: this.mblNoType }).then( + this.$api.wxScoreInit2({ type: this.contType }).then( (res) => { this.form = res.body || {}; var arr = res.body.terms; }, (err) => err ); + }, methods: { //顶部tabbar返回按钮 @@ -225,10 +228,6 @@ // 账号类型 mblVertify(val) { let v = this.$tool; - if (v.checkValEmpty(this.mblNoType)) { - v.toast('请选择手机号类型'); - return false; - } if (v.checkValEmpty(this.contSendCode)) { v.toast('请选择活动套餐'); return false; @@ -277,7 +276,7 @@ v.toast('号码可用'); return false; } - + }, (err) => err ); @@ -287,10 +286,6 @@ let v = this.$tool; if (v.checkValEmpty(this.contSendCode)) { v.toast('请选择活动套餐'); - return false; - } - if (v.checkValEmpty(this.mblNoType)) { - v.toast('请选择手机号类型'); return false; } if (v.checkValEmpty(this.userName)) { @@ -321,8 +316,8 @@ this.vertifyStatus = 1; }else{ if(!this.isClick){ - v.toast('请先点击可用查询后生成二维码'); - return false; + v.toast('请先点击可用查询再生成二维码'); + return false; } } // console.log('ces', this.vertifyStatus + '你'); @@ -332,7 +327,7 @@ } this.$api .wxScoreCreate({ - mblNoType: this.mblNoType, + contType: this.contType, creditId: this.creditId, contId: this.contId, cardNo: this.idCardNo, diff --git a/src/views/old/store/wx-test-code.vue b/src/views/old/store/wx-test-code.vue new file mode 100644 index 0000000..7749d78 --- /dev/null +++ b/src/views/old/store/wx-test-code.vue @@ -0,0 +1,58 @@ +<!-- + * @Author: 小明丶 + * @Date: 2021-01-06 15:50:26 + * @LastEditors: 小明丶 + * @LastEditTime: 2021-01-06 15:50:27 + * @Description: +--> +<template> + <div class="hb-credit-installment h-100-g"> + <van-nav-bar + title="和微分" + left-text="返回" + left-arrow + @click-left="onClickLeft" + style="line-height: 43px;" + > + <i + class="iconfont iconzuojiantou" + slot="left" + style="font-size: 25px;" + ></i> + </van-nav-bar> + <div class="head"> + <img src="https://sie.jycash.cn/czjc/img/hwf/authtest.jpg"></img> + </div> + </div> +</template> +<script> + export default { + components: { + }, + data() { + return { + }; + }, + computed:{ + }, + created () { + + }, + methods: { + //顶部tabbar返回按钮 + onClickLeft() { + this.$router.go(-1); + }, + } + }; +</script> +<style lang="less" scoped> + .head { + width: 100%; + height: 100%; + img{ + width: 100%; + height: 100%; + } + } +</style> diff --git a/src/assets/imgs/product_cl.png b/static/img/product_cl.png similarity index 100% rename from src/assets/imgs/product_cl.png rename to static/img/product_cl.png Binary files differ diff --git a/static/img/product_sd.png b/static/img/product_sd.png new file mode 100755 index 0000000..6007cd5 --- /dev/null +++ b/static/img/product_sd.png Binary files differ diff --git a/static/img/product_xhzw.png b/static/img/product_xhzw.png new file mode 100755 index 0000000..e16010b --- /dev/null +++ b/static/img/product_xhzw.png Binary files differ diff --git a/static/img/product_xrw.png b/static/img/product_xrw.png new file mode 100755 index 0000000..1653f44 --- /dev/null +++ b/static/img/product_xrw.png Binary files differ diff --git a/static/img/product_xyw.png b/static/img/product_xyw.png new file mode 100755 index 0000000..1a7224c --- /dev/null +++ b/static/img/product_xyw.png Binary files differ diff --git a/static/img/product_zd.png b/static/img/product_zd.png new file mode 100755 index 0000000..71f19eb --- /dev/null +++ b/static/img/product_zd.png Binary files differ -- Gitblit v1.8.0