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

'新更新文件'

Browse Source
This commit is contained in:
3321822538@qq.com 2024-01-29 11:21:36 +08:00
parent 4f61751327
commit 38b120d270
23 changed files with 143 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
App.vue
View File

@ -18,13 +18,13 @@
mapActions
} from 'vuex'
import {
spread,copyrightApi,channelId
spread,copyrightApi
} from "@/api/user";
// const app = getApp();
export default {
globalData: {
spread: 0, //推广人id
channelId:0, //通道id
code: 0,
isLogin: false,
userInfo: {},
@ -117,14 +117,14 @@
let value = this.$util.getUrlParams(decodeURIComponent(option.query.scene));
that.globalData.spread = value.spread?value.spread:'';
// 通道id
that.globalData.channelId = value.channelId?value.channelId:'';
that.globalData = this.$util.formatMpQrCodeData(value);
break;
}
}
if (option.spread) that.globalData.spread = option.spread;
// 通道id
if (option.channelId) that.globalData.channelId = option.channelId;
// #endif
// 获取导航高度；
uni.getSystemInfo({
@ -159,8 +159,7 @@
// 存储静默授权code
uni.setStorageSync('snsapiCode', code);
let spread = that.globalData.spread ? that.globalData.spread : 0;
// 通道id
let channelId = that.globalData.channelId ? that.globalData.channelId : 0;
Auth.auth(code, that.$Cache.get('SPREAD'))
.then(res => {
uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query
@ -195,6 +194,7 @@
location.replace(uni.getStorageSync('snRouter'));
}
}
// #endif
// #ifdef MP

5
api/public.js
View File

@ -19,11 +19,12 @@ export function getWechatConfig() {
* 获取微信sdk配置
* @returns {*}
*/
export function wechatAuth(code, spread) {
export function wechatAuth(code, spread,) {
var reg=/^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 ，判断正整数用/^[1-9]+[0-9]*]*$/
spread = reg.test(spread) ? spread : 0;
return request.get(
"wechat/authorize/login?code=" + code + "&spread_spid=" + spread, {},
"wechat/authorize/login?code=" + code + "&spread_spid=" + spread , {},
{ noAuth: true }
);
}

2
api/user.js
View File

@ -119,7 +119,7 @@ export function getSignMonthList(data){
*/
export function userActivity(){
return request.get('user/activity');
}
}
/*
* 余额明细（types|2=全部,1=支出,2=收入）

3
config/cache.js
View File

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

1
libs/apps.js
View File

@ -33,5 +33,6 @@ class Apps{
.catch(reject);
});
}
}
export default new Apps();

1
libs/wechat.js
View File

@ -232,6 +232,7 @@ class AuthWechat {
});
}
/**
* 获取跳转授权后的地址
* @param {Object} appId

9
main.js
View File

@ -35,6 +35,7 @@ Vue.prototype.$wechat = Auth;
let cookieName = "VCONSOLE",
query = parseQuery(),
urlSpread = query["spread"],
vconsole = query[cookieName.toLowerCase()],
md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
@ -44,14 +45,8 @@ let cookieName = "VCONSOLE",
name: 'spread',
value: urlSpread,
})
// var spread = Cache.get(SPREAD);
// urlSpread = parseInt(urlSpread);
// if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
// Cache.set("spread", urlSpread || 0);
// } else if (spread === 0 || typeof spread !== "number") {
// Cache.set("spread", urlSpread || 0);
// }
}
if (vconsole !== undefined) {
if (vconsole === md5UnCrmeb && Cache.has(cookieName))
Cache.clear(cookieName);

10
pages/activity/goods_bargain_details/index.vue
View File

@ -342,7 +342,7 @@
import countDown from '@/components/countDown';
import parser from "@/components/jyf-parser/jyf-parser";
import {
silenceBindingSpread
silenceBindingSpread,
} from "@/utils";
// #ifdef APP-PLUS
import {
@ -494,8 +494,7 @@
// 链接进入获取绑定关系id
if(options.spread) app.globalData.spread = options.spread;
// 通道id
// if(options.channelId) app.globalData.channelId = options.channelId;
var pages = getCurrentPages();
if (pages.length <= 1) {
@ -525,7 +524,7 @@
} else {
this.$Cache.set(BACK_URL,
'/pages/activity/goods_bargain_details/index?id=' + options.id +
'&startBargainUid=' + this.uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId
'&startBargainUid=' + this.uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId
);
toLogin();
}
@ -535,6 +534,7 @@
if(this.isLogin && parseInt(app.globalData.spread)>0){
silenceBindingSpread()
}
},
methods: {
//去支付
@ -586,7 +586,7 @@
"//" +
window.location.host +
'/pages/activity/goods_bargain_details/index?id=' + this.id + '&startBargainUid=' + this
.uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId,
.uid + '&spread=' + this.uid + '&storeBargainId=' + this.storeBargainId,
imgUrl: that.bargainInfo.image
};
if (this.$wechat.isWeixin()) {

10
pages/activity/goods_combination_details/index.vue
View File

@ -494,6 +494,7 @@
//获取浏览器参数
if(options.spread) app.globalData.spread = options.spread; //推广码
if (options.id) this.id = options.id; // 商品id
// 仅仅小程序扫码进入获取商品id，商品类型
if (options.scene) {
@ -504,6 +505,7 @@
if (this.isLogin) {
this.combinationDetail();
if(parseInt(app.globalData.spread)>0) silenceBindingSpread()
} else {
this.$Cache.set('login_back_url',
`/pages/activity/goods_combination_details/index?id=${options.id}&spread=${app.globalData.spread?app.globalData.spread:0}`
@ -616,6 +618,7 @@
getCombinationDetail(data).then(function(res) {
//分享地址
that.openPages = '/pages/activity/goods_combination_details/index?id=' + that.id + '&spread=' + that.uid;
that.dataShow = 1;
uni.setNavigationBarTitle({
title: res.data.storeCombination.storeName.substring(0, 16)
@ -1105,6 +1108,7 @@
// 生成二维码；
make() {
let href = location.href.split('?')[0] + "?id="+ this.id + "&spread=" + this.uid;
uQRCode.make({
canvasId: 'qrcode',
text: href,
@ -1122,6 +1126,7 @@
}
})
},
/*
* 保存到手机相册
*/
@ -1178,9 +1183,8 @@
if (this.$wechat.isWeixin()) {
href =
href.indexOf("?") === -1 ?
href + "?spread=" + this.uid :
href + "&spread=" + this.uid;
href + "?spread=" + this.uid : href + "&spread=" + this.uid;
let configAppMessage = {
desc: data.storeInfo,
title: data.storeName,

8
pages/activity/goods_combination_status/index.vue
View File

@ -237,6 +237,7 @@
if (newV) {
this.getCombinationPink();
if(parseInt(app.globalData.spread)>0)silenceBindingSpread()
}
},
deep: true
@ -254,6 +255,7 @@
this.$set(this,'theme',this.$Cache.get('theme'));
this.pinkId = options.id;
if(options.spread) app.globalData.spread = options.spread;
switch (this.theme) {
case 'theme1':
this.posterbackgd = '../../../static/images/bargain_post1.png' // 因为跨域不能使用网络图片，
@ -275,10 +277,12 @@
this.timestamp = (new Date()).getTime();
this.getCombinationPink();
if(parseInt(app.globalData.spread)>0)silenceBindingSpread()
}else{
this.$Cache.set('login_back_url',
`/pages/activity/goods_combination_status/index?id=${options.id}&spread=${app.globalData.spread?app.globalData.spread:0}`
);
toLogin();
}
},
@ -305,6 +309,7 @@
this.timestamp = (new Date()).getTime();
this.getCombinationPink();
silenceBindingSpread()
}else{
toLogin();
}
@ -658,6 +663,7 @@
}
})
},
//拼团信息
getCombinationPink: function() {
var that = this;
@ -665,6 +671,7 @@
.then(res => {
that.openPages = '/pages/activity/goods_combination_status/index?id=' + that.pinkId +
"&spread=" + that.uid;
let storeCombination = res.data.storeCombination;
res.data.pinkT.stop_time = parseInt(res.data.pinkT.stopTime);
that.$set(that, 'storeCombination', storeCombination);
@ -708,6 +715,7 @@
desc: that.storeCombination.title,
link: window.location.protocol + '//' + window.location.host +
'/pages/activity/goods_combination_status/index?id=' + that.pinkId + "&spread=" + this.uid,
imgUrl: that.storeCombination.image
};
if (this.$wechat.isWeixin()) {

52
pages/activity/goods_seckill_details/index.vue
View File

@ -446,23 +446,15 @@
this.id = value.id ? value.id : '';
}
if(options.spread) app.globalData.spread = options.spread;
// if (options.hasOwnProperty('id') || options.scene){
// if (options.scene) { // 仅仅小程序扫码进入
// let qrCodeValue = this.$util.getUrlParams(decodeURIComponent(options.scene));
// let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue);
// app.globalData.spread = mapeMpQrCodeValue.spread;
// this.id = mapeMpQrCodeValue.id;
// }else{
// this.id = options.id;
// }
// }
if (this.isLogin) {
this.getSeckillDetail();
} else {
this.$Cache.set('login_back_url',
'/pages/activity/goods_seckill_details/index?id=' + this.id + '&spread=' + app.globalData.spread?app.globalData.spread:0);
'/pages/activity/goods_seckill_details/index?id=' + this.id + '&spread=' + app.globalData.spread?app.globalData.spread:0);
toLogin();
}
this.$nextTick(() => {
@ -477,9 +469,10 @@
.exec();
// #endif
})
if(this.isLogin && parseInt(app.globalData.spread)>0){
if(this.isLogin && parseInt(app.globalData.spread)>0){
silenceBindingSpread()
}
},
methods: {
// app分享
@ -492,7 +485,8 @@
provider: "weixin",
scene: scene,
type: 0,
href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}`,
href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}}`,
title: that.storeInfo.storeName,
summary:app.globalData.companyName,
imageUrl: that.storeInfo.image,
@ -614,7 +608,8 @@
setTimeout(function() {
that.infoScroll();
}, 1000);
that.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&spread=' + that.uid ;
that.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&spread=' + that.uid+ '&channelI=' + that.uid;
// that.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id + '&channelI=' + that.uid ;
setTimeout(() => {
that.showSkeleton = false
}, 1000)
@ -1068,7 +1063,7 @@
},
// 生成二维码；
make() {
let href = location.href.split('?')[0] + "?id="+ this.id + "&spread=" + this.uid;
let href = location.href.split('?')[0] + "?id="+ this.id + "&spread=" + this.uid + "&channelI=" + this.uid;
uQRCode.make({
canvasId: 'qrcode',
text: href,
@ -1086,6 +1081,25 @@
}
})
},
// make() {
// let href = location.href.split('?')[0] + "?id="+ this.id + "&channelI=" + this.uid;
// uQRCode.make({
// canvasId: 'qrcode',
// text: href,
// size: this.qrcodeSize,
// margin: 10,
// success: res => {
// this.PromotionCode = res;
// },
// complete: (res) => {
// },
// fail:res=>{
// this.$util.Tips({
// title: '海报二维码生成失败！'
// });
// }
// })
// },
// 图片预览；
getpreviewImage: function() {
if (this.posterImage) {
@ -1157,8 +1171,12 @@
if (this.$wechat.isWeixin()) {
href =
href.indexOf("?") === -1 ?
href + "?spread=" + this.uid :
href + "&spread=" + this.uid;
href + "?spread=" + this.uid+ "?channelI=" + this.uid :
href + "&spread=" + this.uid+"&channelI=" + this.uid;
// href =
// href.indexOf("?") === -1 ?
// href + "?channelI=" + this.uid :
// href + "&channelI=" + this.uid;
let configAppMessage = {
desc: app.globalData.companyName,

28
pages/activity/poster-poster/index.vue
View File

@ -145,6 +145,34 @@
}
})
},
make(uid) {
let href = location.protocol + '//' + window.location.host + '/pages/activity/goods_combination_status/index?id=' + this.id ;
uQRCode.make({
canvasId: 'qrcode',
text: href,
size: this.qrcodeSize,
margin: 10,
success: res => {
this.PromotionCode = res;
let arrImages = [this.posterbackgd, this.imgTop, this.PromotionCode];
let storeName = this.storeCombination.storeCombination.title;
let price = this.storeCombination.storeCombination.price;
let people = this.storeCombination.storeCombination.people;
let otPrice = this.storeCombination.storeCombination.otPrice;
let count = this.storeCombination.count;
setTimeout(() => {
this.PosterCanvas(arrImages, storeName, price, people,otPrice,count);
}, 300);
},
complete: () => {
},
fail:res=>{
this.$util.Tips({
title: '海报二维码生成失败！'
});
}
})
},
// 生成海报
PosterCanvas:function(arrImages, storeName, price, people,otPrice,count){
uni.showLoading({

13
pages/goods_details/index.vue
View File

@ -368,7 +368,8 @@
import shareRedPackets from '@/components/shareRedPackets';
import cusPreviewImg from '@/components/cus-previewImg/cus-previewImg.vue'
import {
silenceBindingSpread
silenceBindingSpread,
} from "@/utils";
import parser from "@/components/jyf-parser/jyf-parser";
import {
@ -607,6 +608,7 @@
// #endif
if (options.spread) app.globalData.spread = options.spread;
this.getGoodsDetails(); //商品详情
this.getCouponType(); //获取默认的 优惠券类型
@ -645,6 +647,8 @@
title: that.productInfo.storeName || '',
imageUrl: that.productInfo.image || '',
path: '/pages/goods_details/index?id=' + that.id + '&spread=' + that.uid,
}
},
// #endif
@ -683,6 +687,7 @@
this.getCartCount(true); //购物车数量
//绑定关系
if (parseInt(app.globalData.spread) > 0) silenceBindingSpread();
}
});
},
@ -696,6 +701,8 @@
scene: scene,
type: 0,
href: `${HTTP_H5_URL}${curRoute}&spread=${that.uid}`,
title: that.productInfo.storeName,
summary: app.globalData.companyName,
imageUrl: that.productInfo.image,
@ -1424,6 +1431,7 @@
}
})
},
getImageBase64: function(images) {
let that = this;
imageBase64({
@ -1576,7 +1584,8 @@
let data = this.productInfo;
let href = location.href;
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 = {
desc: app.globalData.companyName,
title: data.storeName,

4
pages/index/index.vue
View File

@ -418,8 +418,11 @@
let qrCodeValue = this.$util.getUrlParams(decodeURIComponent(options.scene));
let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue);
app.globalData.spread = mapeMpQrCodeValue.spread;
}
if (options.spread) app.globalData.spread = options.spread; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中
// #endif
// #ifndef MP || APP-PLUS
this.navH = 0;
@ -431,6 +434,7 @@
if (this.isLogin && parseInt(app.globalData.spread) > 0) {
silenceBindingSpread()
}
},
onShow() {
let self = this;

3
pages/order_details/index.vue
View File

@ -130,7 +130,7 @@
<!-- 加载logo -->
<view class="logobox" v-show="logoflag">
<image class="logoicon" :src="logoicon"></image>
<image class="logoicon" src="../../static/img/logo.png"></image>
<text>正在生成签署证书中...</text>
</view>
@ -316,7 +316,6 @@
codeImg: '',
qrcodeSize: 100,
order_id: '',
logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d',
evaluate: 0,
cartInfo: [], //购物车产品
orderInfo: {

14
pages/users/login/index.vue
View File

@ -315,8 +315,9 @@
loginMobile({
phone: that.account,
captcha: that.captcha,
spread_spid: that.$Cache.get("spread")
// spread_spid: uni.getStorageSync('spid')
spread_spid: that.$Cache.get("spread"),
})
.then(res => {
let data = res.data;
@ -358,8 +359,9 @@
account: that.account,
captcha: that.captcha,
password: that.password,
spread_spid: that.$Cache.get("spread")
// spread_spid: uni.getStorageSync('spid') || 0
spread_spid: that.$Cache.get("spread"),
})
.then(res => {
that.$util.Tips({
@ -420,7 +422,9 @@
loginH5({
account: that.account,
password: that.password,
spread_spid: that.$Cache.get("spread")
spread_spid: that.$Cache.get("spread"),
}).then(({data}) => {
this.$store.commit("LOGIN", {
'token': data.token,

4
pages/users/order_improves/index.vue
View File

@ -160,7 +160,6 @@
export default {
data() {
return {
// 正面身份证
positiveImg: '', //自己图片路径
upLoadPositiveImg: 'https://tse1-mm.cn.bing.net/th/id/OIP-C.zrlmSg7klHyl3uDBB-nG3wAAAA?w=280&h=170&c=7&r=0&o=5&pid=1.7', // 反面身份证
reverseImg: '', //自己图片路径
@ -787,12 +786,13 @@
display: flex;
width: 100%;
border-bottom: 1px solid #ccc;
text {
margin-right: 80rpx;
width: 160rpx;
}
input {
width: 100%;
height: 80rpx;
line-height: 80rpx;
font-size: 26rpx;

3
pages/users/order_list/index.vue
View File

@ -89,7 +89,7 @@
</view>
<!-- 加载logo -->
<view class="logobox" v-show="logoflag">
<image class="logoicon" :src="logoicon"></image>
<image class="logoicon" src="../../../static/img/logo.png"></image>
<text>正在生成签署证书中...</text>
</view>
</view>
@ -151,7 +151,6 @@
orderStatus: 0, //订单状态
page: 1,
limit: 20,
logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d',
payMode: [{
name: "微信支付",
icon: "icon-weixinzhifu",

6
pages/users/pay_success/index.vue
View File

@ -25,7 +25,7 @@
<!-- 加载logo -->
<view class="logobox" v-show="logoflag">
<image class="logoicon" :src="logoicon"></image>
<image class="logoicon" src="../../../static/img/logo.png"></image>
<text>正在生成订单中，请稍等...</text>
</view>
</view>
@ -38,8 +38,6 @@
shopobj: {},
ordermo: '',
logoflag:true,
logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d',
}
},
onLoad(option) {
@ -47,7 +45,7 @@
this.timer = setInterval(() => {
this.ordermo = this.$Cache.get('ordernobh')
this.logoflag = false
console.log(this.ordermo)
// console.log(this.ordermo)
}, 3000); // 定时器时间设置为1秒
},
onShow() {

3
pages/users/signin/index.vue
View File

@ -28,7 +28,7 @@
<!-- 加载logo -->
<view class="logobox" v-show="logoflag">
<image class="logoicon" :src="logoicon"></image>
<image class="logoicon" src="../../../static/img/logo.png"></image>
<text>正在签约中，请稍等...</text>
</view>
@ -49,7 +49,6 @@
flag: false,
text: '失败',
logoflag:true,
logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d',
}
},
onLoad(option) {

2
pages/users/user_spread_code/index.vue
View File

@ -307,7 +307,7 @@
let configAppMessage = {
desc: '分销海报',
title: this.userInfo.nickname + '-分销海报',
link: '/pages/index/index?spread=' + this.uid,
link: '/pages/index/index?spread=' + this.uid ,
imgUrl: this.spreadList[0].pic
};
this.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],

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

@ -46,8 +46,8 @@
<script>
const app = getApp();
let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
import mobileLogin from '@/components/login_mobile/index.vue'
import atModel from '@/components/accredit/index.vue'
import mobileLogin from '@/components/login_mobile/index.vue';
import atModel from '@/components/accredit/index.vue';
import {
mapGetters
} from "vuex";
@ -66,8 +66,7 @@
} from '@/config/app';
import {
getUserInfo,
spread,
channelId
spread
} from '@/api/user.js'
import Routine from '@/libs/routine';
import wechat from "@/libs/wechat";
@ -146,6 +145,7 @@
//if(!code) location.replace(decodeURIComponent(decodeURIComponent(option.query.back_url)));
if (code && this.options.scope !== 'snsapi_base') {
let spread = app.globalData.spread ? app.globalData.spread : 0;
//公众号授权登录回调 wechatAuth(code, Cache.get("spread"), loginType)
wechat.auth(code, spread).then(res => {
if (res.type === 'register') {
@ -252,6 +252,7 @@
let userInfo = {};
userInfo.code = code;
userInfo.spread_spid = app.globalData.spread; //获取推广人ID
userInfo.avatar = '';
userInfo.nickName = '微信用户';
userInfo.type = 'routine'
@ -267,6 +268,7 @@
let userInfo = res.userInfo;
userInfo.code = code;
userInfo.spread_spid = app.globalData.spread; //获取推广人ID
userInfo.avatar = userInfo.userInfo.avatarUrl;
userInfo.city = userInfo.userInfo.city;
userInfo.country = userInfo.userInfo.country;
@ -306,6 +308,8 @@
if (app.globalData.spread) {
spread(app.globalData.spread).then(res => {}) //登录成功后读取spread绑定分销关系
}
self.$util.Tips({
title: res,
icon: 'success'

4
utils/util.js
View File

@ -612,17 +612,21 @@ export default {
let v1 = values[0].split(":");
if (v1[0] === 'pid') {
result.spread = v1[1];
} else {
result.id = v1[1];
}
let v2 = values[1].split(":");
if (v2[0] === 'pid') {
result.spread = v2[1];
} else {
result.id = v2[1];
}
} else {
result.spread = values[0].split(":")[1];
}
return result;
},