Skip to content

Y
ybf
Commit 0399b05a authored by xd's avatar xd
Browse files
Options

解决冲突

parents 512b44fc b886a06a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 436 additions and 491 deletions
ybf_admin/.eslintignore
View file @ 0399b05a
......@@ -2,6 +2,7 @@
build/
tests/
node_modules/
node_modules
# D2CRUD 演示
src/views/demo/d2-crud/
......
ybf_wx/public/index.html
View file @ 0399b05a
......@@ -3,8 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="viewport" content="width=device-width,initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>亿百分</title>
<script type="text/javascript" src="js/jquery-3.4.1.min.js"></script>
......
ybf_wx/public/register/index.html 0 → 100644
View file @ 0399b05a
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>会员拉新</title>
<script src="../js/jquery-3.4.1.min.js"></script>
<style>
html,body{
width: 100%;
height: 100%;
margin: 0;
padding: 0;
font-size: 16px;
color: #ffffff;
}
.register_container{
height: 100%;
background-color: rgba(15, 106, 184, 0.99);
margin: 0;
padding: 2.5rem 2rem;
box-sizing: border-box;
text-align: center;
}
.register_titles .title{
font-size: 3rem;
line-height: 5rem;
}
.register_qrcode #image{
display: inline-block;
width: 60%;
height: auto;
margin: 3rem 0;
}
.register_qrcode .qrcodeTip{
font-size: 2rem;
}
</style>
</head>
<body>
<div class="register_container">
<div class="register_titles">
<div class="title">扫码注册成为会员</div>
</div>
<div class="register_qrcode">
<img class="qrcode" id="image" src="" alt />
<div class="qrcodeTip">长按识别二维码</div>
</div>
</div>
<script>
$(function () {
showQRInfo()
});
const showQRInfo = () => {
// let pageUri = `${nowUrl}&detailid=${voucherId}&actionid=${activeId}&unionid=${unionId}`;
let storecode = "181"
let pageUri = `pages/user/register/register?storeCode=
${storecode}`;
let pageUrl = `http://139.155.48.151:8085/workWx/auth/oauth2/wxMiniQrCode?pageUri=${pageUri}`;
$.ajax({
type: "POST",
url: pageUrl,
data: {},
success: function (res) {
$('#image').attr('src', res.data)
},
error: function (data) {
}
});
}
</script>
</body>
</html>
ybf_wx/src/router/index.js
View file @ 0399b05a
......@@ -42,6 +42,11 @@ const routes = [
name: 'Discount',
component: () => import('@/views/sideNav/discount/index')
},
{
path: '/invite',
name: 'register',
component: () => import('@/views/sideNav/register/index')
},
{
path: '/mainSale',
name: 'MainSale',
......
ybf_wx/src/utils/aCommon.js
View file @ 0399b05a
......@@ -28,10 +28,10 @@ async function getXToken() {
} else {
console.log('%c--->getXToken: N/A. ', 'background: red;')
this.$message({
message: res.errorMsg,
type: 'error'
})
// this.$message({
// message: res.errorMsg,
// type: 'error'
// })
}
}).catch(err => {
console.log('!==>getXToken: err:', err)
......@@ -100,7 +100,7 @@ Vue.prototype.getAgentAuth = function () {
// JS-SDK配置信息验证失败时会进入此方法
wx.error(function (res) {
alert("JS-SDK配置信息验证失败 \r\n" + JSON.stringify(res));
// alert("JS-SDK配置信息验证失败 \r\n" + JSON.stringify(res));
})
// 配置成功后验证API接口在当前客户端是否支持：判断当前客户端版本是否支持指定JS接口
......@@ -108,11 +108,8 @@ Vue.prototype.getAgentAuth = function () {
{
jsApiList: ['agentConfig', 'sendChatMessage'],
success: function (res) {
// alert(`--->zCommon.js: getJsSdkSignature: then: wx.ready: wx.checkJsApi: success.`)
// alert(`--->zCommon.js: getJsSdkSignature: then: wx.ready: wx.checkJsApi: success. res =${JSON.stringify(res)}`)
if (res.errMsg != "checkJsApi:ok") {
alert("JS-SDK接口检测失败:" + JSON.stringify(res));
// alert("JS-SDK接口检测失败:" + JSON.stringify(res));
return false;
} else {
wxRequest('/workWx/auth/base/getAgentJsSdkSignature', qs.stringify(postData), header)
......@@ -160,10 +157,10 @@ Vue.prototype.getAgentAuth = function () {
)
})
} else {
this.$message({
type: 'error',
message: res.errorMsg
})
// this.$message({
// type: 'error',
// message: res.errorMsg
// })
}
})
.catch(err => {
......@@ -192,7 +189,7 @@ function configWx(to) {
debug: false, //调试的时候可以开启
appId: config.jsApiSignature.appId, // 必填，公众号的唯一标识
timestamp: config.jsApiSignature.timestamp, // 必填，生成签名的时间戳
nonceStr: config.jsApiSignature.nonceStr, // 必填，生成签名的随机串
nonceStr: config.jsApiSignature.nonceStr, // 必填，生成签名的随机串
signature: config.jsApiSignature.signature, // 必填，签名
// 根据自己的需求，填写 jsapilist 内容
jsApiList: ['agentConfig', 'getCurExternalContact']
......@@ -210,7 +207,7 @@ function configWx(to) {
// router.push(to)
if (res.errMsg != "checkJsApi:ok") {
alert("JS-SDK接口检测失败:" + JSON.stringify(res));
// alert("JS-SDK接口检测失败:" + JSON.stringify(res));
return false;
}
}
......@@ -236,7 +233,7 @@ function configWx(to) {
signature: agentConfig.agentJsApiSignature.signature,// 必填，签名，agentConfig所以为应用签名
jsApiList: ['getCurExternalContact'], //必填
success: function (res) {
// alert('agentConfig:ok')
// alert('agentConfig:ok')
// alert(`--->configWx/getJsSdkSignature/getAgentJsSdkSignature: then: agentConfig: res =${res}`)
// alert(`--->configWx/getJsSdkSignature/getAgentJsSdkSignature: then: agentConfig: to =${JSON.stringify(to)}`)
sessionStorage.setItem('zConfigWx', 'Pass')
......@@ -265,10 +262,10 @@ function configWx(to) {
})
})
} else {
this.$message({
type: 'error',
message: res.errorMsg
})
// this.$message({
// type: 'error',
// message: res.errorMsg
// })
}
}).catch(err => {
console.log(err, 'err')
......
ybf_wx/src/views/home.vue
View file @ 0399b05a
This diff is collapsed.
ybf_wx/src/views/sideNav/discount/index.vue
View file @ 0399b05a
<template>
<div class="main">
<!-- <div class="tops"></div> -->
<div class="contents">
<!-- <div style="font-size: 12px;">userId={{zcache.userId}}</div> -->
<!-- <div style="font-size: 12px;">storeId={{zcache.userInfo}}</div> -->
<div class="zListActive">
<div class="inputs">
<!-- <div class="button" @click="zTest">Redirect</div>
<div class="button" @click="zReadyDelVoucherList">Clear</div>-->
<div class="button" @click="zReadySetVoucherList">ReLoad</div>
</div>
<!-- <div class="lists">
<div
class="item"
v-for="item in zlist.voucher"
:key="item.coupon_id"
@click="zVoucherPick(item.action_id, item.coupon_id)"
>
<div>优惠券ID: {{ item.coupon_id }}</div>
<div>活动ID: {{ item.action_id }}</div>
<div>活动标题: {{ item.coupon_title }}</div>
<div>活动列表: {{ item.coupon_link }}</div>
</div>
</div>-->
<!-- <div class="lists">
<div v-if="zlist.voucherUrl !== ''" class="voucherUrl">
<div @click="zpick">小程序Url: {{ zlist.voucherUrl }}</div>
</div>
</div>-->
</div>
<!--@click="zVoucherPick(item.action_id, item.coupon_id)"-->
<div
v-for="item of zlist.voucher"
:key="item.coupon_id"
>
<div v-for="item of zlist.voucher" :key="item.coupon_id" >
<div class="content">
<div class="content-imgs">
<img class="imgs-img" :src="zcache.defaultImgUrl" alt />
......@@ -56,38 +28,7 @@
</div>
</div>
</div>
<!--<div class="zListActive">-->
<!-- <div class="lists">-->
<!-- <div v-if="zlist.voucherUrl !== ''" class="voucherUrl" @click="zpick('h5', String(zlist.voucherUrl))">-->
<!-- &lt;!&ndash; <div @click="zpick">小程序Url:{{ String(zlist.voucherUrl).slice(-2) }}</div> &ndash;&gt;-->
<!-- <div>小程序Url:{{ String(zlist.voucherUrl).slice(-2) }}</div>-->
<!-- <div>{{ zlist.voucherUrl }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
<!--<div class="zListActive">-->
<!-- <div class="lists">-->
<!-- <div v-if="zlist.voucherUrl !== ''" class="voucherUrl">-->
<!-- &lt;!&ndash; <div @click="zpick">小程序Url:{{ String(zlist.voucherUrl).slice(-2) }}</div> &ndash;&gt;-->
<!-- <div>小程序Url:{{ String(zlist.voucherUrl).slice(-2) }}</div>-->
<!-- <div-->
<!-- v-if="String(zlist.voucherUrl).slice(-2) === '97'"-->
<!-- @click="zpick('h5', String(zlist.voucherUrl))"-->
<!-- >{{ zlist.voucherUrl }}</div>-->
<!-- <div-->
<!-- v-if="String(zlist.voucherUrl).slice(-2) !== '97'"-->
<!-- @click="zpick('h5', String(zlist.voucherUrl))"-->
<!-- >{{ zlist.voucherUrl }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!--</div>-->
</div>
<!-- <div class="menus">
<div class="menu" @click="buttonMainMarketingClick">精准营销</div>
<div class="menu activeMenu" @click="buttonSingleMarketingClick">一对一营销侧边栏</div>
</div> -->
</div>
</template>
......@@ -147,18 +88,11 @@ export default {
};
},
created() {
zlog("%c--->Created.", "color: orange");
// alert(`--->discount: IN.`);
// configWx()
this.zcache.userId = this.$route.params.userId;
// zlog('%c--->userId =', this.zcache.userId)
this.zReadyGetUserFromId();
// this.zReadySetVoucherList();
this.getAgentAuth();
},
mounted() {
// zlog("%c--->Mounted.", "color: orange");
// this.getAgentAuth();
},
methods: {
// 测试-获取预授权码
......@@ -187,23 +121,14 @@ export default {
"&state=" +
basicInfo.state +
basicInfo.tail;
zlog("%c--->zTestPreAuthCode: Url =", "background: orange", url);
// window.location.href = url
},
// 测试-测试函数调用
zTest() {
this.zTestPreAuthCode();
},
zReadyGetUserFromId() {
let postData = {
param: this.zcache.userId
// param: 'ZhouHeQiang'
};
// alert(`--->userInfoFromId: postData = ${JSON.stringify(postData)}`);
getUserInfoByUserId(postData)
.then(res => {
......@@ -266,9 +191,10 @@ export default {
},
zpick(inMsgType, inUrl) {
alert(`--->discount.vue: zpick: IN.`);
// alert(`--->discount.vue: zpick: IN.`);
switch (inMsgType) {
case "text":
wx.invoke(
"sendChatMessage",
......@@ -290,7 +216,7 @@ export default {
);
break;
case "h5":
alert(`--->discount.vue: zpick: H5: IN.`);
// alert(`--->discount.vue: zpick: H5: IN.`);
wx.invoke(
"sendChatMessage",
......@@ -305,12 +231,12 @@ export default {
},
function(res) {
if (res.err_msg == "sendChatMessage:ok") {
alert("--->discount.vue: zpick: h5 分享成功！");
// alert("--->discount.vue: zpick: h5 分享成功！");
} else if (res.err_msg != "sendChatMessage:ok") {
alert(`--->discount.vue: zpick: h5 分享失败.`);
alert(
`--->discount.vue: zpick: h5 分享失败: res =${res.err_msg}`
);
// alert(`--->discount.vue: zpick: h5 分享失败.`);
// alert(
// `--->discount.vue: zpick: h5 分享失败: res =${res.err_msg}`
// );
}
}
);
......
ybf_wx/src/views/sideNav/register/index.vue 0 → 100644
View file @ 0399b05a
<template>
<div class="register_container">
<div v-for="(item, index) of list" :key="index" >
<div class="list">
<div>
<img class="list-logo" :src="item.logoUrl" alt/>
</div>
<div class="list-infos">
<div class="list-info-title">{{item.name}}</div>
<div class="list-info-dsc">{{item.dsc}}</div>
</div>
<button class="button-send" @click="sendMessage">邀请</button>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'register',
data() {
return {
list:[
{
name: "会员拉新",
dsc: "推荐完成注册，完成会员拉新",
logoUrl: "/mainSale/4.png"
}
]
}
},
created() {
this.getAgentAuth();
},
mounted(){
},
methods:{
sendMessage(){
wx.invoke(
"sendChatMessage",
{
msgtype: "text", //消息类型，必填
news: {
link: `http://qywx2.100smartdata.com/register`, //H5消息页面url 必填
title: "会员拉新", //H5消息标题
desc: '注册成为欧亚会员', //H5消息摘要
imgUrl: "" //H5消息封面图片URL
}
},
function(res) {
if (res.err_msg == "sendChatMessage:ok") {
// alert("--->register.vue: zpick: h5 分享成功！");
} else if (res.err_msg != "sendChatMessage:ok") {
// alert(`--->register.vue: zpick: h5 分享失败.`);
}
}
);
}
}
}
</script>
<style lang="scss" scoped>
.register_container{
padding: 4px 12px 40px 12px;
.list {
height: 140px;
box-shadow: 0px 2px 4px 0px rgb(187, 187, 187);
margin: 6px 0px;
padding: 0px 12px;
border-radius: 6px;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
.list-logo {
width: 80px;
height: 80px;
border-radius: 6px;
}
.list-infos {
height: 80px;
padding-left: 12px;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;
}
.list-info-title {
width: 100%;
height: 18px;
font-size: 16px;
font-weight: bold;
line-height: 18px;
}
.list-info-dsc {
margin-top: 6px;
width: 100%;
height: 16px;
font-size: 12px;
font-weight: normal;
line-height: 18px;
}
.button-send {
border: 0px solid blue;
margin-left: 5px;
height: 40px;
width: 84px;
border-radius: 4px;
background-color: rgba(68, 93, 251, 1);
color: white;
font-size: 16px;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment