diff --git a/App.vue b/App.vue
index c4a890f..3bcb583 100644
--- a/App.vue
+++ b/App.vue
@@ -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
diff --git a/api/api.js b/api/api.js
index 6996785..ed6bba6 100644
--- a/api/api.js
+++ b/api/api.js
@@ -360,12 +360,10 @@ export function getinstallment(data) {
}
+// 首页记录ip
+export function logoip() {
+ return request.get(`login/log`, {}, {
+ noAuth: true
+ });
+}
-
-
- // 查询签约是否成功
-// export function getqytrue(data) {
-// return request.get('order/getSignResult/',data,{
-// noAuth: true
-// })
-// }
\ No newline at end of file
diff --git a/api/public.js b/api/public.js
index 9a883a4..556c282 100644
--- a/api/public.js
+++ b/api/public.js
@@ -19,19 +19,19 @@ export function getWechatConfig() {
* 获取微信sdk配置
* @returns {*}
*/
-export function wechatAuth(code, spread,channelId) {
+export function wechatAuth(code, spread,) {
var reg=/^[0-9]+.?[0-9]*$/; //判断字符串是否为数字 ，判断正整数用/^[1-9]+[0-9]*]*$/
spread = reg.test(spread) ? spread : 0;
- channelId = reg.test(channelId) ? channelId : 0;
+
return request.get(
- "wechat/authorize/login?code=" + code + "&spread_spid=" + spread+"&channelId="+channelId, {},
+ "wechat/authorize/login?code=" + code + "&spread_spid=" + spread , {},
{ noAuth: true }
);
}
/**
* 获取登录授权login
- *
+ *
*/
export function getLogo()
{
@@ -109,4 +109,4 @@ export function appleLogin(data) {
*/
export function iosBinding(data) {
return request.post("ios/binding/phone", data, { noAuth : true });
-}
+}
\ No newline at end of file
diff --git a/api/user.js b/api/user.js
index a28fa9d..26093e2 100644
--- a/api/user.js
+++ b/api/user.js
@@ -119,7 +119,7 @@ export function getSignMonthList(data){
*/
export function userActivity(){
return request.get('user/activity');
-}
+}
/*
* 余额明细（types|2=全部,1=支出,2=收入）
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index 1394133..a0ace27 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -20,7 +20,7 @@
-
+
@@ -61,10 +61,10 @@
return 0;
}
}
- },
+ },
data() {
return {
- totalNmu: ''
+ totalNmu: ''
};
},
watch: {
diff --git a/config/app.js b/config/app.js
index 0fd5b48..428cbe9 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,32 +1,33 @@
//移动端商城API
// let domain = 'http://117.50.163.143:20410'
-let domain = 'http://117.50.215.20:20410'
-// let domain = 'http://192.168.2.14:8081'
-// let domain = 'http://106.75.49.247:20410'
-
+// let domain = 'http://117.50.215.20:20410'
+// let domain = 'http://192.168.2.14:8081'
+// let domain = 'http://106.75.49.247:20410'
+let domain = 'https://yruibao.com/prod'
module.exports = {
// 请求域名 格式： https://您的域名
// #ifdef MP || APP-PLUS
- // HTTP_REQUEST_URL:'',
- HTTP_REQUEST_URL: domain,
- // H5商城地址
- // HTTP_H5_URL: 'http://106.75.49.247:20410',
- HTTP_H5_URL: 'http://117.50.215.20:20410',
+ // HTTP_REQUEST_URL:'',
+ HTTP_REQUEST_URL: domain,
+ // H5商城地址
+ HTTP_H5_URL: 'https://yruibao.com/prod', //正式
+ // HTTP_H5_URL: 'http://192.168.2.14:8081', //本地
+ // HTTP_H5_URL: 'http://117.50.215.20:20410', //测试
// #endif
// #ifdef H5
- HTTP_REQUEST_URL:domain,
+ HTTP_REQUEST_URL: domain,
// #endif
- HEADER:{
+ HEADER: {
'content-type': 'application/json',
},
- HEADERPARAMS:{
+ HEADERPARAMS: {
'content-type': 'application/x-www-form-urlencoded'
},
// 回话密钥名称 请勿修改此配置
TOKENNAME: 'Authori-zation',
// 缓存时间 0 永久
- EXPIRE:0,
+ EXPIRE: 0,
//分页最多显示条数
LIMIT: 10
-};
+};
\ No newline at end of file
diff --git a/config/cache.js b/config/cache.js
index bf653ac..e43f20f 100644
--- a/config/cache.js
+++ b/config/cache.js
@@ -26,12 +26,12 @@ module.exports = {
TIPS_KEY: 'TIPS_KEY',
- SPREAD: 'SPREAD',
- CHANNELID: 'CHANNELID',
+
+ SPREAD: 'SPREAD',
//缓存经度
CACHE_LONGITUDE: 'LONGITUDE',
//缓存纬度
CACHE_LATITUDE: 'LATITUDE',
//app手机信息
PLATFORM: 'systemPlatform'
-}
+}
\ No newline at end of file
diff --git a/libs/apps.js b/libs/apps.js
index c8739c4..2efedeb 100644
--- a/libs/apps.js
+++ b/libs/apps.js
@@ -33,5 +33,6 @@ class Apps{
.catch(reject);
});
}
+
}
export default new Apps();
\ No newline at end of file
diff --git a/libs/wechat.js b/libs/wechat.js
index 60e9334..c238da6 100644
--- a/libs/wechat.js
+++ b/libs/wechat.js
@@ -232,6 +232,7 @@ class AuthWechat {
});
}
+
/**
* 获取跳转授权后的地址
* @param {Object} appId
diff --git a/main.js b/main.js
index 1bb0e0e..1582209 100644
--- a/main.js
+++ b/main.js
@@ -29,13 +29,13 @@ import {
} from "./utils";
import Auth from './libs/wechat';
import {
- SPREAD,CHANNELID
+ SPREAD
} from './config/cache';
Vue.prototype.$wechat = Auth;
let cookieName = "VCONSOLE",
query = parseQuery(),
urlSpread = query["spread"],
- urlChannelId = query["channelId"],
+
vconsole = query[cookieName.toLowerCase()],
md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
@@ -46,13 +46,7 @@ let cookieName = "VCONSOLE",
value: urlSpread,
})
}
-if (urlChannelId) {
- urlChannelId = parseInt(urlChannelId);
- Cache.setItem({
- name: 'channelId',
- value: urlChannelId,
- })
-}
+
if (vconsole !== undefined) {
if (vconsole === md5UnCrmeb && Cache.has(cookieName))
Cache.clear(cookieName);
diff --git a/manifest.json b/manifest.json
index c0ed792..85c8645 100644
--- a/manifest.json
+++ b/manifest.json
@@ -163,7 +163,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx46c3a73d8c4f7051",
+ "appid" : "wx424c861adb20990f",
"libVersion" : "latest",
"setting" : {
"urlCheck" : false,
diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue
index 53d96de..0734138 100644
--- a/pages/activity/goods_bargain_details/index.vue
+++ b/pages/activity/goods_bargain_details/index.vue
@@ -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()) {
diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue
index 58238b0..8a13e20 100644
--- a/pages/activity/goods_combination_details/index.vue
+++ b/pages/activity/goods_combination_details/index.vue
@@ -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,
diff --git a/pages/activity/goods_combination_status/index.vue b/pages/activity/goods_combination_status/index.vue
index 7b25681..d99c3fb 100644
--- a/pages/activity/goods_combination_status/index.vue
+++ b/pages/activity/goods_combination_status/index.vue
@@ -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()) {
diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue
index 477da32..506a680 100644
--- a/pages/activity/goods_seckill_details/index.vue
+++ b/pages/activity/goods_seckill_details/index.vue
@@ -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,
diff --git a/pages/activity/poster-poster/index.vue b/pages/activity/poster-poster/index.vue
index 1e4421f..a34da3d 100644
--- a/pages/activity/poster-poster/index.vue
+++ b/pages/activity/poster-poster/index.vue
@@ -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({
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index bd89793..a18cb67 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -252,7 +252,7 @@
@getImg="showImg" @installments="installments">
@@ -368,7 +368,8 @@
import shareRedPackets from '@/components/shareRedPackets';
import cusPreviewImg from '@/components/cus-previewImg/cus-previewImg.vue'
import {
- silenceBindingSpread,silenceBindingChannelId
+ silenceBindingSpread,
+
} from "@/utils";
import parser from "@/components/jyf-parser/jyf-parser";
import {
@@ -550,8 +551,6 @@
this.getTokenIsExist();
},
onLoad(options) {
- // console.log(JSON.stringify(options),"options.spread")
- alert("options.spread"+JSON.stringify(options))
//用户从分享卡片进入的场景下获取主题色配置
this.$set(this, 'theme', this.$Cache.get('theme'));
@@ -609,7 +608,7 @@
// #endif
if (options.spread) app.globalData.spread = options.spread;
- if (options.channelId) app.globalData.channelId = options.channelId;
+
this.getGoodsDetails(); //商品详情
this.getCouponType(); //获取默认的 优惠券类型
@@ -648,6 +647,8 @@
title: that.productInfo.storeName || '',
imageUrl: that.productInfo.image || '',
path: '/pages/goods_details/index?id=' + that.id + '&spread=' + that.uid,
+
+
}
},
// #endif
@@ -660,11 +661,11 @@
uni.$emit('scroll');
},
methods: {
- //
-
-
-
-
+ //
+
+
+
+
// 请求分期列表
// getfqList: function() {
// let data = {
@@ -674,7 +675,7 @@
// }
// getfenqilist(data).then(res => {
// this.fenqlist = res.data.list
-
+
// // localStorage.setItem('fqlist',JSON.stringify(this.fenqlist))
// })
// },
@@ -686,7 +687,7 @@
this.getCartCount(true); //购物车数量
//绑定关系
if (parseInt(app.globalData.spread) > 0) silenceBindingSpread();
- if (parseInt(app.globalData.channelId) > 0) silenceBindingChannelId();
+
}
});
},
@@ -700,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,
@@ -751,7 +754,7 @@
},
/**
* 购物车手动填写
- *
+ *
*/
iptCartNum: function(e) {
this.$set(this.attr.productSelect, 'cart_num', e ? e : 1);
@@ -793,7 +796,7 @@
that.$set(that.sharePacket, 'touchstart', true); //滑动屏幕时让分享气泡缩回
},
/*
- *去商品详情页
+ *去商品详情页
*/
goDetail(item) {
if (!item.activityH5) {
@@ -836,7 +839,7 @@
},
/**
* 购物车数量加和数量减
- *
+ *
*/
ChangeCartNum: function(changeValue) {
//changeValue:是否 加|减
@@ -868,7 +871,7 @@
},
/**
* 属性变动赋值
- *
+ *
*/
ChangeAttr: function(res) {
let productSelect = this.productValue[res];
@@ -917,7 +920,7 @@
},
/**
* 优品推荐
- *
+ *
*/
getGoods() {
getProductGood().then(res => {
@@ -952,7 +955,7 @@
},
/**
* 获取产品详情
- *
+ *
*/
getGoodsDetails: function() {
let that = this;
@@ -1072,7 +1075,7 @@
},
/**
* 默认选中属性
- *
+ *
*/
DefaultSelect: function() {
let productAttr = this.attr.productAttr;
@@ -1125,7 +1128,7 @@
},
/**
* 获取优惠券
- *
+ *
*/
getCouponList(type) {
let that = this;
@@ -1180,9 +1183,9 @@
that.$set(that.coupon, 'list', that.coupon.list);
that.$set(that.coupon, 'coupon', false);
},
- /**
- *
- *
+ /**
+ *
+ *
* 收藏商品
*/
setCollect: function() {
@@ -1229,7 +1232,7 @@
},
/**
* 打开属性加入购物车
- *
+ *
*/
joinCart: function(e) {
//是否登录
@@ -1316,7 +1319,7 @@
/**
* 立即购买
*/
- goBuy: Debounce(function(e) {
+ goBuy: Debounce(function(e) {
if (this.isLogin === false) {
toLogin();
} else {
@@ -1341,7 +1344,7 @@
},
/**
* 分享打开
- *
+ *
*/
listenerActionSheet: function() {
if (this.isLogin === false) {
@@ -1428,6 +1431,7 @@
}
})
},
+
getImageBase64: function(images) {
let that = this;
imageBase64({
@@ -1580,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,
@@ -2533,7 +2538,7 @@
border-radius: 8rpx;
text-align: center;
}
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a3f51e9..7187c24 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -70,7 +70,7 @@
-
+
@@ -176,10 +176,11 @@
} from "@/api/user";
// #ifdef MP-WEIXIN || APP-PLUS
import {
- getTemlIds
+ getTemlIds,
+ logoip
} from '@/api/api.js';
// #endif
- // #ifdef H5
+ // #ifdef H5
import {
follow
} from '@/api/public.js';
@@ -210,7 +211,7 @@
getGroomList
} from '@/api/store.js';
import {
- silenceBindingSpread,silenceBindingChannelId,
+ silenceBindingSpread,
getCityList
} from '@/utils';
import animationType from '@/utils/animationType.js'
@@ -418,10 +419,11 @@
let qrCodeValue = this.$util.getUrlParams(decodeURIComponent(options.scene));
let mapeMpQrCodeValue = this.$util.formatMpQrCodeData(qrCodeValue);
app.globalData.spread = mapeMpQrCodeValue.spread;
- app.globalData.channelId = mapeMpQrCodeValue.channelId;
+
+
}
if (options.spread) app.globalData.spread = options.spread; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中
- if (options.channelId) app.globalData.channelId = options.channelId; //非小程序扫码进入情况下，直接获取url中的分销员id保存在globalDta中
+
// #endif
// #ifndef MP || APP-PLUS
this.navH = 0;
@@ -433,12 +435,9 @@
if (this.isLogin && parseInt(app.globalData.spread) > 0) {
silenceBindingSpread()
}
- if (this.isLogin && parseInt(app.globalData.channelId) > 0) {
- silenceBindingChannelId()
- }
- if (this.isLogin && parseInt(options.channelId) > 0) {
- silenceBindingChannelId()
- }
+
+
+
},
onShow() {
let self = this;
@@ -453,8 +452,18 @@
}, 1000)
// #endif
uni.showTabBar();
+
+ // 调用记录ip
+ this.getip()
},
methods: {
+ // 首页记录ip
+ getip(){
+ logoip().then(res => {
+ console.log(res,'记录ip')
+ })
+ },
+
menusTap(url) {
goPage().then(res => {
if (url == '/pages/goods_cate/goods_cate') {
@@ -516,13 +525,13 @@
callback(data[0]);
});
},
- xieyiApp() {
+ xieyiApp(){
uni.navigateTo({
url: '/pages/users/web_page/index?webUel=https://admin.java.crmeb.net/useragreement/xieyi.html&title=协议内容'
})
},
// #ifdef APP-PLUS
- xieyiApp() {
+ xieyiApp(){
uni.navigateTo({
animationType: animationType.type,
animationDuration: animationType.duration,
@@ -530,26 +539,26 @@
})
},
// 同意隐私协议
- confirmApp() {
+ confirmApp(){
uni.setStorageSync('privacyStatus', true)
this.privacyStatus = false
},
// 关闭Model
- closeModel() {
+ closeModel(){
this.privacyStatus = false
},
// #endif
// #ifdef MP || APP-PLUS
- getTemlIds() {
- for (var i in arrTemp) {
+ getTemlIds(){
+ for(var i in arrTemp){
this.getTem(arrTemp[i]);
}
},
- getTem(data) {
+ getTem(data){
getTemlIds({
type: data
}).then(res => {
- if (res.data) {
+ if (res.data){
let arr = res.data.map((item) => {
return item.tempId
})
@@ -559,13 +568,13 @@
},
// #endif
// 关闭优惠券弹窗
- onColse() {
+ onColse(){
this.$set(this, "window", false);
},
/**
* 获取我的推荐
*/
- get_host_product: function() {
+ get_host_product: function(){
let that = this;
that.loading = true;
@@ -581,7 +590,7 @@
},
// 首页数据
- getIndexConfig: function() {
+ getIndexConfig: function(){
let that = this;
//this.isNodes++;
getIndexData().then(res => {
@@ -592,8 +601,8 @@
that.$set(that, "imgUrls", res.data.banner);
that.$set(that, "menus", res.data.menus);
that.$set(that, "roll", res.data.roll ? res.data.roll : []);
- that.$set(that, 'cardShow', res.data.homePageSaleListStyle == '' ? 1 : Number(res.data
- .homePageSaleListStyle)); //首页商品列表模板获取配置
+ that.$set(that, 'cardShow', res.data.homePageSaleListStyle == '' ? 1 : Number(res.data.homePageSaleListStyle)); //首页商品列表模板获取配置
+ // console.log(this.menus,11)
// 保存商品分类页配置
that.$Cache.setItem({
name: 'categoryConfig',
@@ -626,10 +635,10 @@
});
},
- appVersionConfig() {
+ appVersionConfig(){
var that = this;
//app升级
- // 获取本地应用资源版本号
+ // 获取本地应用资源版本号
getAppVersion().then(res => {
that.$set(that.appUpdate, 'androidAddress', res.data.androidAddress);
that.$set(that.appUpdate, 'appVersion', res.data.appVersion);
@@ -662,7 +671,6 @@
.iosAddress));
break;
}
-
}
}
});
@@ -1294,4 +1302,4 @@
height: 344rpx;
@include index-gradient(theme);
}
-
+
\ No newline at end of file
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index e8ff2c4..6c33f3e 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -62,7 +62,7 @@
class='picTxt acea-row row-between-wrapper'>
-
+
{{item.storeName}}
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 980428d..7396ebb 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -130,7 +130,7 @@
-
+
正在生成签署证书中...
@@ -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: {
@@ -332,7 +331,7 @@
icon: "icon-weixinzhifu",
value: 'weixin',
title: '微信快捷支付',
- payStatus: 1,
+ payStatus: 1,
},
{
name: "余额支付",
@@ -771,11 +770,11 @@
transform: translateX(-50%);
}
.logoicon {
- width: 100%;
- height: 500rpx;
+ width: 80rpx;
+ height: 140rpx;
z-index: 99;
position: absolute;
- top: 30%;
+ top: 38%;
left: 50%;
transform: translateX(-50%);
}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index fa70eef..29be221 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -27,7 +27,7 @@
{{userInfo.phone}}
-
+
{{realname}}
@@ -44,10 +44,10 @@
{{userInfo.nowMoney && uid ? userInfo.nowMoney:0}}
余额
-
+
{{userInfo.couponCount && uid ? userInfo.couponCount : 0}}
优惠券
@@ -103,7 +103,7 @@
+ v-if="item.id != 1751 && item.id != 1754 && item.id !=1752 &&item.id !=1744">
@@ -180,6 +180,7 @@
} from '@/utils/setTheme.js'
import animationType from '@/utils/animationType.js'
const app = getApp();
+
export default {
computed: mapGetters(['isLogin', 'chatUrl', 'uid']),
data() {
@@ -273,6 +274,7 @@
that.$set(that, 'pageHeight', app.globalData.windowHeight);
// #endif
that.$set(that, 'MyMenus', app.globalData.MyMenus);
+
that.$set(that, 'chatConfig', Cache.getItem('chatConfig'));
// #ifdef H5
that.shareApi();
@@ -323,6 +325,7 @@
uid: this.$store.getters.uid
}
getidentity(data).then(res=>{
+ // console.log(res.data)
if (res.message == '操作成功') {
this.realname = '已实名'
this.identification = res.data
@@ -336,7 +339,7 @@
})
},
//校验token是否有效,true为有效，false为无效
- getTokenIsExist() {
+ getTokenIsExist(){
tokenIsExistApi().then(res => {
let tokenIsExist = res.data;
if (this.isLogin && tokenIsExist) {
@@ -353,7 +356,7 @@
})
},
//获取授权图片
- copyrightImage() {
+ copyrightImage(){
copyrightApi().then(res => {
if (res.data) {
this.copyImage = res.data.companyImage;
@@ -481,13 +484,13 @@
// if (this.MyMenus.length) return;
getMenuList().then(res => {
that.$set(that, 'MyMenus', res.data.routine_my_menus);
+ console.log(this.MyMenus,11)
that.wechatUrl = res.data.routine_my_menus.filter((item) => {
return item.url.indexOf('service') !== -1
})
res.data.routine_my_menus.map((item) => {
if (item.url.indexOf('service') !== -1) that.servicePic = item.pic
})
- // that.imgUrls = res.data.routine_my_banner
if (res.data.routine_my_banner) {
that.imgUrls = res.data.routine_my_banner
}
diff --git a/pages/users/inbound/index.vue b/pages/users/inbound/index.vue
index a5454f6..08271a3 100644
--- a/pages/users/inbound/index.vue
+++ b/pages/users/inbound/index.vue
@@ -1,6 +1,6 @@
-
+
@@ -14,17 +14,16 @@
onShow() {
},
- onLoad(option) {
-
- this.https = decodeURIComponent(option.https)
- // console.log(option.http)
+ onLoad() {
+ this.https = this.$Cache.get('https')
+ // this.https = decodeURIComponent(option)
+ console.log(this.https,111)
},
methods: {
-
handleGetMessage:function(e){
console.log(e)
if(e.detail.data[0].result == 'success'){
- uni.navigateTo({
+ uni.redirectTo({
url:'/pages/users/signin/index'
})
}
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index ba9d1ca..85917f3 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -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,
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 53a0b47..3450eef 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -55,12 +55,11 @@
-
+
-
-
+
完善身份信息 {{sfxx}}
@@ -86,7 +85,7 @@
-
积分抵扣
@@ -99,7 +98,7 @@
:disabled="orderInfoVo.userIntegral==0 && !useIntegral" @click="btnjf" />
-
+ -->
-
+
正在生成签署证书中...
@@ -117,6 +117,7 @@
orderDel,
getnowqy
} from '@/api/order.js';
+
import {
openOrderSubscribe
} from '@/utils/SubscribeMessage.js';
@@ -151,7 +152,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",
@@ -226,10 +226,10 @@
getnowqy(id).then(res => {
this.logoflag = false //logo隐藏
this.https = res.data.url
-
+ console.log(res.data.url,2222)
+ this.$Cache.set('https',this.https)
uni.navigateTo({
- url: '/pages/users/inbound/index?http=' + this.https
- // url:'/pages/users/signin/index?=order45030170584172294634602'
+ url: '/pages/users/inbound/index'
})
// #ifdef H5
window.location.href=this.https
@@ -259,7 +259,7 @@
},
/**
* 关闭支付组件
- *
+ *
*/
payClose: function() {
this.pay_close = false;
@@ -393,13 +393,14 @@
* 切换类型
*/
statusClick: function(status) {
- // console.log(status);
if (status == this.orderStatus) return;
this.orderStatus = status;
this.loadend = false;
this.page = 1;
this.$set(this, 'orderList', []);
this.getOrderList();
+ // 重新获取状态数量
+ this.getOrderData();
},
/**
* 获取订单列表
@@ -510,11 +511,11 @@
}
.logoicon {
- width:100%;
- height: 500rpx;
+ width: 80rpx;
+ height: 140rpx;
z-index: 99;
position: absolute;
- top: 30%;
+ top: 38%;
left: 50%;
transform: translateX(-50%);
}
diff --git a/pages/users/pay_success/index.vue b/pages/users/pay_success/index.vue
index d35e8d0..e40b399 100644
--- a/pages/users/pay_success/index.vue
+++ b/pages/users/pay_success/index.vue
@@ -25,7 +25,7 @@
-
+
正在生成订单中，请稍等...
@@ -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() {
@@ -104,11 +102,11 @@
transform: translateX(-50%);
}
.logoicon {
- width: 100%;
- height: 500rpx;
+ width: 80rpx;
+ height: 140rpx;
z-index: 99;
position: absolute;
- top: 25%;
+ top: 38%;
left: 50%;
transform: translateX(-50%);
}
diff --git a/pages/users/signin/index.vue b/pages/users/signin/index.vue
index 96358eb..9d05c42 100644
--- a/pages/users/signin/index.vue
+++ b/pages/users/signin/index.vue
@@ -25,13 +25,13 @@
返回首页
-
+
-
+
正在签约中，请稍等...
-
-
+
+
@@ -48,24 +48,28 @@
signStatus: '', //签约状态
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',
+ logoflag: true,
}
},
onLoad(option) {
- this.id = this.$Cache.get('qyids')
- this.orderNo = option.orderId
+ this.orderNo = this.$Cache.get('qyids')
+ // console.log(this.id)
+ // this.orderNo = option.orderId
// this.shopobj = JSON.parse(option.shopobj)
this.getnews(this.orderNo)
this.logoflag = true
+
+ this.timer = setInterval(() => {
+ this.getnews()
+ }, 1000);
},
onShow() {
- this.getnews(this.orderNo)
- this.logoflag = true
+
},
methods: {
- getnews(id) {
- getqianyue(id).then(res => {
+ getnews(orderNo) {
+ getqianyue(orderNo).then(res => {
+ console.log(res)
this.signStatus = res.data.signStatus
if (this.signStatus == 2) {
this.flag = true
@@ -76,8 +80,11 @@
},
},
onReady() {
- // 定时器
+ },
+ onUnload() {
+ // 在页面卸载时清除定时器
+ clearInterval(this.timer);
}
}
@@ -86,7 +93,7 @@
page {
position: relative;
}
-
+
.logobox {
width: 100%;
height: 100vh;
@@ -97,11 +104,12 @@
opacity: 1;
padding-top: 30%;
box-sizing: border-box;
- background-color:#000;
+ background-color: #000;
text-align: center;
z-index: 1;
}
- .logobox text{
+
+ .logobox text {
display: block;
color: #fff;
font-size: 14px;
@@ -111,15 +119,17 @@
left: 50%;
transform: translateX(-50%);
}
+
.logoicon {
- width: 100%;
- height: 500rpx;
+ width: 80rpx;
+ height: 140rpx;
z-index: 99;
position: absolute;
- top: 25%;
+ top: 38%;
left: 50%;
transform: translateX(-50%);
}
+
.Pay_success {
width: 100%;
margin-top: 200rpx;
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index ce51e11..68a9a99 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -109,6 +109,7 @@
Debounce
} from '@/utils/validate.js'
import dayjs from "@/plugin/dayjs/dayjs.min.js";
+import { login } from '../../../api/public';
let app = getApp();
export default {
data() {
diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue
index 7f73674..26c5571 100644
--- a/pages/users/user_money/index.vue
+++ b/pages/users/user_money/index.vue
@@ -42,15 +42,15 @@
充值记录
-
+
-
+
领取优惠券
diff --git a/pages/users/user_spread_code/index.vue b/pages/users/user_spread_code/index.vue
index 78f6518..19e205e 100644
--- a/pages/users/user_spread_code/index.vue
+++ b/pages/users/user_spread_code/index.vue
@@ -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"],
diff --git a/pages/users/wechat_login/index.vue b/pages/users/wechat_login/index.vue
index 28a5bd6..4ceaaa4 100644
--- a/pages/users/wechat_login/index.vue
+++ b/pages/users/wechat_login/index.vue
@@ -31,7 +31,7 @@
class='iconfont icon-weixin2'>一键绑定手机号
-
+
@@ -46,8 +46,8 @@
+
+
+
+
+
+
+
+
+