chuangte/easypay-app-wx
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Sliverber 2024-02-27 09:59:51 +08:00
commit a4a29feecb
13 changed files with 154 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/api.js
View File

@ -359,6 +359,7 @@ export function getinstallment(data) {
}); });
} }
// 到首页查询ip地址
// 首页记录ip // 首页记录ip
export function logoip() { export function logoip() {
@ -367,3 +368,10 @@ export function logoip() {
}); });
} }
// 查询签约是否成功
// export function getqytrue(data) {
// return request.get('order/getSignResult/',data,{
// noAuth: true
// })
// }

1
api/public.js
View File

@ -23,6 +23,7 @@ export function wechatAuth(code, spread,) {
var reg=/^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 ，判断正整数用/^[1-9]+[0-9]*]*$/ var reg=/^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 ，判断正整数用/^[1-9]+[0-9]*]*$/
spread = reg.test(spread) ? spread : 0; spread = reg.test(spread) ? spread : 0;
channelId = reg.test(channelId) ? channelId : 0;
return request.get( return request.get(
"wechat/authorize/login?code=" + code + "&spread_spid=" + spread , {}, "wechat/authorize/login?code=" + code + "&spread_spid=" + spread , {},
{ noAuth: true } { noAuth: true }

2
api/user.js
View File

@ -400,7 +400,7 @@ export function sendwxcodes(code)
// return request.post('user/wxcode', data); // return request.post('user/wxcode', data);
// } // }
/** /**
// * 静默绑定推广人 // * 静默绑定渠道
// * @param {Object} channelId // * @param {Object} channelId
// */ // */
export function channel(channelId) export function channel(channelId)

10
components/productWindow/index.vue
View File

@ -450,12 +450,18 @@
.periodization .returnthedate a { .periodization .returnthedate a {
text-decoration: none; text-decoration: none;
display: block; // display: block;
margin-top: 20rpx; margin-top: 20rpx;
border: 1px solid rgb(255, 87, 51); border: 1px solid rgb(255, 87, 51);
color: #000; color: #000;
// width: 100% !important;
padding: 0 20rpx;
padding-right: 40rpx;
box-sizing: border-box;
}
.returnthedate{
width: 100% !important;
} }
.periodization .returnthedate a:nth-of-type(1) { .periodization .returnthedate a:nth-of-type(1) {
width: 198rpx; width: 198rpx;
height: 60rpx; height: 60rpx;

2
config/cache.js
View File

@ -26,8 +26,8 @@ module.exports = {
TIPS_KEY: 'TIPS_KEY', TIPS_KEY: 'TIPS_KEY',
SPREAD: 'SPREAD', SPREAD: 'SPREAD',
CHANNELID: 'CHANNELID',
//缓存经度 //缓存经度
CACHE_LONGITUDE: 'LONGITUDE', CACHE_LONGITUDE: 'LONGITUDE',
//缓存纬度 //缓存纬度

2
libs/wechat.js
View File

@ -217,7 +217,7 @@ class AuthWechat {
*/ */
auth(code) { auth(code) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
wechatAuth(code, Cache.get('spread')) wechatAuth(code, Cache.get('spread'),Cache.get('channelId'))
.then(({ .then(({
data data
}) => { }) => {

12
main.js
View File

@ -29,13 +29,13 @@ import {
} from "./utils"; } from "./utils";
import Auth from './libs/wechat'; import Auth from './libs/wechat';
import { import {
SPREAD SPREAD,CHANNELID
} from './config/cache'; } from './config/cache';
Vue.prototype.$wechat = Auth; Vue.prototype.$wechat = Auth;
let cookieName = "VCONSOLE", let cookieName = "VCONSOLE",
query = parseQuery(), query = parseQuery(),
urlSpread = query["spread"], urlSpread = query["spread"],
urlChannelId = query["channelId"],
vconsole = query[cookieName.toLowerCase()], vconsole = query[cookieName.toLowerCase()],
md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式 md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式 md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
@ -46,7 +46,13 @@ let cookieName = "VCONSOLE",
value: urlSpread, value: urlSpread,
}) })
} }
if (urlChannelId) {
urlChannelId = parseInt(urlChannelId);
Cache.setItem({
name: 'channelId',
value: urlChannelId,
})
}
if (vconsole !== undefined) { if (vconsole !== undefined) {
if (vconsole === md5UnCrmeb && Cache.has(cookieName)) if (vconsole === md5UnCrmeb && Cache.has(cookieName))
Cache.clear(cookieName); Cache.clear(cookieName);

5
manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "先享后付", "name" : "先享后付",
"appid" : "__UNI__EA8F22D", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B "appid" : "__UNI__E7B7107", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B
"description" : "crmeb商城", "description" : "crmeb商城",
"versionName" : "2.1", "versionName" : "2.1",
"versionCode" : 2, "versionCode" : 2,
@ -219,8 +219,7 @@
"async" : { "async" : {
"timeout" : 200000 "timeout" : 200000
}, },
"title" : "先享后付", "title" : "先享后付"
"template" : "template.html"
}, },
"plus" : { "plus" : {
"statusbar" : { "statusbar" : {

19
pages/goods_details/index.vue
View File

@ -200,10 +200,10 @@
</button> </button>
<!-- #endif --> <!-- #endif -->
<!-- #ifndef MP --> <!-- #ifndef MP -->
<!-- <view class="item skeleton-rect" @click="onClickService"> <view class="item skeleton-rect" @click="onClickService">
<view class="iconfont icon-kefu"></view> <view class="iconfont icon-kefu"></view>
<view>客服</view> <view>客服</view>
</view> --> </view>
<!-- #endif --> <!-- #endif -->
<block v-if="type === 'normal'"> <block v-if="type === 'normal'">
<view @click="setCollect" class='item skeleton-rect'> <view @click="setCollect" class='item skeleton-rect'>
@ -368,8 +368,7 @@
import shareRedPackets from '@/components/shareRedPackets'; import shareRedPackets from '@/components/shareRedPackets';
import cusPreviewImg from '@/components/cus-previewImg/cus-previewImg.vue' import cusPreviewImg from '@/components/cus-previewImg/cus-previewImg.vue'
import { import {
silenceBindingSpread, silenceBindingSpread,silenceBindingChannelId
} from "@/utils"; } from "@/utils";
import parser from "@/components/jyf-parser/jyf-parser"; import parser from "@/components/jyf-parser/jyf-parser";
import { import {
@ -551,6 +550,8 @@
this.getTokenIsExist(); this.getTokenIsExist();
}, },
onLoad(options) { onLoad(options) {
// console.log(JSON.stringify(options),"options.spread")
alert("options.spread"+JSON.stringify(options))
//用户从分享卡片进入的场景下获取主题色配置 //用户从分享卡片进入的场景下获取主题色配置
this.$set(this, 'theme', this.$Cache.get('theme')); this.$set(this, 'theme', this.$Cache.get('theme'));
@ -608,7 +609,7 @@
// #endif // #endif
if (options.spread) app.globalData.spread = options.spread; if (options.spread) app.globalData.spread = options.spread;
if (options.channelId) app.globalData.channelId = options.channelId;
this.getGoodsDetails(); //商品详情 this.getGoodsDetails(); //商品详情
this.getCouponType(); //获取默认的 优惠券类型 this.getCouponType(); //获取默认的 优惠券类型
@ -647,8 +648,6 @@
title: that.productInfo.storeName || '', title: that.productInfo.storeName || '',
imageUrl: that.productInfo.image || '', imageUrl: that.productInfo.image || '',
path: '/pages/goods_details/index?id=' + that.id + '&spread=' + that.uid, path: '/pages/goods_details/index?id=' + that.id + '&spread=' + that.uid,
} }
}, },
// #endif // #endif
@ -687,7 +686,7 @@
this.getCartCount(true); //购物车数量 this.getCartCount(true); //购物车数量
//绑定关系 //绑定关系
if (parseInt(app.globalData.spread) > 0) silenceBindingSpread(); if (parseInt(app.globalData.spread) > 0) silenceBindingSpread();
if (parseInt(app.globalData.channelId) > 0) silenceBindingChannelId();
} }
}); });
}, },
@ -701,8 +700,6 @@
scene: scene, scene: scene,
type: 0, type: 0,
href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}`, href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}`,
title: that.productInfo.storeName, title: that.productInfo.storeName,
summary: app.globalData.companyName, summary: app.globalData.companyName,
imageUrl: that.productInfo.image, imageUrl: that.productInfo.image,
@ -1431,7 +1428,6 @@
} }
}) })
}, },
getImageBase64: function(images) { getImageBase64: function(images) {
let that = this; let that = this;
imageBase64({ imageBase64({
@ -1585,7 +1581,6 @@
let href = location.href; let href = location.href;
if (this.$wechat.isWeixin()) { if (this.$wechat.isWeixin()) {
href = href.indexOf("?") === -1 ? href + "?spread=" + this.uid : href + "&spread=" + this.uid; href = href.indexOf("?") === -1 ? href + "?spread=" + this.uid : href + "&spread=" + this.uid;
let configAppMessage = { let configAppMessage = {
desc: app.globalData.companyName, desc: app.globalData.companyName,
title: data.storeName, title: data.storeName,

28
pages/index/index.vue
View File

@ -170,6 +170,7 @@
setCouponReceive, setCouponReceive,
getTheme, getTheme,
getAppVersion, getAppVersion,
getip
} from '@/api/api.js'; } from '@/api/api.js';
import { import {
spread, spread,
@ -213,7 +214,7 @@
getGroomList getGroomList
} from '@/api/store.js'; } from '@/api/store.js';
import { import {
silenceBindingSpread, silenceBindingSpread,silenceBindingChannelId,
getCityList getCityList
} from '@/utils'; } from '@/utils';
import animationType from '@/utils/animationType.js' import animationType from '@/utils/animationType.js'
@ -446,11 +447,10 @@
let qrCodeValue = this.$util.getUrlParams(decodeURIComponent(options.scene)); let qrCodeValue = this.$util.getUrlParams(decodeURIComponent(options.scene));
let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue); let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue);
app.globalData.spread = mapeMpQrCodeValue.spread; app.globalData.spread = mapeMpQrCodeValue.spread;
app.globalData.channelId = mapeMpQrCodeValue.channelId;
} }
if (options.spread) app.globalData.spread = options.spread; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中 if (options.spread) app.globalData.spread = options.spread; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中
if (options.channelId) app.globalData.channelId = options.channelId; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中
// #endif // #endif
// #ifndef MP || APP-PLUS // #ifndef MP || APP-PLUS
this.navH = 0; this.navH = 0;
@ -462,10 +462,12 @@
if (this.isLogin && parseInt(app.globalData.spread) > 0) { if (this.isLogin && parseInt(app.globalData.spread) > 0) {
silenceBindingSpread() silenceBindingSpread()
} }
if (this.isLogin && parseInt(app.globalData.channelId) > 0) {
silenceBindingChannelId()
// 调用记录ip }
// this.getip() if (this.isLogin && parseInt(options.channelId) > 0) {
silenceBindingChannelId()
}
}, },
onShow() { onShow() {
let currentUrl = window.location.href; let currentUrl = window.location.href;
@ -513,14 +515,14 @@
// this.getip() // this.getip()
}, },
methods: { methods: {
// 获取IP地址
// 首页记录ip getipdz(){
getip(){ getip().then(res => {
logoip().then(res => { console.log(res,111)
}) })
}, },
menusTap(url) { menusTap(url) {
goPage().then(res => { goPage().then(res => {
if (url == '/pages/goods_cate/goods_cate') { if (url == '/pages/goods_cate/goods_cate') {

3
pages/user/index.vue
View File

@ -386,8 +386,7 @@
uid: this.$store.getters.uid uid: this.$store.getters.uid
} }
getidentity(data).then(res=>{ getidentity(data).then(res=>{
// console.log(res.data) if (res.message == '操作成功' && res.data != '') {
if (res.message == '操作成功') {
this.realname = '已实名' this.realname = '已实名'
this.identification = res.data this.identification = res.data
} }

8
pages/users/wechat_login/index.vue
View File

@ -145,8 +145,9 @@
if (code && this.options.scope !== 'snsapi_base') { if (code && this.options.scope !== 'snsapi_base') {
let spread = app.globalData.spread ? app.globalData.spread : 0; let spread = app.globalData.spread ? app.globalData.spread : 0;
let channelId = app.globalData.channelId ? app.globalData.channelId : 0;
//公众号授权登录回调 wechatAuth(code, Cache.get("spread"), loginType) //公众号授权登录回调 wechatAuth(code, Cache.get("spread"), loginType)
wechat.auth(code, spread).then(res => { wechat.auth(code, spread,channelId).then(res => {
if (res.type === 'register') { if (res.type === 'register') {
this.authKey = res.key; this.authKey = res.key;
this.isUp = true this.isUp = true
@ -251,6 +252,7 @@
let userInfo = {}; let userInfo = {};
userInfo.code = code; userInfo.code = code;
userInfo.spread_spid = app.globalData.spread; //获取推广人ID userInfo.spread_spid = app.globalData.spread; //获取推广人ID
userInfo.channelId = app.globalData.channelId; //渠道ID
userInfo.avatar = ''; userInfo.avatar = '';
userInfo.nickName = '微信用户'; userInfo.nickName = '微信用户';
userInfo.type = 'routine' userInfo.type = 'routine'
@ -266,6 +268,7 @@
let userInfo = res.userInfo; let userInfo = res.userInfo;
userInfo.code = code; userInfo.code = code;
userInfo.spread_spid = app.globalData.spread; //获取推广人ID userInfo.spread_spid = app.globalData.spread; //获取推广人ID
userInfo.channelId = app.globalData.channelId; //渠道ID
userInfo.avatar = userInfo.userInfo.avatarUrl; userInfo.avatar = userInfo.userInfo.avatarUrl;
userInfo.city = userInfo.userInfo.city; userInfo.city = userInfo.userInfo.city;
userInfo.country = userInfo.userInfo.country; userInfo.country = userInfo.userInfo.country;
@ -305,6 +308,9 @@
if (app.globalData.spread) { if (app.globalData.spread) {
spread(app.globalData.spread).then(res => {}) //登录成功后读取spread绑定分销关系 spread(app.globalData.spread).then(res => {}) //登录成功后读取spread绑定分销关系
} }
if (app.globalData.channelId) {
channelId(app.globalData.channelId).then(res => {}) //登录成功后读取渠道绑定关系
}
self.$util.Tips({ self.$util.Tips({
title: res, title: res,
icon: 'success' icon: 'success'

33
utils/index.js
View File

@ -1,6 +1,6 @@
import { spread } from "@/api/user"; import { spread,channel } from "@/api/user";
import Cache from "@/utils/cache"; import Cache from "@/utils/cache";
import { getCity } from '@/api/api.js'; import { getCity } from '@/api/api.js';
@ -35,6 +35,37 @@ export function silenceBindingSpread() {
} }
} }
/**
* 静默授权绑定渠道，使用在已经登录后扫描了别人的推广二维码
* @param {Object} puid
*/
export function silenceBindingChannelId() {
//#ifdef H5
let puid = Cache.get('channelId');
//#endif
//#ifdef MP || APP-PLUS
let puid = getApp().globalData.channelId;
//#endif
puid = parseInt(puid);
if (Number.isNaN(puid)) {
puid = 0;
}
if (puid) {
channel(puid).then(res => {}).catch(res => {
//#ifdef H5
Cache.clear("channelId");
//#endif
//#ifdef MP || APP-PLUS
getApp().globalData.channelId = 0;
//#endif
});
} else {
Cache.set('channelId', 0);
}
}
export function isWeixin() { export function isWeixin() {
return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1; return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
} }