From d1425aa67c0c6c0e087ce32b1779ee02bbcdc4c6 Mon Sep 17 00:00:00 2001
From: zhaoxiaoqiang <287285524@qq.com>
Date: Tue, 27 Jul 2021 14:53:20 +0800
Subject: [PATCH] 接入宁夏移动
---
src/views/mine/mer/mer-photo-chose.vue | 1
src/utils/jsBridge.js | 2
src/router/routes.js | 7
src/views/mine/account/account-add.vue | 1
src/views/old/merchant/productManagement.vue | 2
src/store/mutations-types.js | 2
src/views/product/wxScore-detail.vue | 10
src/views/old/store/wx-pay-score.vue | 89 ++-
src/components/old/upload/uploadImgStore.vue | 1
src/views/main/product.vue | 3
src/views/user/loginByWx.vue | 3
src/store/index.js | 280 ++++++-------
src/views/main/home.vue | 10
src/components/old/upload/uploadImg.vue | 1
src/views/old/store/getWxQRCode.vue | 8
src/router/index.js | 1
src/views/user/login.vue | 1
src/views/mine/channel/channel.vue | 1
src/views/old/store/business-center.vue | 510 +++++++++++++-------------
src/components/vux_register.js | 2
src/views/template/list.vue | 1
src/utils/console.js | 1
src/views/main/index.vue | 4
src/views/user/register-home.vue | 33 -
src/views/template/distribute.vue | 1
src/views/mine/stores/stores.vue | 1
src/components/common/v-order-item.vue | 1
src/views/mine/setting/setting.vue | 2
src/components/common/h-list.vue | 1
src/views/old/store/productManagement.vue | 4
src/store/mutations.js | 6
src/components/common/v-gzzj-order-item.vue | 2
src/api/index.js | 37 +
src/views/main/message.vue | 4
src/components/old/upload/uploadImgTl.vue | 6
src/api/config.js | 1
src/views/old/facepay/orderDetails.vue | 6
src/views/mine/mer/mer-data.vue | 7
src/components/common/new-v-order-item.vue | 2
src/views/main/approve.vue | 2
src/components/common/v-filter.vue | 3
src/views/mine/mer/mer-info.vue | 3
webpack.common.js | 1
src/components/common/v-wxScore-order-item.vue | 2
src/views/order/wxScore.vue | 1
src/views/template/detail.vue | 10
src/views/old/store/bannerContent/bannerContent.vue | 1
src/views/mine/mer/mer-manager.vue | 1
src/views/mine/account/account.vue | 2
49 files changed, 495 insertions(+), 586 deletions(-)
diff --git a/src/api/config.js b/src/api/config.js
index bb80cba..4a8b332 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -123,7 +123,6 @@
'Content-Type': 'application/json; charset=UTF-8'
}
})
-console.log($http.interceptors)
// 添加请求拦截器
$http.interceptors.request.use(config => {
if(typeof config.data ==='undefined'){
diff --git a/src/api/index.js b/src/api/index.js
index 2fbebf4..6355ab5 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -73,12 +73,18 @@
- // 获取地区列表
+ // 获取地区列表/sib/public/cmccAreaList
+ // getArea() {获取所有省市区列表
+ // let data = {
+ // apploading:1
+ // };
+ // return $http.post('/public/areaList',data);
+ // },
getArea() {
let data = {
apploading:1
};
- return $http.post('/public/areaList',data);
+ return $http.post('/public/cmccAreaList',data);
},
// 获取机构拥有的地区列表
@@ -338,8 +344,31 @@
userAddStoreManager(data){
return $http.post('/user/addStoreManager',data)
},//资料补充
-
-
+ // ===========宁夏移动接入调整借口===============
+ // 查询业务归属省份
+ findProvNo(data){
+ return $http.post('/cmccWxpay/findProvNo',data)
+ },
+ //创建订单并且返回二维码/cmccWxpay/nx/create
+ nxCreate(data){
+ return $http.post('/cmccWxpay/nx/create',data)
+ },
+ // 生成二维码初始化/sib/cmccWxpay/nx/init
+ nxInit(data){
+ return $http.post('/cmccWxpay/nx/init',data)
+ },
+ // // 授权结果推送/cmccWxpay/nx/pushOrderStatus
+ // pushOrderStatus(data){
+ // return $http.post('/cmccWxpay/nx/pushOrderStatus',data)
+ // },
+ // // 返销/cmccWxpay/nx/refund
+ // nxRefund(data){
+ // return $http.post('/cmccWxpay/nx/refund',data)
+ // },
+ // 检验手机号是否可用/cmccWxpay/nx/verifyMblNo
+ nxVerifyMblNo(data){
+ return $http.post('/cmccWxpay/nx/verifyMblNo',data)
+ },
}
export default {
diff --git a/src/components/common/h-list.vue b/src/components/common/h-list.vue
index 782b6ca..9b27c82 100644
--- a/src/components/common/h-list.vue
+++ b/src/components/common/h-list.vue
@@ -31,7 +31,6 @@
mounted(){
document.querySelector('.h-list').addEventListener('scroll', this.boxScroll,true)
//window.addEventListener('scroll', this.boxScroll,true)
- console.log(this.defScroll)
},
methods:{
boxScroll(e){
diff --git a/src/components/common/new-v-order-item.vue b/src/components/common/new-v-order-item.vue
index cf03202..304d62d 100644
--- a/src/components/common/new-v-order-item.vue
+++ b/src/components/common/new-v-order-item.vue
@@ -70,7 +70,7 @@
}
},
created() {
- console.log(this.list)
+
}
}
</script>
diff --git a/src/components/common/v-filter.vue b/src/components/common/v-filter.vue
index 067c1cc..18266cf 100644
--- a/src/components/common/v-filter.vue
+++ b/src/components/common/v-filter.vue
@@ -342,7 +342,6 @@
},
// 查询参数组合
searchParam(){
- console.log(this.belongArrCode)
let insTerm = this.periodsArrCode,
key = this.calcParam.searchKey,
orderStatus = this.statusArrCode,
@@ -461,8 +460,6 @@
}
},
setCode(key,code){
- console.log(key)
- console.log(code)
this[key] = code;
},
// 重置
diff --git a/src/components/common/v-gzzj-order-item.vue b/src/components/common/v-gzzj-order-item.vue
index 0a0e297..f24d7e8 100644
--- a/src/components/common/v-gzzj-order-item.vue
+++ b/src/components/common/v-gzzj-order-item.vue
@@ -86,7 +86,7 @@
}
},
created() {
- console.log(this.list)
+
}
}
</script>
diff --git a/src/components/common/v-order-item.vue b/src/components/common/v-order-item.vue
index 220926a..87c13dd 100644
--- a/src/components/common/v-order-item.vue
+++ b/src/components/common/v-order-item.vue
@@ -62,7 +62,6 @@
}
},
created() {
- console.log(this.list)
}
}
</script>
diff --git a/src/components/common/v-wxScore-order-item.vue b/src/components/common/v-wxScore-order-item.vue
index a15dd67..7439285 100644
--- a/src/components/common/v-wxScore-order-item.vue
+++ b/src/components/common/v-wxScore-order-item.vue
@@ -78,7 +78,7 @@
}
},
created() {
- console.log(this.list)
+
}
}
</script>
diff --git a/src/components/old/upload/uploadImg.vue b/src/components/old/upload/uploadImg.vue
index 9368dd1..0c7473a 100644
--- a/src/components/old/upload/uploadImg.vue
+++ b/src/components/old/upload/uploadImg.vue
@@ -116,7 +116,6 @@
...mapMutations([SET_APP_LOADING]),
//删除照片
deletPhoto(item, i) {
- //console.log(item);
this.picList.splice(i, 1);
},
// 处理图片上传的事件(deleteIndex---删除图片的索引)
diff --git a/src/components/old/upload/uploadImgStore.vue b/src/components/old/upload/uploadImgStore.vue
index 855ae93..5c24d83 100644
--- a/src/components/old/upload/uploadImgStore.vue
+++ b/src/components/old/upload/uploadImgStore.vue
@@ -156,7 +156,6 @@
// 将删除索引重置为-1,即当前状态重置为新增，而非删除状态
this.deleteIndex = -1;
} else {
- console.log()
this.picList.unshift({
fileUrl: res.body.fileUrl,
fileId: res.body.fileId
diff --git a/src/components/old/upload/uploadImgTl.vue b/src/components/old/upload/uploadImgTl.vue
index fab7dca..608f098 100644
--- a/src/components/old/upload/uploadImgTl.vue
+++ b/src/components/old/upload/uploadImgTl.vue
@@ -126,7 +126,6 @@
...mapMutations([SET_APP_LOADING]),
//删除照片
deletPhoto(item, i) {
- //console.log(item);
this.picList.splice(i, 1);
},
// 处理图片上传的事件(deleteIndex---删除图片的索引)
@@ -174,10 +173,8 @@
}
// 图片的路径获取成功后
function callback() {
- console.log(img.width,img.height)
// 压缩后的图片的base64字符串
let data = that.compress(img);
- console.log(that.getFile(data))
// 调取接口上传图片
that.submitUploadImg(that.fileType, data, that.deleteIndex);
@@ -305,7 +302,6 @@
let maxWidthOrHeight = 1024;
let drawWidth = this.naturalWidth;
let drawHeight = this.naturalHeight;
- console.log(drawWidth,drawHeight)
// 以下改变图片大小，控制最大宽度为1024
var maxSide = Math.max(drawWidth, drawHeight);
if (maxSide > maxWidthOrHeight) {
@@ -347,8 +343,6 @@
ctx.drawImage(this, 0, 0, resultWidth, resultHeight);
// 返回校正图片
next(canvas.toDataURL("image/jpg", 0.8));
-
- console.log(image.width,image.height)
};
image.src = img;
diff --git a/src/components/vux_register.js b/src/components/vux_register.js
index f3e1f2a..4ef9d01 100644
--- a/src/components/vux_register.js
+++ b/src/components/vux_register.js
@@ -45,8 +45,6 @@
Vue.component('f-no-data', FNoData);
arr.forEach(item => {
- // console.log(item);
- // Vue.use(item)
Vue.component(item.name,item)
})
diff --git a/src/router/index.js b/src/router/index.js
index 2bb7ea4..a65ce6a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -35,7 +35,6 @@
//判断地址是否带有token参数有就截取存储
if(location.href.split('?')[1]){
if(location.href.split('?')[1].split('token=')[1]){
- console.log('qqq:',location.href.split('?')[1])
let str = location.href.split('?')[1].split('token=')[1]
localStorage.hjToken = str
}
diff --git a/src/router/routes.js b/src/router/routes.js
index 33fadd4..beac445 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -62,13 +62,6 @@
},
-
-
-
-
-
-
-
{
path:"/main",
component:()=>import("@/views/main/index.vue"),
diff --git a/src/store/index.js b/src/store/index.js
index 7f2068e..816c2fb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -26,7 +26,8 @@
SET_BCJBCOLORF,
SET_BCJBCOLORB,
SET_DEFAULT_BG_COLOR,
- SET_LAST_COLOR
+ SET_LAST_COLOR,
+ HNORNX_TYPE,
} from './mutations-types';
Vue.use(Vuex);
@@ -46,12 +47,11 @@
},
msgCount: {},
inviteCode: '', //邀请码
-
- lastColor:'#423d5d',
- backColor:'#896EDB',//主题色
- backJbColorF:'#8F6AFF',//主题渐变色
- backJbColorB:'#9459EC',
- defaultBgColor:'linear-gradient(180deg, #554E7A, #423D5D)',
+ lastColor: '#423d5d',
+ backColor: '#896EDB',//主题色
+ backJbColorF: '#8F6AFF',//主题渐变色
+ backJbColorB: '#9459EC',
+ defaultBgColor: 'linear-gradient(180deg, #554E7A, #423D5D)',
},
getters: {
orgType(state) {
@@ -63,28 +63,26 @@
},
mutations,
actions: {
- loginByAppToken({ commit, dispatch }, { vm, appToken, backUrl, next }){
+ loginByAppToken({ commit, dispatch }, { vm, appToken, backUrl, next }) {
sessionStorage.appToken = appToken;
sessionStorage.backUrl = backUrl;
- let p = new Promise(function(resolve,reject){
- Vue.prototype.$api.loginByMerToken({
- token:appToken
- }).then(res=>{
+ let p = new Promise(function (resolve, reject) {
+ Vue.prototype.$api.loginByMerToken({token: appToken }).then(res => {
sessionStorage.jumpUrl = res.body.clientAccessDomain;
let lastLoginMgrId = res.body.lastLoginMgrId
let sessionId = res.body.sessionId
commit(SET_SESSION_ID, sessionId);
- if(lastLoginMgrId){
+ if (lastLoginMgrId) {
resolve(lastLoginMgrId)
- }else{
+ } else {
next('/app/changeMer')
}
})
})
- p.then(lastLoginMgrId=>{
+ p.then(lastLoginMgrId => {
sessionStorage.sid = lastLoginMgrId;
- Vue.prototype.$api.getPowerInfo(lastLoginMgrId).then(res=>{
- commit(SET_USER_INFO,res.body)
+ Vue.prototype.$api.getPowerInfo(lastLoginMgrId).then(res => {
+ commit(SET_USER_INFO, res.body)
next('/app/home')
})
})
@@ -95,14 +93,10 @@
Vue.prototype.$api.loginByToken({
token: hjToken
}).then(res => {
-
sessionStorage.jumpUrl = res.body.clientAccessDomain;
-
let lastLoginMgrId = res.body.lastLoginMgrId
let sessionId = res.body.sessionId
commit(SET_SESSION_ID, sessionId);
-
-
if (lastLoginMgrId) {
dispatch('setUserMenu', { vm, lastLoginMgrId, next })
} else {
@@ -114,17 +108,17 @@
}
})
},
- loginByOpenId({ commit, dispatch },{ vm, loginType, verCode, mblNo,merId,wechatOpenId,userId, next}){
+ loginByOpenId({ commit, dispatch }, { vm, loginType, verCode, mblNo, merId, wechatOpenId, userId, next }) {
Vue.prototype.$api.loginByOpenId({
- loginType:loginType,
- verCode:verCode,
- mblNo:mblNo,
- merId:merId,
- wechatOpenId:wechatOpenId,
- userId:userId
- }).then(res=>{
- if(mblNo){
- localStorage.sib_wx_mblNo = mblNo
+ loginType: loginType,
+ verCode: verCode,
+ mblNo: mblNo,
+ merId: merId,
+ wechatOpenId: wechatOpenId,
+ userId: userId
+ }).then(res => {
+ if (mblNo) {
+ localStorage.sib_wx_mblNo = mblNo
}
sessionStorage.isLoginByOpenId = 1
localStorage.sib_wx_openId = wechatOpenId
@@ -132,24 +126,24 @@
// localStorage.sib_wx_mblNo = res.body.mblNo
// localStorage.sib_wx_userId = res.body.userId
commit(SET_SESSION_ID, res.body.sessionId);
- if(res.body.isRegister == 1){
+ if (res.body.isRegister == 1) {
vm.$router.push({
- path:'/supplement',
- query:{
- storeList:JSON.stringify(res.body.storeList)
+ path: '/supplement',
+ query: {
+ storeList: JSON.stringify(res.body.storeList)
}
})
- }else{
- if(res.body.storeList.length == 1){
+ } else {
+ if (res.body.storeList.length == 1) {
let lastLoginMgrId = res.body.storeList[0].id
dispatch('setUserMenu', { vm, lastLoginMgrId, next })
}
- if(res.body.storeList.length > 1){
+ if (res.body.storeList.length > 1) {
vm.$router.push({
- path:'/mine/toggle-identity',
- query:{
- title:'选择门店',
- storeList:JSON.stringify(res.body.storeList)
+ path: '/mine/toggle-identity',
+ query: {
+ title: '选择门店',
+ storeList: JSON.stringify(res.body.storeList)
}
})
}
@@ -172,11 +166,11 @@
// }
// })
// }
- })
+ })
},
login({ commit, dispatch }, { vm, userNo, password, sib_mer_sysPlat, next }) {
window.localStorage.clear()
- if(sessionStorage.isddxt == 1){
+ if (sessionStorage.isddxt == 1) {
window.document.title = '叮咚学堂'
}
let tmpPassword = md5(userNo + password);
@@ -212,42 +206,47 @@
});
},
// 根据不同的权限设置用户拥有的菜单
- setUserMenu({ commit }, { vm, lastLoginMgrId, next }) {
+ async setUserMenu({ commit }, { vm, lastLoginMgrId, next }) {
vm.$api.getPowerInfo(lastLoginMgrId).then(data => {
- let {
- powerInfoVos,
- orgType
- } = data.body;
+
+ let { powerInfoVos, orgType } = data.body;
let inviteCode = data.body.inviteCode;
+ let footernav = []
+ let userPage = []
+ let path = ''
commit(SET_INVITE_CODE, inviteCode);
+
+ vm.$api.findProvNo().then(res => {
+ // 410000 河南 ，640000宁夏
+ commit(HNORNX_TYPE, res.body);
+ let nxOrHn = res.body;
+ let footerMenu = [
+ {
+ powerId: 100001,
+ icon: 'iconshuju_h',
+ Aicon: 'iconshuju',
+ label: '数据',
+ path: '/order/wxScore'
+ },
+ {
+ powerId: 100003,
+ icon: 'iconshenpi_h',
+ Aicon: 'iconshenpi',
+ label: '审批',
+ path: '/main/approve'
+ },
- let footerMenu = [
- {
- powerId: 100001,
- icon: 'iconshuju_h',
- Aicon: 'iconshuju',
- label: '数据',
- path: '/order/wxScore'
- },
- {
- powerId: 100003,
- icon: 'iconshenpi_h',
- Aicon: 'iconshenpi',
- label: '审批',
- path: '/main/approve'
- },
+ {
+ powerId: 100006,
+ icon: 'icondingdan',
+ Aicon: 'icondingdan1',
+ label: '办单',
+ path:'/main/product'
+ },
- {
- powerId: 100006,
- icon: 'icondingdan',
- Aicon: 'icondingdan1',
- label: '办单',
- path: '/main/product'
- },
-
- ]
- let userMenu = [
+ ]
+ let userMenu = [
{
powerId: 100004,
icon: 'iconshanghuguanli',
@@ -261,7 +260,7 @@
path: '/mine/channel'
}
]
- if(!window.localStorage.hjToken && sessionStorage.isLoginByOpenId != 1){
+ if (!window.localStorage.hjToken && sessionStorage.isLoginByOpenId != 1) {
userMenu.push({
powerId: 100005,
icon: 'iconzhanghaoguanli',
@@ -269,81 +268,65 @@
path: '/mine/account'
})
}
-
- let footernav = []
- let userPage = []
- let path = ''
-
- powerInfoVos.map(item => {
- footerMenu.map(child => {
- if (item.powerId === child.powerId) {
- if (child.powerId === 100001 || child.powerId === 100006) {
- footernav.unshift(child);
- } else {
- footernav.push(child);
+ powerInfoVos.map(item => {
+ footerMenu.map(child => {
+ if (item.powerId === child.powerId) {
+ if (child.powerId === 100001 || child.powerId === 100006) {
+ footernav.unshift(child);
+ } else {
+ footernav.push(child);
+ }
}
+ });
+ userMenu.map(child => {
+ if (item.powerId === child.powerId) {
+ userPage.push(child);
+ }
+ });
+ });
+ footernav.push({
+ powerId: 200000,
+ icon: 'iconguanli_h',
+ Aicon: 'iconguanli',
+ label: '我的',
+ path: '/main/mine'
+ })
+ // 代理角色一定有商户管理、商户注册的菜单
+ if (orgType === 1 || orgType === 2) {
+ userPage.push({
+ icon: 'iconshanghuguanli',
+ label: '商户管理',
+ path: '/mine/mer-manager'
+ });
+ userPage.push({
+ icon: 'iconshanghuzhuce',
+ label: '商户注册',
+ path: '/user/register'
+ });
+ }
+ commit(SET_FOOTER_NAV, footernav);
+ commit(SET_USER_PAGE, userPage);
+ commit(SET_USER_INFO, data.body);
+ sessionStorage.sid = lastLoginMgrId;
+ // vm.$setItem('sid', mgrId);
+ if (orgType === 4) {
+ if (sessionStorage.isLoginByOpenId == 1) {
+ path = '/main/mine';
}
- });
- userMenu.map(child => {
- if (item.powerId === child.powerId) {
- userPage.push(child);
+ else {
+ path ='/main/product'
}
- });
- });
- console.log(userPage)
-
-
-
- footernav.push({
- powerId: 200000,
- icon: 'iconguanli_h',
- Aicon: 'iconguanli',
- label: '我的',
- path: '/main/mine'
- })
-
-
-
-
-
- // 代理角色一定有商户管理、商户注册的菜单
- if (orgType === 1 || orgType === 2) {
-
- userPage.push({
- icon: 'iconshanghuguanli',
- label: '商户管理',
- path: '/mine/mer-manager'
- });
- userPage.push({
- icon: 'iconshanghuzhuce',
- label: '商户注册',
- path: '/user/register'
- });
- }
-
-
- commit(SET_FOOTER_NAV, footernav);
- commit(SET_USER_PAGE, userPage);
- commit(SET_USER_INFO, data.body);
- sessionStorage.sid = lastLoginMgrId;
- // vm.$setItem('sid', mgrId);
- if (orgType === 4) {
- if(sessionStorage.isLoginByOpenId == 1){
+ } else {
path = '/main/mine';
}
- else{
- path = '/main/product';
+ if (next) {
+ next(path)
+ } else {
+ vm.$router.push(path)
}
+ });
- } else {
- path = '/main/mine';
- }
- if (next) {
- next(path)
- } else {
- vm.$router.push(path)
- }
});
},
// 获取地区列表
@@ -374,13 +357,12 @@
})
},
// 设置主题色
- setColor({commit},{backColor,backJbColorF,backJbColorB,defaultBgColor, lastColor}){
- console.log('defaultBgColor:',defaultBgColor)
- commit(SET_BCAKCOLOR,backColor)
- commit(SET_BCJBCOLORF,backJbColorF)
- commit(SET_BCJBCOLORB,backJbColorB)
- commit(SET_DEFAULT_BG_COLOR,defaultBgColor)
- commit(SET_LAST_COLOR,lastColor)
+ setColor({ commit }, { backColor, backJbColorF, backJbColorB, defaultBgColor, lastColor }) {
+ commit(SET_BCAKCOLOR, backColor)
+ commit(SET_BCJBCOLORF, backJbColorF)
+ commit(SET_BCJBCOLORB, backJbColorB)
+ commit(SET_DEFAULT_BG_COLOR, defaultBgColor)
+ commit(SET_LAST_COLOR, lastColor)
}
},
modules: {
diff --git a/src/store/mutations-types.js b/src/store/mutations-types.js
index bc393a3..53259fe 100644
--- a/src/store/mutations-types.js
+++ b/src/store/mutations-types.js
@@ -22,7 +22,7 @@
// 设置用户的权限页面
export const SET_USER_PAGE = "SET_USER_PAGE";
export const SET_INVITE_CODE = "SET_INVITE_CODE";
-
+export const HNORNX_TYPE ='HNORNX_TYPE'
export const SET_BCAKCOLOR = "SET_BCAKCOLOR";
export const SET_BCJBCOLORF = "SET_BCJBCOLORF";
export const SET_BCJBCOLORB = "SET_BCJBCOLORB";
diff --git a/src/store/mutations.js b/src/store/mutations.js
index eff7d55..18ea2d5 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -18,7 +18,8 @@
SET_BCJBCOLORF,
SET_BCJBCOLORB,
SET_DEFAULT_BG_COLOR,
- SET_LAST_COLOR
+ SET_LAST_COLOR,
+ HNORNX_TYPE
} from "./mutations-types";
//使用 ES2015 风格的计算属性命名功能来使用一个常量作为函数名
@@ -31,6 +32,9 @@
[SET_INVITE_CODE](state, val) {
state.inviteCode = val;
},
+ [HNORNX_TYPE](state, val) {
+ state.hnOrnxtype = val;
+ },
[SET_AREA_LIST](state, val) {
state.areaList = val;
},
diff --git a/src/utils/console.js b/src/utils/console.js
index 162fa2a..dd1bb4a 100644
--- a/src/utils/console.js
+++ b/src/utils/console.js
@@ -9,7 +9,6 @@
var log = function(...araguments){
if(DEBUG){
var arr = Array.prototype.slice.call(araguments)
- console.log.apply(console,arr)
}
}
export default {
diff --git a/src/utils/jsBridge.js b/src/utils/jsBridge.js
index ccda68d..d888174 100644
--- a/src/utils/jsBridge.js
+++ b/src/utils/jsBridge.js
@@ -167,7 +167,6 @@
},
//打开通讯录
openConect(callback) {
- console.log('js打开通讯录');
//for iOS
setupWebViewJavascriptBridge(function(bridge) {
bridge.callHandler('kJSOpenConect', function responseCallback(
@@ -186,7 +185,6 @@
},
//获取高德地图定位位置信息
getAMMapLoactionMsg(callback) {
- console.log('js获取位置信息');
setupWebViewJavascriptBridge(function(bridge) {
bridge.callHandler(
'kJSGetAMMapLoactionInfo',
diff --git a/src/views/main/approve.vue b/src/views/main/approve.vue
index ae64d72..efef539 100644
--- a/src/views/main/approve.vue
+++ b/src/views/main/approve.vue
@@ -112,7 +112,6 @@
if(this.list[this.navIndex].arr.length >= 10){
merId = myArr[myArr.length-1].merId
}
- console.log(this.finished)
this.$api.getAuditList({
auditStatus:this.navIndex,
searchKey:this.searchKey,
@@ -136,7 +135,6 @@
this.loading = false
this.finished = false
}
- console.log(this.finished)
}).catch((err) => {
});
diff --git a/src/views/main/home.vue b/src/views/main/home.vue
index 2dd1567..0237415 100644
--- a/src/views/main/home.vue
+++ b/src/views/main/home.vue
@@ -435,7 +435,6 @@
// typeId: "210000",
// typeName: "支付宝拉新"
// })
- console.log(this.productList)
if (this.productList.length) {
let prodId = this.productList[0].prodId;
this.toggleProduct(this.productList[0],0,true)
@@ -500,7 +499,6 @@
},
// 显示时间选择组件
openTimeModal(isB) {
- console.log(111)
this.setPickerValue()
this.$nextTick(()=>{
this.isShoTime = true;
@@ -532,10 +530,8 @@
},
// 获取折线图统计数据
getAmtReport(id, lx) {
- // console.log(lx == 'zfblx')
if(lx == 210000) {
this.$api.zfbLxWeekReport().then(res => {
- console.log('zfbLxWeekReport')
this.opt.series[0].data = []
this.opt.series[1].data = []
this.opt.series[2].data = []
@@ -553,9 +549,6 @@
this.$forceUpdate();
let myChart = echarts.init(this.$refs.lineChart);
myChart.setOption(this.opt);
- console.log(this.opt.series[0].data)
- console.log(this.opt.series[1].data)
- console.log(this.opt.series[2].data)
})
} else {
this.$api.getAmtReport(id).then((res) => {
@@ -680,7 +673,6 @@
},
//切换产品
toggleProduct(item, index,isGetChartData) {
- console.log(item)
this.zfblxLabel = ''
this.opt.series[0].data = []
this.opt.series[1].data = []
@@ -697,7 +689,6 @@
}
if(item.typeId == 210000) {
this.zfblxLabel = 'zfblx'
- // console.log(this.zfblxLabel)
}
this.navIndex = index;
// return
@@ -757,7 +748,6 @@
prodId:item.prodId
}
}
- // console.log(this.jumpParams)
this.getAmtReport(item.prodId, item.typeId)
this.getOrderReport(this.prodId,this.startDay,this.endDay, item.typeId)
if(this.isAgent && isGetChartData){
diff --git a/src/views/main/index.vue b/src/views/main/index.vue
index 860ea70..dc71b39 100644
--- a/src/views/main/index.vue
+++ b/src/views/main/index.vue
@@ -25,9 +25,7 @@
</template>
<script>
- import {
- mapState, mapGetters, mapActions
- } from 'vuex';
+ import { mapState, mapGetters, mapActions } from 'vuex';
export default {
data() {
return {
diff --git a/src/views/main/message.vue b/src/views/main/message.vue
index cb2e2e3..14cb4b6 100644
--- a/src/views/main/message.vue
+++ b/src/views/main/message.vue
@@ -32,10 +32,6 @@
msgListInit() {
this.$api.noticeList().then(res => {
this.messageList = res.body.noticeInfos;
- console.log(this.messageList)
- // console.log(this.messageList.some(item => {
- // item.needRead === 1
- // }))
})
}
}
diff --git a/src/views/main/product.vue b/src/views/main/product.vue
index f858ced..04bc6c0 100644
--- a/src/views/main/product.vue
+++ b/src/views/main/product.vue
@@ -142,12 +142,11 @@
//信用卡分期点击
Click_XYK() {
- console.log('信用卡分期点击');
+
},
//花呗分期
Click_HBFQ() {
- console.log('花呗分期');
},
diff --git a/src/views/mine/account/account-add.vue b/src/views/mine/account/account-add.vue
index 5478d69..7773873 100644
--- a/src/views/mine/account/account-add.vue
+++ b/src/views/mine/account/account-add.vue
@@ -92,7 +92,6 @@
},
created() {
this.orgType = this.userinfo.orgType;
- console.log("orgType:"+this.orgType);
this.form.powerInfoVos = this.userinfo.powerInfoVos;
if (!this.isAdd) {
this.init();
diff --git a/src/views/mine/account/account.vue b/src/views/mine/account/account.vue
index 65d1f4d..96b79ae 100644
--- a/src/views/mine/account/account.vue
+++ b/src/views/mine/account/account.vue
@@ -67,7 +67,6 @@
},
methods: {
saleOrderLoad(){
- console.log(6767)
this.finished = true
},
go(id){
@@ -75,7 +74,6 @@
},
init(){
this.$api.getMgrList().then((res) => {
- console.log(res);
this.list = res.body ||[];
}).catch((err) => {
diff --git a/src/views/mine/channel/channel.vue b/src/views/mine/channel/channel.vue
index 745aa6a..0b3b534 100644
--- a/src/views/mine/channel/channel.vue
+++ b/src/views/mine/channel/channel.vue
@@ -68,7 +68,6 @@
},
methods: {
saleOrderLoad(){
- console.log(343434)
this.finished = true
},
init(){
diff --git a/src/views/mine/mer/mer-data.vue b/src/views/mine/mer/mer-data.vue
index 502f61b..2b8380e 100644
--- a/src/views/mine/mer/mer-data.vue
+++ b/src/views/mine/mer/mer-data.vue
@@ -191,13 +191,11 @@
methods: {
ShowArea(){
this.isShowArea=true
- console.log(this.form.areaLists)
},
handleHide() {
this.showConfirm = false;
},
setAreaValue(arr){
- console.log(arr);
this.areaLists = arr[0].name +arr[1].name + arr[2].name + '';
// this.form.provCode= arr[0].code;
// this.form.cityCode= arr[1].code;
@@ -208,7 +206,6 @@
this.isShowArea = false;
// this.$refs.Area.reset()
this.$forceUpdate();
- console.log(this.areaLists)
},
//返回上一级按钮
onClickLeft() {
@@ -240,7 +237,6 @@
merInit() {
this.$api.merchantDetail({merId: this.merId}).then(
res => {
- console.log(res.body);
this.contractGoodsName = res.body.merName;
this.businesslicenseNo = res.body.licenseNo;
this.contractUserName = res.body.legalName;
@@ -257,7 +253,6 @@
}
})
this.merZfbInfos = list
- console.log(this.merZfbInfos)
let arr = [];
if(res.body.addr.area) {
arr.push(res.body.addr.province)
@@ -331,9 +326,7 @@
date.licenseNo = this.businesslicenseNo;
date.merId = this.merId;
date.merZfbInfos = this.merZfbInfos;
- console.log(date)
this.$api.merchantEdit(date).then(() => {
- // console.log('保存商戶資料')
this.$router.push('/mine/setting')
})
this.showConfirm = false;
diff --git a/src/views/mine/mer/mer-info.vue b/src/views/mine/mer/mer-info.vue
index 24b37db..d28723e 100644
--- a/src/views/mine/mer/mer-info.vue
+++ b/src/views/mine/mer/mer-info.vue
@@ -58,8 +58,6 @@
},
methods:{
goNext(){
- console.log(this.info.merZfbInfos)
-
sessionStorage.setItem('td-mer-photo', JSON.stringify(this.info.merZfbInfos))
this.$router.push({
path:'/mine/mer-photo-chose',
@@ -96,7 +94,6 @@
merZfbInfos = this.info.merZfbInfos,
area = this.info.addr.area ||'';
this.Addrs = (province.name || '') + (city.name || '') + (area.name || '');
- console.log(list)
});
},
diff --git a/src/views/mine/mer/mer-manager.vue b/src/views/mine/mer/mer-manager.vue
index ddb0ea6..32bb404 100644
--- a/src/views/mine/mer/mer-manager.vue
+++ b/src/views/mine/mer/mer-manager.vue
@@ -190,7 +190,6 @@
let list = res.body || [];
this.parseArea(list)
this.areaList = calcAreaTwo(this.Area)
- console.log(this.areaList)
});
},
merInit(){
diff --git a/src/views/mine/mer/mer-photo-chose.vue b/src/views/mine/mer/mer-photo-chose.vue
index 82940e6..8e5ab94 100644
--- a/src/views/mine/mer/mer-photo-chose.vue
+++ b/src/views/mine/mer/mer-photo-chose.vue
@@ -50,7 +50,6 @@
// this.list = res.body
// })
this.list = JSON.parse(sessionStorage.getItem('td-mer-photo'))
- console.log(this.list)
},
methods:{
// 返回上一页
diff --git a/src/views/mine/setting/setting.vue b/src/views/mine/setting/setting.vue
index f2859c0..7903cfe 100644
--- a/src/views/mine/setting/setting.vue
+++ b/src/views/mine/setting/setting.vue
@@ -67,8 +67,6 @@
}
},
created(){
- console.log(this.orgId)
- console.log(this.orgType)
this.$api.getAuditType().then((res) => {
this.placeText = res.body.currAuditTypeName;
}).catch((err) => {
diff --git a/src/views/mine/stores/stores.vue b/src/views/mine/stores/stores.vue
index 4d12a22..06596a7 100644
--- a/src/views/mine/stores/stores.vue
+++ b/src/views/mine/stores/stores.vue
@@ -65,7 +65,6 @@
},
methods: {
init(){
- console.log("merId:"+this.merId);
this.loading = true
this.$api.storeStoreList({
searchKey:this.value,
diff --git a/src/views/old/facepay/orderDetails.vue b/src/views/old/facepay/orderDetails.vue
index dd84d46..267455c 100644
--- a/src/views/old/facepay/orderDetails.vue
+++ b/src/views/old/facepay/orderDetails.vue
@@ -56,11 +56,7 @@
</template>
<script>
- import {
- Confirm,
- Icon,
- Cell
- } from 'vux';
+ import {Confirm,Icon, Cell } from 'vux';
export default {
name: 'facepay_details',
components: {
diff --git a/src/views/old/merchant/productManagement.vue b/src/views/old/merchant/productManagement.vue
index 7dd8ff7..d3ec7a9 100644
--- a/src/views/old/merchant/productManagement.vue
+++ b/src/views/old/merchant/productManagement.vue
@@ -74,7 +74,6 @@
});
},
handleJump(productItem) {
- console.log('test', productItem)
let {
typeId,
prodId,
@@ -310,7 +309,6 @@
this.productList1.push(item)
}
})
- console.log(this.productList1)
localStorage.setItem('hbcp_sh', JSON.stringify(res.body.prodTypeRespVoList2))
});
}
diff --git a/src/views/old/store/bannerContent/bannerContent.vue b/src/views/old/store/bannerContent/bannerContent.vue
index 16ce00c..f2adba6 100644
--- a/src/views/old/store/bannerContent/bannerContent.vue
+++ b/src/views/old/store/bannerContent/bannerContent.vue
@@ -31,7 +31,6 @@
// return item.bannerContent;
// }
// })
- console.log(res.body)
this.bannerContent = res.body.bannerContent
})
diff --git a/src/views/old/store/business-center.vue b/src/views/old/store/business-center.vue
index c34b1cd..2b98c40 100644
--- a/src/views/old/store/business-center.vue
+++ b/src/views/old/store/business-center.vue
@@ -6,268 +6,278 @@
* @Description:
-->
<template>
- <div class="hb-gmzf">
- <div class="head">
- <div class="head-left">
- </div>
- <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>
- <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 class="hb-gmzf">
+ <div v-if='hnOrnxtype == 410000'>
+ <div class="head">
+ <div class="head-left"></div>
+ <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>
+ <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)"
+ />
</div>
- </van-tab>
- </van-tabs>
- </div>
+ <div class="tab-index-row-font">
+ {{ grandchildItem.name }}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </van-tab>
+ </van-tabs>
+ </div>
</div>
+ <wxPayScore v-else></wxPayScore>
+ </div>
</template>
<script>
- import { mapState, mapGetters } from 'vuex';
- 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
- };
- },
- computed:{
- ...mapState(['userinfo', 'msgCount']),
- ...mapGetters(['orgType']),
- },
- created () {
- if(this.orgType == 4) {
- this.getProdcuctList();
- this.init();
- }
- },
- methods: {
- getIndexIcon(item){
- let iconSrc = location.origin + location.pathname +"/static/img/"+item.icon+".png";
- return iconSrc;
- },
- init(){
- this.$api.wxScoreCreInit2().then(res => {
- this.contTypeList = res.body.contTypeList|| {};
- }, err => err);
- },
- qrCodePage(){
- this.$router.push({
- path: "/wx-test-code",
- query: "",
- })
- },
- productPage(item){
- let queryObj = {
- code:item.code,
- mblNoType:item.mblNoType,
- }
- this.$router.push({
- path: "/wx-pay-score",
- query: queryObj
- })
- },
- getProdcuctList(){
- this.$api.prodIndexTypeList().then(res => {
- let list = res.body.prodTypeRespVoList3 || [];
- list.forEach(item => {
- if(item.prodId ==30000016 && item.openStatus == 2){
- this.showHwfProd = true;
- }
- });
- });
- },
- }
+import { mapState, mapGetters } from "vuex";
+import wxPayScore from './wx-pay-score.vue'
+import Vue from "vue";
+import { Tab, Tabs } from "vant";
+Vue.use(Tab);
+Vue.use(Tabs);
+export default {
+ components: {wxPayScore},
+ data() {
+ return {
+ active: "",
+ contTypeList: [],
+ mblNoTypeList: {},
+ showHwfProd: false,
};
+ },
+ computed: {
+ ...mapState(["userinfo", "msgCount","hnOrnxtype"]),
+ ...mapGetters(["orgType"]),
+ },
+ created() {
+ if (this.orgType == 4) {
+ this.getProdcuctList();
+ this.init();
+ }
+ },
+ methods: {
+ getIndexIcon(item) {
+ let iconSrc =
+ location.origin +
+ location.pathname +
+ "/static/img/" +
+ item.icon +
+ ".png";
+ return iconSrc;
+ },
+ init() {
+ this.$api.wxScoreCreInit2().then(
+ (res) => {
+ this.contTypeList = res.body.contTypeList || {};
+ },
+ (err) => err
+ );
+ },
+ qrCodePage() {
+ this.$router.push({
+ path: "/wx-test-code",
+ query: "",
+ });
+ },
+ productPage(item) {
+ let queryObj = {
+ code: item.code,
+ mblNoType: item.mblNoType,
+ };
+ this.$router.push({
+ path: "/wx-pay-score",
+ query: queryObj,
+ });
+ },
+ getProdcuctList() {
+ this.$api.prodIndexTypeList().then((res) => {
+ let list = res.body.prodTypeRespVoList3 || [];
+ list.forEach((item) => {
+ if (item.prodId == 30000016 && item.openStatus == 2) {
+ this.showHwfProd = true;
+ }
+ });
+ });
+ },
+ },
+};
</script>
<style lang="less" scoped>
- .head {
- width: 100%;
- 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;
- }
- }
+.head {
+ width: 100%;
+ 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%;
+.tab {
+ width: 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%;
- &-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;
- }
+ float: left;
+ text-align: center;
+ }
+ &-icon {
+ width: 100%;
+ height: 30%;
+ &-image {
+ width: 100%;
+ height: 100%;
}
- .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;
- }
- }
- }
+ }
+ &-font {
+ width: 100%;
+ height: 30%;
+ font-size: 10px;
+ font-family: PingFang SC;
+ color: #333333;
+ }
}
+ }
+}
-
-
-
-
- .order-xrw {
- margin:-50px 10px 10px 10px;
- padding: 0 10px 0 10px;
- line-height: 100px;
- background: #FFFFFF;
- box-shadow: 0px 0px 26px 0px rgba(0, 0, 0, 0.04);
- border-radius: 16px;
- &-create {
- width: 100%;
- height: 100px;
- margin:0px 10px 0px 10px;
- &-icon {
- width:20%;
- height: 100%;
- float: left;
- text-align: center;
- &-image {
- width:43px;
- height:43px;
- margin-top:25px;
- }
- }
- &-text {
- width: 70%;
- float: left;
- heght:100%;
- font-size: 18px;
- font-family: PingFang SC;
- color: #333333;
- }
- }
+.order-xrw {
+ margin: -50px 10px 10px 10px;
+ padding: 0 10px 0 10px;
+ line-height: 100px;
+ background: #ffffff;
+ box-shadow: 0px 0px 26px 0px rgba(0, 0, 0, 0.04);
+ border-radius: 16px;
+ &-create {
+ width: 100%;
+ height: 100px;
+ margin: 0px 10px 0px 10px;
+ &-icon {
+ width: 20%;
+ height: 100%;
+ float: left;
+ text-align: center;
+ &-image {
+ width: 43px;
+ height: 43px;
+ margin-top: 25px;
+ }
}
-
- .button-maintain {
- width:100%;
- height:100%;
- padding: 0 20px 0 20px;
- box-sizing: inherit;
- .button {
- margin: 50px 0 0 0;
- width:100%;
- height:50px;
- text-align: center;
- line-height: 50px;
- background: linear-gradient(90deg, #1C87FD, #219FFD);
- border-radius: 44px;
- .button-txt {
- margin: 8px 0 0 0;
- font-size: 22px;
- color: #FFFFFF;
- }
- }
+ &-text {
+ width: 70%;
+ float: left;
+ heght: 100%;
+ font-size: 18px;
+ font-family: PingFang SC;
+ color: #333333;
}
+ }
+}
+
+.button-maintain {
+ width: 100%;
+// height: 100%;
+ padding: 0 20px 0 20px;
+ box-sizing: inherit;
+ .button {
+ margin: 50px 0 0 0;
+ width: 100%;
+ height: 50px;
+ text-align: center;
+ line-height: 50px;
+ background: linear-gradient(90deg, #1c87fd, #219ffd);
+ border-radius: 44px;
+ .button-txt {
+ margin: 8px 0 0 0;
+ font-size: 22px;
+ color: #ffffff;
+ }
+ }
+}
</style>
diff --git a/src/views/old/store/getWxQRCode.vue b/src/views/old/store/getWxQRCode.vue
index 27926bd..61a1834 100644
--- a/src/views/old/store/getWxQRCode.vue
+++ b/src/views/old/store/getWxQRCode.vue
@@ -97,13 +97,7 @@
if (this.timer) {
clearInterval(this.timer);
}
- QRCode.toDataURL(
- url,
- {
- margin: 1,
- width: 400
- },
- (err, url) => {
+ QRCode.toDataURL(url,{ margin: 1, width: 400}, (err, url) => {
this.qrCode = url;
this.orderSts();
}
diff --git a/src/views/old/store/productManagement.vue b/src/views/old/store/productManagement.vue
index cd3a919..3e2c3fe 100644
--- a/src/views/old/store/productManagement.vue
+++ b/src/views/old/store/productManagement.vue
@@ -40,9 +40,6 @@
},
computed:{
...mapState(['userinfo']),
-
-
-
},
methods: {
goBackPage() {
@@ -233,7 +230,6 @@
init() {
this.$api.storeProdList({
}).then(res => {
- // console.log(res.body)
// this.prodTypeList=[]
this.mgrIsOpen = res.body.mgrIsOpen;
this.orgType = res.body.orgType;
diff --git a/src/views/old/store/wx-pay-score.vue b/src/views/old/store/wx-pay-score.vue
index 33e1e1a..5dff363 100644
--- a/src/views/old/store/wx-pay-score.vue
+++ b/src/views/old/store/wx-pay-score.vue
@@ -7,15 +7,11 @@
<template>
<div class="hb-credit-installment h-100-g">
- <!-- <x-header title="办理分期" :left-options="{backText:''}"></x-header> -->
- <!-- <tab :line-width=1 active-color='#bfa073'>
- <tab-item v-for="(item, index) in tabList" :key="index" :selected="activeTab === index"
- @on-item-click="handleTabChange(index)">{{ item }}</tab-item>
- </tab> -->
<van-nav-bar
title="和微分"
left-text="返回"
left-arrow
+ fixed
@click-left="onClickLeft"
style="line-height: 43px;"
>
@@ -27,7 +23,7 @@
</van-nav-bar>
<div class="search">
<selector
- title="活动编码"
+ :title="hnOrnxtype==410000?'活动编码':'活动名称'"
placeholder="请选择"
@on-change="handleContIdChange"
v-model="contSendCode"
@@ -115,8 +111,7 @@
type="warning"
size="small"
@click="mblVertify"
- >可用查询</van-button
- >
+ >可用查询</van-button>
</van-field>
</div>
</group>
@@ -138,13 +133,13 @@
import QRCode from 'qrcode';
import FConfirmSimple from '@/components/old/FConfirmSimple.vue';
import Vdialog from '@/components/common/v-dialog.vue';
-import { mapState, mapActions } from 'vuex';
+import { mapState } from 'vuex';
import { Datetime, XAddress } from 'vux';
export default {
name: 'wx-pay-score',
- components: {
- FConfirmSimple,
- Vdialog,
+ components: {FConfirmSimple,Vdialog},
+ computed:{
+ ...mapState(['hnOrnxtype']),
},
data() {
return {
@@ -187,18 +182,29 @@
isClick:false
};
},
- computed: {},
+
created() {
- this.contType = this.$route.query.code;
- this.mblNoType = this.$route.query.mblNoType;
- this.$api.wxScoreInit2({ type: this.contType }).then(
- (res) => {
- this.form = res.body || {};
- var arr = res.body.terms;
- },
- (err) => err
+ let apiText ='';
+ let sendData ={};
+ if(this.hnOrnxtype == 410000){
+ // 河南移动
+ this.contType = this.$route.query.code;
+ this.mblNoType = this.$route.query.mblNoType;
+ apiText ='wxScoreInit2';
+ sendData ={type: this.contType}
+ }else{
+ // 宁夏移动
+ apiText ='nxInit';
+ sendData= {};
+ }
+ this.$api[apiText](sendData).then(
+ (res) => {
+ console.log(res);
+ this.form = res.body || {};
+ // var arr = res.body.terms;
+ },
+ (err) => err
);
-
},
methods: {
//顶部tabbar返回按钮
@@ -207,9 +213,7 @@
},
// 套餐类型
handleContIdChange(val) {
- let currentEle = JSON.parse(
- JSON.stringify(this.form.cmccWxpayContList)
- ).find((item) => item.contCode === val);
+ let currentEle = JSON.parse( JSON.stringify(this.form.cmccWxpayContList) ).find((item) => item.contCode === val);
this.contId = currentEle.contId;
this.contSendCode = currentEle.contCode;
this.contName = currentEle.contName;
@@ -256,16 +260,19 @@
v.toast('请输入正确的用户手机号');
return false;
}
- this.$api
- .wxScoreVertify({
+ let httpText = '';
+ if(this.hnOrnxtype == 410000){
+ httpText ='wxScoreVertify';
+ }else{
+ httpText ='nxVerifyMblNo';
+ }
+ this.$api[httpText]({
cardNo: this.idCardNo,
contCode: this.contSendCode,
mblNo: this.mblNo,
mblNoType: this.mblNoType,
regionCode: this.regionCode,
- })
- .then(
- (res) => {
+ }).then( (res) => {
this.isClick =true;
this.creditId = res.body.creditId;
this.vertifyStatus = res.body.status;
@@ -320,13 +327,17 @@
return false;
}
}
- // console.log('ces', this.vertifyStatus + '你');
if (this.vertifyStatus == 0) {
v.toast('号码不可用');
return false;
}
- this.$api
- .wxScoreCreate({
+ let httpText = '';
+ if(this.hnOrnxtype == 410000){
+ httpText ='wxScoreCreate';
+ }else{
+ httpText ='nxCreate';
+ }
+ this.$api[httpText]({
contType: this.contType,
creditId: this.creditId,
contId: this.contId,
@@ -451,8 +462,9 @@
.hb-credit-installment {
background-color: #f5f5f7;
- // padding-top: 54px;
+ padding:50px 0;
min-height: 100%;
+ box-sizing: border-box;
.title {
padding: 14px 0px 14px 12px;
font-size: 16px;
@@ -493,7 +505,6 @@
}
}
.btn-box {
- margin-top: 40px;
margin-bottom: 22px;
display: flex;
justify-content: space-around;
@@ -509,3 +520,11 @@
}
}
</style>
+<style lang="less">
+.van-nav-bar{
+ z-index: 10;
+}
+.weui-select{
+ font-size: 14px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/order/wxScore.vue b/src/views/order/wxScore.vue
index d99fd37..b4ff107 100644
--- a/src/views/order/wxScore.vue
+++ b/src/views/order/wxScore.vue
@@ -102,7 +102,6 @@
},
// 获取订单列表
init(params = this.filter,isClear) {
- console.log("111");
this.loading = true;
this.$api.wxScoreList(params).then(res => {
this.filter = {...params};
diff --git a/src/views/product/wxScore-detail.vue b/src/views/product/wxScore-detail.vue
index 09c01ad..8c598b9 100644
--- a/src/views/product/wxScore-detail.vue
+++ b/src/views/product/wxScore-detail.vue
@@ -7,7 +7,7 @@
-->
<template>
<div class="hb-detail-box h-100-g">
- <v-navbar title="订单详情" fixed></v-navbar>
+ <v-navbar title="订单详情1" fixed></v-navbar>
<div class="content">
<div class="cell-group">
<van-cell :value="form.chanNo" title='渠道编码' readonly></van-cell>
@@ -27,7 +27,6 @@
<van-cell :value="form.mblNo" title='手机号码' readonly></van-cell>
<van-cell :value="form.merName" title='商户名称' readonly></van-cell>
</div>
-
<!-- <div class="cell-group">
<van-cell :value="form.rate + '%'" title='费率' readonly></van-cell>
</div> -->
@@ -42,9 +41,6 @@
</template>
<script>
- import {
- mapState
- } from 'vuex';
import Vue from 'vue';
import { Notify } from 'vant';
@@ -80,10 +76,8 @@
this.$tool.toast('返销完成');
}, err => err);
}).catch(() => {
- // on cancel
+
});
- // this
-
},
//订单推送
sendOrder() {
diff --git a/src/views/template/detail.vue b/src/views/template/detail.vue
index 62984b8..d654496 100644
--- a/src/views/template/detail.vue
+++ b/src/views/template/detail.vue
@@ -409,14 +409,12 @@
//按下标打钩，并且存储选中项，取消打钩的去掉存储项
if(this.areaArr[index].selected == 0){
this.areaArr[index].selected = 1
- console.log(this.info,this.areaArr[index])
this.info.tempRules.push(this.areaArr[index])
}else{
this.areaArr[index].selected = 0
let num = this.info.tempRules.findIndex(item=>{
return item.code == this.areaArr[index].code
})
- console.log('num:',num)
this.info.tempRules.splice(num,1)
}
// 有一个未打钩，取消全选，全部勾选则选中全选
@@ -428,7 +426,6 @@
}else{
this.allpr = true
}
- console.log(this.info)
},
// 选择渠道
choseChan(index){
@@ -441,7 +438,6 @@
let num = this.info.tempRules.findIndex(item => {
return item.code == this.chanArr[index].code
})
- console.log('num:',num)
this.info.tempRules.splice(num,1)
}
// 有一个未打钩，取消全选，全部勾选则选中全选
@@ -453,8 +449,6 @@
}else{
this.allchan = true
}
- console.log(this.info)
- console.log('this.chanArr:',this.chanArr)
},
// 详情弹出层
showDet(){
@@ -474,7 +468,6 @@
})
this.info.tempRules = []
}
- console.log(this.info)
},
// 模板省份全选
getAllpr(){
@@ -490,7 +483,6 @@
})
this.info.tempRules = []
}
- console.log(this.info)
},
// 控制模板选择弹出层
nextStep(item,index){
@@ -516,7 +508,6 @@
}
})
}
- console.log(this.info)
},
// 打开 模板弹窗
openTempModal() {
@@ -747,7 +738,6 @@
return
}
if ((issItem.amt === null || issItem.amt === '') && issItem.status) {
- console.log('000')
this.$notify(`请输入花呗间联${issItem.term}期商户固定收益！`)
return
}
diff --git a/src/views/template/distribute.vue b/src/views/template/distribute.vue
index d11050c..5d15cd0 100644
--- a/src/views/template/distribute.vue
+++ b/src/views/template/distribute.vue
@@ -208,7 +208,6 @@
let list = res.body || [];
this.parseArea(list)
this.areaList = calcAreaTwo(this.Area)
- //console.log(this.areaList)
});
},
// 全选 取消
diff --git a/src/views/template/list.vue b/src/views/template/list.vue
index 5ed8237..ff45e78 100644
--- a/src/views/template/list.vue
+++ b/src/views/template/list.vue
@@ -69,7 +69,6 @@
})
},
saleOrderLoad(){
- console.log(5656)
this.finished = true
},
init(){
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index a2a433e..0d48e3a 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -112,7 +112,6 @@
},
},
created() {
- console.log(this.$route.query.platNo)
sessionStorage.clear();
if (this.$route.query.sysPlat !== undefined) {
localStorage.sib_mer_sysPlat = this.$route.query.sysPlat // 1 微信 2支付宝
diff --git a/src/views/user/loginByWx.vue b/src/views/user/loginByWx.vue
index cec62ab..b2ffca5 100644
--- a/src/views/user/loginByWx.vue
+++ b/src/views/user/loginByWx.vue
@@ -73,7 +73,6 @@
}
clearTimeout(this.timer);
this.urlCode = this.getUrlCode("code");
- console.log(this.urlCode);
this.init();
},
methods: {
@@ -84,7 +83,6 @@
* **/
init() {
this.openId = localStorage.sib_wx_openId;
- console.log(this.openId)
this.showContent = false;
// 模拟数据本地调试
// this.openId = "oJbj21YwUatdNaYf3iEPwwGtWuUg";
@@ -93,7 +91,6 @@
(!this.openId && !this.urlCode) ||
(typeof this.openId == "undefined" && !this.urlCode)
) {
- console.log(111);
let url = location.host;
// url = "t.finlean.com";
var str = encodeURIComponent(`https://${url}/sib_wx_scorei/#/loginByWx`);
diff --git a/src/views/user/register-home.vue b/src/views/user/register-home.vue
index f10cfe2..a4de621 100644
--- a/src/views/user/register-home.vue
+++ b/src/views/user/register-home.vue
@@ -26,8 +26,7 @@
<van-field v-model.trim="form.licenseNo" clearable maxlength='20' placeholder="请输入营业执照号" />
<van-field v-model.trim="form.legalName" clearable maxlength='12' placeholder="请输入法人姓名" />
<van-field v-model.trim="form.legalIdNo" clearable maxlength='18' placeholder="请输入法人身份证号" />
- <van-field v-model.trim="form.addrText" clearable :readonly="true" right-icon="arrow"
- @click="isShowArea = !isShowArea" placeholder="请选择省市区" />
+ <van-field v-model.trim="form.addrText" clearable :readonly="true" right-icon="arrow" @click="isShowArea = !isShowArea" placeholder="请选择省市区" />
<van-field v-model.trim="form.dtlAddr" clearable maxlength='64' placeholder="请输入您的详细地址" />
<!-- 扫码进入页面的没有邀请码 -->
<van-button :color="$store.state.backColor" class="btn" @click="nextStep">下一步</van-button>
@@ -35,12 +34,6 @@
placeholder="邀请码">
</van-cell> -->
</div>
-
-
-
-
-
-
<!-- 步骤二 -->
@@ -76,14 +69,6 @@
<van-button :color="$store.state.backColor" class="btn" @click="nextStep">{{ saveText }}</van-button>
</div>
-
-
-
-
-
-
-
-
</div>
<van-popup v-model="ShowAgreen">
@@ -225,10 +210,7 @@
message: "请输入正确的联系人邮箱",
type: "isEmail"
},
- ],
-
-
-
+ ]
}
},
computed: {
@@ -238,7 +220,6 @@
}
},
created() {
- console.log(localStorage.sib_mer_sysPlat == 'undefined')
if(this.$route.query.orgId){
this.form.orgId = this.$route.query.orgId || '';
this.form.orgType = this.$route.query.orgType || '';
@@ -276,8 +257,6 @@
this.isShowArea = false;
this.$refs.Area.reset()
},
-
-
//保存 地区选择
setAreaValue(arr) {
this.form.addrText = arr[0].name + '-' + arr[1].name + '-' + arr[2].name;
@@ -298,9 +277,6 @@
this.isShowArea = false;
this.$refs.Area.reset()
},
-
-
-
nextStep() {
/**
@@ -315,8 +291,6 @@
// }
// }
}
-
-
/**
* 第二步
* */
@@ -341,7 +315,6 @@
sysPlat = 2
}
this.form.sysPlat = sysPlat
- console.log(this.form);
this.$api.merRegist(this.form).then(res => {
this.$toast.success(`注册成功,请耐心等待审核！`);
if(sessionStorage.isddxt == 1){
@@ -362,7 +335,6 @@
//代理所属渠道
getRegIDAndType() {
let _this = this;
- console.log('js 调用原生android 方法=====》');
window.sessionStorage.removeItem('scene_regInfos');
if (window.android && window.android.fetchQrCode) {
_this.SET_APP_LOADING(true);
@@ -437,7 +409,6 @@
},
function (error) {
if (error.response) {
- console.log(error.response);
}
}
);
diff --git a/webpack.common.js b/webpack.common.js
index 6105d23..f3c54a1 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -13,7 +13,6 @@
const CopyPlugin = require('copy-webpack-plugin');
const vuxLoader = require('vux-loader');
let env = process.env.NODE_ENV;
-
//打包地址
let srcUrl = '/sib_wx_scorei/'
module.exports = {
--
Gitblit v1.8.0