更新补贴,扫码支付
This commit is contained in:
parent
ab9545ad20
commit
4e38320e3a
@ -110,7 +110,7 @@
|
|||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
if (!this.isLogin) {
|
if (!this.isLogin) {
|
||||||
Cache.set("login_back_url_weixin", getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
|
Cache.set("login_back_url_weixin", "/" + getCurrentPages()[0].route + "?mer_id=" + this.mer_id);
|
||||||
this.isAuto = true;
|
this.isAuto = true;
|
||||||
this.isShowAuth = true;
|
this.isShowAuth = true;
|
||||||
} else {
|
} else {
|
||||||
|
@ -572,6 +572,7 @@
|
|||||||
page: 1,
|
page: 1,
|
||||||
limit: 10
|
limit: 10
|
||||||
},
|
},
|
||||||
|
mer_cate_id: '',
|
||||||
// 下拉菜单
|
// 下拉菜单
|
||||||
select: {
|
select: {
|
||||||
show: false,
|
show: false,
|
||||||
@ -737,6 +738,7 @@
|
|||||||
},
|
},
|
||||||
onLoad: function(options) {
|
onLoad: function(options) {
|
||||||
this.isLihaiYun = options.LihaiYun // 是否是里海云仓
|
this.isLihaiYun = options.LihaiYun // 是否是里海云仓
|
||||||
|
this.mer_cate_id = options.mer_cate_id
|
||||||
this.type = parseInt(options.type) || 3
|
this.type = parseInt(options.type) || 3
|
||||||
this.id = options.mer_id || options.id || 0;
|
this.id = options.mer_id || options.id || 0;
|
||||||
this.isCoupon = options.coupon || 0;
|
this.isCoupon = options.coupon || 0;
|
||||||
@ -833,7 +835,10 @@
|
|||||||
if (that.goodsLoading) return;
|
if (that.goodsLoading) return;
|
||||||
that.goodsLoading = true;
|
that.goodsLoading = true;
|
||||||
that.loadTitle = '';
|
that.loadTitle = '';
|
||||||
getProductSpuAPI(that.id, that.where).then(res => {
|
getProductSpuAPI(that.id, {
|
||||||
|
...that.where,
|
||||||
|
mer_cate_id: that.mer_cate_id
|
||||||
|
}).then(res => {
|
||||||
that.goodsLoading = false;
|
that.goodsLoading = false;
|
||||||
let list = res.data.list;
|
let list = res.data.list;
|
||||||
let goodsList = that.$util.SplitArray(list, that.goods);
|
let goodsList = that.$util.SplitArray(list, that.goods);
|
||||||
@ -960,7 +965,10 @@
|
|||||||
that.goodsLoading = true;
|
that.goodsLoading = true;
|
||||||
that.loadTitle = '';
|
that.loadTitle = '';
|
||||||
that.where.product_type = ''
|
that.where.product_type = ''
|
||||||
storeServiceList(that.id, that.where).then(res => {
|
storeServiceList(that.id, {
|
||||||
|
...that.where,
|
||||||
|
mer_cate_id: that.mer_cate_id
|
||||||
|
}).then(res => {
|
||||||
that.goodsLoading = false;
|
that.goodsLoading = false;
|
||||||
let list = res.data.list;
|
let list = res.data.list;
|
||||||
let productList = that.$util.SplitArray(list, that.productList);
|
let productList = that.$util.SplitArray(list, that.productList);
|
||||||
@ -1047,7 +1055,10 @@
|
|||||||
if (that.goodsLoading) return;
|
if (that.goodsLoading) return;
|
||||||
that.goodsLoading = true;
|
that.goodsLoading = true;
|
||||||
that.loadTitle = '';
|
that.loadTitle = '';
|
||||||
getStoreGoods(that.id, that.where).then(res => {
|
getStoreGoods(that.id, {
|
||||||
|
...that.where,
|
||||||
|
mer_cate_id: that.mer_cate_id
|
||||||
|
}).then(res => {
|
||||||
that.goodsLoading = false;
|
that.goodsLoading = false;
|
||||||
let list = res.data.list;
|
let list = res.data.list;
|
||||||
let goodsList = that.$util.SplitArray(list, that.goods);
|
let goodsList = that.$util.SplitArray(list, that.goods);
|
||||||
|
@ -347,8 +347,9 @@ import { Toast } from "../../../libs/uniApi";
|
|||||||
}).then(({
|
}).then(({
|
||||||
data
|
data
|
||||||
}) => {
|
}) => {
|
||||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||||
that.$Cache.clear(BACK_URL);
|
that.$Cache.clear(BACK_URL);
|
||||||
|
that.$Cache.clear('login_back_url_weixin');
|
||||||
that.$store.commit("LOGIN", {
|
that.$store.commit("LOGIN", {
|
||||||
'token': data.token,
|
'token': data.token,
|
||||||
'time': data.exp
|
'time': data.exp
|
||||||
@ -465,8 +466,9 @@ import { Toast } from "../../../libs/uniApi";
|
|||||||
}).then(res => {
|
}).then(res => {
|
||||||
const data = res.data;
|
const data = res.data;
|
||||||
if (res.data.status == 200) {
|
if (res.data.status == 200) {
|
||||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||||
that.$Cache.clear(BACK_URL);
|
that.$Cache.clear(BACK_URL);
|
||||||
|
that.$Cache.clear('login_back_url_weixin');
|
||||||
that.$store.commit("LOGIN", {
|
that.$store.commit("LOGIN", {
|
||||||
'token': data.result.token,
|
'token': data.result.token,
|
||||||
'time': data.result.exp
|
'time': data.result.exp
|
||||||
@ -554,8 +556,9 @@ import { Toast } from "../../../libs/uniApi";
|
|||||||
}).then(res => {
|
}).then(res => {
|
||||||
const data = res.data;
|
const data = res.data;
|
||||||
if (res.data.status == 200) {
|
if (res.data.status == 200) {
|
||||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||||
that.$Cache.clear(BACK_URL);
|
that.$Cache.clear(BACK_URL);
|
||||||
|
that.$Cache.clear('login_back_url_weixin');
|
||||||
that.$store.commit("LOGIN", {
|
that.$store.commit("LOGIN", {
|
||||||
'token': data.result.token,
|
'token': data.result.token,
|
||||||
'time': data.result.exp
|
'time': data.result.exp
|
||||||
@ -648,22 +651,23 @@ import { Toast } from "../../../libs/uniApi";
|
|||||||
data
|
data
|
||||||
}) => {
|
}) => {
|
||||||
this.checkOpenId(data.user)
|
this.checkOpenId(data.user)
|
||||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||||
that.$Cache.clear(BACK_URL);
|
|
||||||
that.$store.commit("LOGIN", {
|
that.$store.commit("LOGIN", {
|
||||||
'token': data.token,
|
'token': data.token,
|
||||||
'time': data.exp
|
'time': data.exp
|
||||||
});
|
});
|
||||||
that.$store.commit("SETUID", data.user.uid);
|
that.$store.commit("SETUID", data.user.uid);
|
||||||
that.$store.commit('UPDATE_USERINFO', data.user);
|
that.$store.commit('UPDATE_USERINFO', data.user);
|
||||||
|
|
||||||
|
if(data.is_new_user && !that.$Cache.get('login_back_url_weixin')){
|
||||||
if(data.is_new_user){
|
|
||||||
return uni.navigateTo({
|
return uni.navigateTo({
|
||||||
url: '/pages/helpPeople/helpPeople'
|
url: '/pages/helpPeople/helpPeople'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
that.$Cache.clear(BACK_URL);
|
||||||
|
that.$Cache.clear('login_back_url_weixin');
|
||||||
|
|
||||||
let method
|
let method
|
||||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||||
'/pages/goods_cate/goods_cate',
|
'/pages/goods_cate/goods_cate',
|
||||||
@ -734,6 +738,8 @@ import { Toast } from "../../../libs/uniApi";
|
|||||||
that.$store.commit("SETUID", res.data.user.uid);
|
that.$store.commit("SETUID", res.data.user.uid);
|
||||||
that.$store.commit('UPDATE_USERINFO', res.data.user);
|
that.$store.commit('UPDATE_USERINFO', res.data.user);
|
||||||
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||||
|
that.$Cache.clear(BACK_URL);
|
||||||
|
that.$Cache.clear('login_back_url_weixin');
|
||||||
let method
|
let method
|
||||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||||
'/pages/goods_cate/goods_cate',
|
'/pages/goods_cate/goods_cate',
|
||||||
@ -826,8 +832,7 @@ import { Toast } from "../../../libs/uniApi";
|
|||||||
data
|
data
|
||||||
}) => {
|
}) => {
|
||||||
this.checkOpenId(data.user)
|
this.checkOpenId(data.user)
|
||||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
const backUrl = that.$Cache.get('login_back_url_weixin') || that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||||
that.$Cache.clear(BACK_URL);
|
|
||||||
that.$store.commit("LOGIN", {
|
that.$store.commit("LOGIN", {
|
||||||
'token': data.token,
|
'token': data.token,
|
||||||
'time': data.exp
|
'time': data.exp
|
||||||
@ -835,12 +840,15 @@ import { Toast } from "../../../libs/uniApi";
|
|||||||
that.$store.commit("SETUID", data.user.uid);
|
that.$store.commit("SETUID", data.user.uid);
|
||||||
that.$store.commit('UPDATE_USERINFO', data.user);
|
that.$store.commit('UPDATE_USERINFO', data.user);
|
||||||
|
|
||||||
if(data.is_new_user){
|
if(data.is_new_user && !that.$Cache.get('login_back_url_weixin')){
|
||||||
return uni.navigateTo({
|
return uni.navigateTo({
|
||||||
url: '/pages/helpPeople/helpPeople'
|
url: '/pages/helpPeople/helpPeople'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
that.$Cache.clear(BACK_URL);
|
||||||
|
that.$Cache.clear('login_back_url_weixin');
|
||||||
|
|
||||||
let method
|
let method
|
||||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||||
'/pages/goods_cate/goods_cate',
|
'/pages/goods_cate/goods_cate',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user