Commit 8d46dd9c by 李嘉林

feat: 进店规则优化

parent c5ffa3af
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
if (imgRgb != 'undefined' && imgRgb != 'null' && imgRgb != '' && imgRgb != null && imgRgb != undefined) { if (imgRgb != 'undefined' && imgRgb != 'null' && imgRgb != '' && imgRgb != null && imgRgb != undefined) {
this.imgRgb = imgRgb; this.imgRgb = imgRgb;
} else { } else {
this.imgRgb = '#fff'; this.imgRgb = '#333';
} }
}, },
reloadName() { reloadName() {
......
...@@ -592,6 +592,7 @@ export default { ...@@ -592,6 +592,7 @@ export default {
} }
} }
}) })
await this.getEnterShopIdV1();
}, },
setPageLoading() { setPageLoading() {
setTimeout(() => { setTimeout(() => {
...@@ -619,7 +620,6 @@ export default { ...@@ -619,7 +620,6 @@ export default {
}, },
async enterStoreRule() { async enterStoreRule() {
let _this = this; let _this = this;
await this.getEnterShopIdV1();
try { try {
console.log(wx.getStorageSync("locationObj"),'--locationObj') console.log(wx.getStorageSync("locationObj"),'--locationObj')
let locationObj = wx.getStorageSync("locationObj") ? JSON.parse(wx.getStorageSync("locationObj")) : {}; let locationObj = wx.getStorageSync("locationObj") ? JSON.parse(wx.getStorageSync("locationObj")) : {};
...@@ -665,6 +665,10 @@ export default { ...@@ -665,6 +665,10 @@ export default {
// this.setPageLoading(); // this.setPageLoading();
}, },
async getEnterShopIdV1() { async getEnterShopIdV1() {
// 如果url有参数就return
if (this.h5Params && this.h5Params.offlineShopCode) {
return;
}
this.preEntryStoreId = ""; this.preEntryStoreId = "";
try { try {
let res = await shop.getEnterShopIdV1({ let res = await shop.getEnterShopIdV1({
...@@ -1251,6 +1255,7 @@ export default { ...@@ -1251,6 +1255,7 @@ export default {
} }
// 新店调试 // 新店调试
this.debugShopFun(); this.debugShopFun();
this.setPageLoading();
wx.stopPullDownRefresh(); wx.stopPullDownRefresh();
}, },
ShopCodeDistributionOrg() { ShopCodeDistributionOrg() {
......
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