Skip to content

M
mayi-mp-shop
Commit 120e749d by 李嘉林
Options

Merge branch 'xhyx/hotfix' into merge_xh_to_mayi

parents 49aa464f f50a3513
Showing with 281 additions and 935 deletions
src/App.vue
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
// production: { "mixid":"3QqsFT", "shopid": 1337 }, // production: { "mixid":"3QqsFT", "shopid": 1337 },
// production: { "mixid":"notSHOWROOM", "shopid": 1274 }, // 诸色 // production: { "mixid":"notSHOWROOM", "shopid": 1274 }, // 诸色
// production: { "mixid":"LLGW", "shopid": 981 }, // 贺砚堂 // production: { "mixid":"LLGW", "shopid": 981 }, // 贺砚堂
// production: { "mixid":"5I5Dyk", "shopid": 1306 }, // 星期八 production: { "mixid":"5I5Dyk", "shopid": 1306 }, // 星期八
// production: { "mixid":"RON", "shopid": 1503 }, // 荣恩 // production: { "mixid":"RON", "shopid": 1503 }, // 荣恩
production: { "mixid":"ant", "shopid": 6 }, // 小工蚁 production: { "mixid":"ant", "shopid": 6 }, // 小工蚁
// production: { "mixid":"MetaSense", "shopid": 1237 }, // 册为 // production: { "mixid":"MetaSense", "shopid": 1237 }, // 册为
......
src/api/shop.js
...@@ -20,6 +20,11 @@ export default { ...@@ -20,6 +20,11 @@ export default {
return requestPOST(`${process.env.OLSHOP_URL}/cms/get_shop_install_pages?homePageFlag=${params.homePageFlag || false}&shopMixId=${params.shopMixId}`, return requestPOST(`${process.env.OLSHOP_URL}/cms/get_shop_install_pages?homePageFlag=${params.homePageFlag || false}&shopMixId=${params.shopMixId}`,
); );
}, },
// 页面数据V2
themePagesInfoV2(params) {
return requestPOST(`${process.env.OLSHOP_URL}/cms/get_shop_install_pages_v2?homePageFlag=${params.homePageFlag || false}&shopMixId=${params.shopMixId}`,
);
},
// 查单页面 // 查单页面
singlePageInfo(params) { singlePageInfo(params) {
return requestPOST(`${process.env.OLSHOP_URL}/cms/get_shop_page_by_id?id=${params.id}`, return requestPOST(`${process.env.OLSHOP_URL}/cms/get_shop_page_by_id?id=${params.id}`,
...@@ -89,6 +94,13 @@ export default { ...@@ -89,6 +94,13 @@ export default {
data data
); );
}, },
// 进店规则获取门店id预进入门店
getEnterShopIdV1(data) {
return requestPOST(
`${process.env.OLSHOP_URL}/enterShopRule/getEnterShopIdV1`,
data
);
},
// 商城二维码分配组织或跟进人 // 商城二维码分配组织或跟进人
ShopCodeDistributionOrg(data) { ShopCodeDistributionOrg(data) {
return requestPOST( return requestPOST(
......
src/api/wxPay.js
...@@ -6,7 +6,7 @@ export default { ...@@ -6,7 +6,7 @@ export default {
}, },
cancelPayment(options) { cancelPayment(options) {
return requestPOST1( return requestPOST1(
`${process.env.OLSHOP_URL}/pay/payment_cancel?orderSn=${options}` `${process.env.OLSHOP_URL}/pay/payment_cancel?orderSn=${options.orderSn}&batchNumber=${options.batchNumber}`
); );
}, },
getGiftRechargeOrderQuery(options) { getGiftRechargeOrderQuery(options) {
......
src/app.json
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
"pages/tabBar2/main", "pages/tabBar2/main",
"pages/tabBar3/main", "pages/tabBar3/main",
"pages/tabBar4/main", "pages/tabBar4/main",
"pages/changeAdr/main",
"pages/wxArticle/main", "pages/wxArticle/main",
"pages/userInfo/main", "pages/userInfo/main",
"pages/memberCode/main", "pages/memberCode/main",
......
src/components/ThemeDataPlant.vue
...@@ -22,7 +22,6 @@ export default { ...@@ -22,7 +22,6 @@ export default {
} }
}, },
components: { components: {
// 'area-navigation' : () => import('~/components/theme/components/other/area-navigation')
}, },
data() { data() {
return { return {
......
src/components/basicTool/transverse-label/main.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"time-limited-discount": "/static/nativeComponents/TimeLimitedDiscount/index", "time-limited-discount": "/static/nativeComponents/TimeLimitedDiscount/index",
"waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index", "waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index",
"van-button": "/static/vant/button/index", "van-button": "/static/vant/button/index",
"area-navigation":"/static/nativeComponents/AreaNavigation/index",
"cube-nav":"/static/nativeComponents/CubeNav/index", "cube-nav":"/static/nativeComponents/CubeNav/index",
"float-button":"/static/nativeComponents/FloatButton/index", "float-button":"/static/nativeComponents/FloatButton/index",
"goods-search":"/static/nativeComponents/GoodsSearch/index", "goods-search":"/static/nativeComponents/GoodsSearch/index",
......
src/components/common/CustomNav.vue
<template> <template>
<div class="CustomNav" :style="zIndexStyle"> <div v-if="!isPcPlatform" class="CustomNav" :style="zIndexStyle">
<div class="navFixedBg" :style="navFixedBgStyle"></div> <div class="navFixedBg" :style="navFixedBgStyle"></div>
<div class="navBg" :style="navBgStyle"> <div class="navBg" :style="navBgStyle">
<div class="content" :style="contentStyle">{{showShopName}}</div> <div class="content" :style="contentStyle">{{showShopName}}</div>
...@@ -29,15 +29,22 @@ export default { ...@@ -29,15 +29,22 @@ export default {
zIndexStyle: '', zIndexStyle: '',
navFixedBgStyle: '', navFixedBgStyle: '',
navBgStyle: '', navBgStyle: '',
contentStyle: '' contentStyle: '',
isPcPlatform: false, // 是否是PC平台
} }
}, },
created() { created() {
const deviceInfo = wx.getDeviceInfo()
this.isPcPlatform = ['mac', 'windows'].includes(deviceInfo.platform);
if (!this.isPcPlatform) {
this.getNavbarInfo(); this.getNavbarInfo();
this.initialize(); this.initialize();
}
}, },
onPageScroll(el) { onPageScroll(el) {
if (!this.isPcPlatform) {
this.getScroll(el); this.getScroll(el);
}
}, },
watch: { watch: {
customBgOpacity() { customBgOpacity() {
......
src/components/common/StoreAddr.vue
...@@ -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() {
......
src/components/componentsGroup/index.vue
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
<div v-else-if="item1.componentCode == 'ranking-list' && item1.componentInfo.visible == 1"> <div v-else-if="item1.componentCode == 'ranking-list' && item1.componentInfo.visible == 1">
<ranking-list :datas="item1"></ranking-list> <ranking-list :datas="item1"></ranking-list>
</div> </div>
<div v-else-if="item1.componentCode == 'area-navigation' && item1.componentInfo.visible == 1">
<area-navigation :datas="item1" :changeLocation="changeLocation"></area-navigation>
</div>
<div v-else-if="item1.componentCode == 'cube-nav' && item1.componentInfo.visible == 1"> <div v-else-if="item1.componentCode == 'cube-nav' && item1.componentInfo.visible == 1">
<cube-nav :datas="item1"></cube-nav> <cube-nav :datas="item1"></cube-nav>
</div> </div>
......
src/components/componentsGroup/main.json
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"time-limited-discount": "/static/nativeComponents/TimeLimitedDiscount/index", "time-limited-discount": "/static/nativeComponents/TimeLimitedDiscount/index",
"waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index", "waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index",
"van-button": "/static/vant/button/index", "van-button": "/static/vant/button/index",
"area-navigation":"/static/nativeComponents/AreaNavigation/index",
"cube-nav":"/static/nativeComponents/CubeNav/index", "cube-nav":"/static/nativeComponents/CubeNav/index",
"float-button":"/static/nativeComponents/FloatButton/index", "float-button":"/static/nativeComponents/FloatButton/index",
"goods-search":"/static/nativeComponents/GoodsSearch/index", "goods-search":"/static/nativeComponents/GoodsSearch/index",
......
src/main.js
...@@ -190,15 +190,14 @@ function getThemePage({ mixid, shopid }) { ...@@ -190,15 +190,14 @@ function getThemePage({ mixid, shopid }) {
let userId let userId
// 分销员 id // 分销员 id
let spokesmanId let spokesmanId
let startViewTime = new Date().getTime(); // 进入时间
let endViewTime = null; // 跳出时间
let viewPageList = []; // 两个参数 上一个页面、当前页面
/** /**
* 全局页面切换监听 * 全局页面切换监听
*/ */
wx.onAppRoute(res => { wx.onAppRoute(res => {
// 获取当前页面信息 console.log(res, '--res')
let currentPage = getCurrentPages()
console.log(currentPage,'--currentPage')
console.log(res,'--res')
// let fromPath = currentPage[currentPage.length - 1].__displayReporter.showReferpagepath
let whetherToForceLogin = mpApp.globalData.shopInfo && mpApp.globalData.shopInfo.whetherToForceLogin || 0 let whetherToForceLogin = mpApp.globalData.shopInfo && mpApp.globalData.shopInfo.whetherToForceLogin || 0
log.info("wx.onAppRoute", res, mpApp.globalData.shopInfo, whetherToForceLogin, wx.getStorageSync('sessionid'), res.path != "pages/login/main"); log.info("wx.onAppRoute", res, mpApp.globalData.shopInfo, whetherToForceLogin, wx.getStorageSync('sessionid'), res.path != "pages/login/main");
console.log(res,mpApp.globalData.shopInfo,whetherToForceLogin,wx.getStorageSync('sessionid'),res.path !="pages/login/main",'---------wx.onAppRoute') console.log(res,mpApp.globalData.shopInfo,whetherToForceLogin,wx.getStorageSync('sessionid'),res.path !="pages/login/main",'---------wx.onAppRoute')
...@@ -253,5 +252,40 @@ wx.onAppRoute(res => { ...@@ -253,5 +252,40 @@ wx.onAppRoute(res => {
log.info("mpBehavior.trackPageView",trackPageViewQuery) log.info("mpBehavior.trackPageView",trackPageViewQuery)
console.log("mpBehavior.trackPageView",trackPageViewQuery) console.log("mpBehavior.trackPageView",trackPageViewQuery)
mpBehavior.trackPageView(trackPageViewQuery); mpBehavior.trackPageView(trackPageViewQuery);
trackPageLeave(res);
}) })
}) })
/**
* 页面访问时长埋点
* @param {*} res
*/
function trackPageLeave() {
endViewTime = new Date().getTime();
const duration = endViewTime - startViewTime;
// 获取当前页面信息
let currentPage = getCurrentPages()
if (viewPageList.length == 0) {
viewPageList = [currentPage[currentPage.length - 1]]
} else {
viewPageList = [currentPage[currentPage.length - 1], viewPageList[0]]
}
console.log('trackPageLeave-viewPageList->', viewPageList);
if (!isNaN(duration) && viewPageList.length > 1) {
let pagePath = viewPageList[1].route;
let pageQuery = viewPageList[1].options;
let query = {
title: '',
location: pagePath, // 需要存上一个页面的
path: `${pagePath}${serialize(pageQuery)?('?'+serialize(pageQuery)):''}`,
sales: spokesmanId || "",
userId: userId || "",
lsdcode: getStoreInfo().offlineShopCode,
lsdname: getStoreInfo().offlineShopName,
}
query.amount = duration / 1000
mpBehavior.trackPageLeave(query)
}
console.log('trackPageLeave-duration->', query.amount);
startViewTime = endViewTime;
}
\ No newline at end of file
src/pages/changeAdr/index.vue deleted 100644 → 0
<template>
<div class="con">
<div class="tabbar" :style="{'height' : tabbarHeight + 'px','padding-top':systemInfo.statusBarHeight + 'px'}" @click="back">
<div class="tab-back">
<van-icon name="arrow-left" />
</div>
</div>
<div class="container1">
<div class="title">当前定位城市</div>
<div class="position">
<div>
<div class="city" @click="changeCity(positionCity,1)" v-if="locationStatus && positionCity.operatingAreaAreaId">{{ positionCity.regionName }}</div>
<div
class="position-err"
v-if="!locationStatus && !reLocationStatus"
@click="reLocation"
>
定位失败，点击重试
</div>
<div
class="position-err"
v-if="locationStatus && !positionCity.operatingAreaAreaId"
>
{{positionCity.regionName}}(该地区暂未开放)
</div>
<div v-if="reLocationStatus" style="padding-bottom:10px">
<van-loading type="spinner" size="18" />
<span style="font-size:14px;line-height:20px;vertical-align:top;margin-left:4px">正在定位...</span>
</div>
</div>
<div class="reset-position" @click="resetPosition">重新定位</div>
</div>
<div class="title" style="margin-top:10px">选择其他城市</div>
<div class="city-list clearfix">
<div class="item fl" v-for="item in cityList" :key="item.id" @click="changeCity(item,2)">
{{ item.regionName }}
</div>
</div>
</div>
</div>
</template>
<script>
import changeAdr from '@/api/changeAdr'
export default {
data(){
return{
cityList: [],
positionCity: {},
locationStatus: false,
reLocationStatus: true,
systemInfo : null,
tabbarHeight : 0,
noLocation : '',
areaGroupId : ''
}
},
onLoad(options){
this.noLocation = options.noLocation
this.areaGroupId = options.areaGroupId
this.systemInfo = wx.getSystemInfoSync()
let menuButtonInfo = wx.getMenuButtonBoundingClientRect()
console.log(menuButtonInfo,'menuButtonInfo')
this.tabbarHeight = (menuButtonInfo.top - this.systemInfo.statusBarHeight) * 2 + menuButtonInfo.height + this.systemInfo.statusBarHeight
console.log(options)
this.locationStart();
changeAdr.query_operating_area_area_list(options.areaGroupId).then(res => {
console.log(res.data)
if(res.data.code == '200'){
if(res.data.data){
res.data.data.forEach(item => {
item.areaGroupId= options.areaGroupId
})
this.cityList = res.data.data
}
}
})
},
methods:{
back(){
if(this.noLocation == '1'){
wx.showModal({
title: '提示',
content: '请选择定位地址',
success (res) {
if (res.confirm) {
console.log('用户点击确定')
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
return
}
wx.navigateBack()
},
changeCity(item,type){
this.locationStatus = true
if(type == 1){
wx.setStorageSync('location',JSON.stringify({
id : item.operatingAreaAreaId,
regionName : item.regionName,
regionType : item.regionType,
systemRegionId : item.systemRegionId,
areaGroupId : this.areaGroupId,
outId : item.outId
}))
}else{
wx.setStorageSync('location',JSON.stringify({
id : item.id,
regionName : item.regionName,
regionType : item.regionType,
systemRegionId : item.systemRegionId,
areaGroupId : this.areaGroupId,
outId : item.outId
}))
}
this.define()
},
define(){
// wx.setStorageSync('changeAdr','changeAdr')
wx.reLaunch({
url : '/pages/home/main?changeLocation=1'
})
},
locationStart(type){
console.log(wx.getStorageSync('location'),'2222222222222222222222222222')
let _this = this
if(wx.getStorageSync('location')){
let location = wx.getStorageSync('location') && JSON.parse(wx.getStorageSync('location'))
this.positionCity = {
operatingAreaAreaId : location.id,
regionName : location.regionName,
regionType : location.regionType,
systemRegionId : location.systemRegionId,
areaGroupId : location.areaGroupId,
}
if(!type){
this.reLocationStatus = false;
this.locationStatus = true;
return
}
wx.getFuzzyLocation({
type: 'wgs84',
success:function(res){
const latitude = res.latitude
const longitude = res.longitude
console.log('定位成功',res)
changeAdr.query_Location_operating_area_area_list({
location : longitude + ',' + latitude
}).then(res => {
if(res.data.code == '200'){
let city = '';
res.data.data.forEach(item => {
if(item.operatingAreaAreaId){
city = item
}
})
if(city == ''){
_this.positionCity = res.data.data[0];
}else{
_this.positionCity = city;
}
_this.reLocationStatus = false;
_this.locationStatus = true;
}else{
wx.showModal({
title: '提示',
content: '定位失败，请检查是否开启了定位服务',
success (res) {
if (res.confirm) {
console.log('用户点击确定')
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
_this.reLocationStatus = false;
_this.locationStatus = false;
}
})
},
fail:function(err){
console.log('定位失败',err)
wx.showModal({
title: '提示',
content: '定位失败，请检查是否开启了定位服务',
success (res) {
if (res.confirm) {
console.log('用户点击确定')
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
_this.reLocationStatus = false;
_this.locationStatus = false;
}
})
}else{
wx.getFuzzyLocation({
type: 'wgs84',
success:function(res){
const latitude = res.latitude
const longitude = res.longitude
console.log('定位成功',res)
changeAdr.query_Location_operating_area_area_list({
location : longitude + ',' + latitude
}).then(res => {
if(res.data.code == '200'){
let city = '';
res.data.data.forEach(item => {
if(item.operatingAreaAreaId){
city = item
}
})
if(city == ''){
_this.positionCity = res.data.data[0];
}else{
_this.positionCity = city;
}
_this.reLocationStatus = false;
_this.locationStatus = true;
}else{
wx.showModal({
title: '提示',
content: '定位失败，请检查是否开启了定位服务',
success (res) {
if (res.confirm) {
console.log('用户点击确定')
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
_this.reLocationStatus = false;
_this.locationStatus = false;
}
})
},
fail:function(err){
console.log('定位失败',err)
wx.showModal({
title: '提示',
content: '定位失败，请检查是否开启了定位服务',
success (res) {
if (res.confirm) {
console.log('用户点击确定')
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
_this.reLocationStatus = false;
_this.locationStatus = false;
}
})
}
},
resetPosition(){
this.reLocationStatus = true
this.locationStatus = false
this.locationStart(1)
},
reLocation() {
this.reLocationStatus = true;
this.locationStart();
},
}
}
</script>
<style lang="scss" scoped>
.tabbar{
width: 100%;
background-color: white;
box-sizing: border-box;
}
.tab-back{
width: 50px;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
font-size: 18px;
}
.con {
min-height: 100vh;
background-color: #f3f3f3;
}
.container1 {
padding: 10px;
}
.title {
color: #999;
}
.position {
margin-top: 6px;
display: flex;
justify-content: space-between;
align-items: center;
.city {
padding: 6px 36px;
font-size: 14px;
color: #333;
background-color: white;
border: 1px solid #ddd;
display: inline-block;
}
.position-err {
font-size: 14px;
padding-bottom: 10px;
}
.reset-position{
color: var(--main-color);
}
}
.city-list {
margin-top: 6px;
.item {
padding: 6px 30px;
font-size: 14px;
margin-right: 10px;
color: #333;
background-color: white;
border: 1px solid #ddd;
margin-bottom: 10px;
display: inline-block;
}
}
.van-loading {
height: 20px;
width: 20px;
display: inline-block;
vertical-align: bottom;
margin-right: 4px;
}
</style>
\ No newline at end of file
src/pages/changeAdr/main.js deleted 100644 → 0
import Vue from 'vue'
import App from './index'
const app = new Vue(App)
app.$mount()
\ No newline at end of file
src/pages/changeAdr/main.json deleted 100644 → 0
{
"usingComponents": {
"van-loading": "/static/vant/loading/index",
"van-icon": "/static/vant/icon/index"
},
"navigationStyle":"custom"
}
\ No newline at end of file
src/pages/home/index.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</div> --> </div> -->
<CustomNav :customBgOpacity="customBgOpacity"></CustomNav> <CustomNav :customBgOpacity="customBgOpacity"></CustomNav>
<StoreAddr v-if="showStoreAddr" @toUpdate="reloadEnterShopRule" @toPageLoading="toPageLoading" ref="StoreAddr"></StoreAddr> <StoreAddr v-if="showStoreAddr" @toUpdate="reloadEnterShopRule" @toPageLoading="toPageLoading" ref="StoreAddr"></StoreAddr>
<ThemeDataPlant></ThemeDataPlant> <ThemeDataPlant v-if="!pageLoading"></ThemeDataPlant>
<div v-for="(item,index) in pageData" :key="index"> <div v-for="(item,index) in pageData" :key="index">
<div v-if="item.componentCode=='banner' && item.componentInfo.visible == 1"> <div v-if="item.componentCode=='banner' && item.componentInfo.visible == 1">
<banner :datas="item"></banner> <banner :datas="item"></banner>
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
<div v-else-if="item.componentCode == 'ranking-list' && item.componentInfo.visible == 1"> <div v-else-if="item.componentCode == 'ranking-list' && item.componentInfo.visible == 1">
<ranking-list :datas="item"></ranking-list> <ranking-list :datas="item"></ranking-list>
</div> </div>
<div v-else-if="item.componentCode == 'area-navigation' && item.componentInfo.visible == 1">
<area-navigation :datas="item" :changeLocation="changeLocation"></area-navigation>
</div>
<div v-else-if="item.componentCode == 'cube-nav' && item.componentInfo.visible == 1"> <div v-else-if="item.componentCode == 'cube-nav' && item.componentInfo.visible == 1">
<cube-nav :datas="item"></cube-nav> <cube-nav :datas="item"></cube-nav>
</div> </div>
...@@ -207,22 +204,22 @@ export default { ...@@ -207,22 +204,22 @@ export default {
pageInfo: {}, pageInfo: {},
pageData: [], pageData: [],
contentList: [], contentList: [],
themeColor:{ themeColor: {
'--main-color':"", '--main-color': "",
'--minor-color':"", '--minor-color': "",
}, },
changeLocation : '', changeLocation: '',
beforeScrollTop:0, beforeScrollTop: 0,
showSpokesManHome: false,//分销商货架是否展示 showSpokesManHome: false,//分销商货架是否展示
showMyCard: false, showMyCard: false,
showHomepage: false,//分销商首页入口 showHomepage: false,//分销商首页入口
applySucessEntry: false,//成为分销弹框 applySucessEntry: false,//成为分销弹框
getDistributorHomepageName: '',//小店入口名称 getDistributorHomepageName: '',//小店入口名称
active:-1, active: -1,
toHomePage: false,//是否分销隔断 toHomePage: false,//是否分销隔断
options: 1, options: 1,
// 新人有礼 // 新人有礼
newGiftList:[], newGiftList: [],
newCustomerGiftActivityId: "", //新客活动id newCustomerGiftActivityId: "", //新客活动id
showNewUser: false, //新客有礼入口 showNewUser: false, //新客有礼入口
showgiftBag: false, //新客礼包弹框 showgiftBag: false, //新客礼包弹框
...@@ -240,6 +237,9 @@ export default { ...@@ -240,6 +237,9 @@ export default {
customBgOpacity: true, // 沉浸式风格 customBgOpacity: true, // 沉浸式风格
reloadPage: false, // 切换门店进入首页重新获取相关配置 reloadPage: false, // 切换门店进入首页重新获取相关配置
showStoreAddr: false, showStoreAddr: false,
preEntryStoreId: "", // 预进入门店code
preEntryStore: {}, // 预进入门店
storeDetail: {},
}; };
}, },
components:{ components:{
...@@ -573,8 +573,6 @@ export default { ...@@ -573,8 +573,6 @@ export default {
} }
// 新人有礼弹窗 // 新人有礼弹窗
this.newUserFun(); this.newUserFun();
// 新店调试
this.debugShopFun();
//清除商品列表组件懒加载缓存 //清除商品列表组件懒加载缓存
// 需清除的缓存keyList // 需清除的缓存keyList
...@@ -594,6 +592,7 @@ export default { ...@@ -594,6 +592,7 @@ export default {
} }
} }
}) })
await this.getEnterShopIdV1();
}, },
setPageLoading() { setPageLoading() {
setTimeout(() => { setTimeout(() => {
...@@ -620,6 +619,7 @@ export default { ...@@ -620,6 +619,7 @@ export default {
} }
}, },
async enterStoreRule() { async enterStoreRule() {
let _this = this;
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")) : {};
...@@ -634,36 +634,100 @@ export default { ...@@ -634,36 +634,100 @@ export default {
console.log(`%cgetEnterShopId${JSON.stringify(res)}`,'color:yellow;font-size:20px;') console.log(`%cgetEnterShopId${JSON.stringify(res)}`,'color:yellow;font-size:20px;')
if (res.data.code == 200) { if (res.data.code == 200) {
let enterShopId = res.data.data; let enterShopId = res.data.data;
console.log(enterShopId,'--enterShopId') console.log(enterShopId, '--enterShopId');
if (enterShopId) {
let storeDetail = await shop.getOfflineStoreDetail({ let storeDetail = await shop.getOfflineStoreDetail({
shopId: enterShopId, shopId: enterShopId,
}); });
if (storeDetail.data.code == 200) { if (storeDetail.data.code == 200) {
this.storeDetail = storeDetail.data.data;
}
console.log('enterStoreRule->', this.preEntryStoreId, enterShopId)
if (this.preEntryStoreId && this.preEntryStoreId != enterShopId) {
wx.showModal({
title: '提醒',
content: `当前定位最近门店【${this.storeDetail.shopName}】是否要进入该门店？`,
success (res) {
if (res.confirm) {
_this.enterStore(enterShopId);
} else if (res.cancel) {
console.log('用户点击取消')
_this.setPageLoading();
}
}
})
} else {
await this.enterStore(enterShopId);
}
}
} catch (error) {
console.log('enterStoreRule-error->', error)
}
// this.setPageLoading();
},
async getEnterShopIdV1() {
// 如果url有参数就return
if (this.h5Params && this.h5Params.offlineShopCode) {
return;
}
this.preEntryStoreId = "";
try {
let res = await shop.getEnterShopIdV1({
channelType: 2,
consumerLongitude: "",
consumerLatitude: "",
distributionOfficerShopCode: ""
});
if (res.data.code == 200 && !isNaN(res.data.data - 0)) {
if (res.data.data != null && res.data.data != 'null') {
this.preEntryStoreId = res.data.data;
}
if (this.preEntryStoreId) {
let storeDetail = await shop.getOfflineStoreDetail({
shopId: this.preEntryStoreId,
});
if (storeDetail.data.code == 200) {
this.storeDetail = storeDetail.data.data;
}
await this.enterStore(this.preEntryStoreId);
}
}
} catch (error) {
console.log('getEnterShopIdV1-error->', error)
}
},
async enterStore(enterId) {
if (enterId) {
if (this.storeDetail.shopCode) {
setStoreInfo({ setStoreInfo({
offlineShopCode: storeDetail.data.data.shopCode, offlineShopCode: this.storeDetail.shopCode,
offlineShopName: storeDetail.data.data.shopName, offlineShopName: this.storeDetail.shopName,
}); });
this.$refs.StoreAddr.reloadName(); this.$refs.StoreAddr.reloadName();
console.log("refreshInit--------3") console.log("refreshInit--------3")
// this.refreshInit();
let that = this;
console.log("onPullDownRefresh");
console.log("refreshInit--------4")
this.refreshInit(); this.refreshInit();
this.mpApp.pageCallBack = function (params) {
console.log("获取页面数据-3",params)
that.init(params);
};
} }
console.log(storeDetail, '-------storeDetail'); console.log(this.storeDetail, '-------this.storeDetail');
let loginUserInfo = wx.getStorageSync("loginUserInfo") || null; let loginUserInfo = wx.getStorageSync("loginUserInfo") || null;
let query2 = { let query2 = {
telephoneNum: loginUserInfo && loginUserInfo.mobilephone, telephoneNum: loginUserInfo && loginUserInfo.mobilephone,
enterShopSource: "买家直接进入", enterShopSource: "买家直接进入",
hitRule: "首页进入", hitRule: "首页进入",
shopName: storeDetail.data.data.shopName, shopName: this.storeDetail.shopName,
} }
log.info("进店规则-----",query2) log.info("进店规则-----",query2)
shop.saveEnterShopRecord(query2); shop.saveEnterShopRecord(query2);
} }
} },
} catch (error) { getOfflineStoreDetail() {
}
// this.setPageLoading();
}, },
toPageLoading() { toPageLoading() {
}, },
...@@ -873,7 +937,7 @@ export default { ...@@ -873,7 +937,7 @@ export default {
app.fenxiaoModel.becomeRelation(extConfig).then(res=>{ app.fenxiaoModel.becomeRelation(extConfig).then(res=>{
log.info('getSpokesmanInit调用becomeRelation') log.info('getSpokesmanInit调用becomeRelation')
log.info(res,'getSpokesmanInit-becomeRelation'); log.info(res,'getSpokesmanInit-becomeRelation');
if(res) { if(res && res.data == 'true') {
wx.removeStorage({ wx.removeStorage({
key: "becomeInfo" key: "becomeInfo"
}); });
...@@ -1193,6 +1257,9 @@ export default { ...@@ -1193,6 +1257,9 @@ export default {
} catch (error) { } catch (error) {
} }
// 新店调试
this.debugShopFun();
this.setPageLoading();
wx.stopPullDownRefresh(); wx.stopPullDownRefresh();
}, },
ShopCodeDistributionOrg() { ShopCodeDistributionOrg() {
......
src/pages/home/main.json
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
"waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index", "waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index",
"van-button": "/static/vant/button/index", "van-button": "/static/vant/button/index",
"van-stepper": "/static/vant/stepper/index", "van-stepper": "/static/vant/stepper/index",
"area-navigation":"/static/nativeComponents/AreaNavigation/index",
"cube-nav":"/static/nativeComponents/CubeNav/index", "cube-nav":"/static/nativeComponents/CubeNav/index",
"float-button":"/static/nativeComponents/FloatButton/index", "float-button":"/static/nativeComponents/FloatButton/index",
"goods-search":"/static/nativeComponents/GoodsSearch/index", "goods-search":"/static/nativeComponents/GoodsSearch/index",
......
src/pages/index/index.vue
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
if(!this.withoutScene) { if(!this.withoutScene) {
return; return;
} }
this.newPageUrl = this.pageUrl; this.newPageUrl = this.removeEmptyQueryParams(this.pageUrl);
console.log('------------------index----2') console.log('------------------index----2')
// 进入直播页面调用不息屏api // 进入直播页面调用不息屏api
console.log(this.pageUrl,this.pageUrl.includes('/liveBroadcast/lived'),"this.pageUrl.includes('/liveBroadcast/lived')") console.log(this.pageUrl,this.pageUrl.includes('/liveBroadcast/lived'),"this.pageUrl.includes('/liveBroadcast/lived')")
...@@ -163,7 +163,11 @@ export default { ...@@ -163,7 +163,11 @@ export default {
} }
}, },
onLoad(options) { onLoad(options) {
let { offlineShopCode, offlineShopName } = getStoreInfo();
// 新用户首次扫码进入此页没缓存认定为第一次访问
if (offlineShopCode) {
wx.removeStorageSync("firstView"); wx.removeStorageSync("firstView");
}
console.log(options,'---options') console.log(options,'---options')
if(wx.getStorageSync("sessionid")) { if(wx.getStorageSync("sessionid")) {
...@@ -502,7 +506,7 @@ export default { ...@@ -502,7 +506,7 @@ export default {
} }
} }
this.newPageUrl = this.pageUrl; this.newPageUrl = this.removeEmptyQueryParams(this.pageUrl);
console.log('this.newPageUrl', this.newPageUrl) console.log('this.newPageUrl', this.newPageUrl)
// 商品分享进入 (卡片分享、扫码、点击小程序链接) // 商品分享进入 (卡片分享、扫码、点击小程序链接)
if (this.newPageUrl.includes('/goods/') && (options.share || options.share_copy)) { if (this.newPageUrl.includes('/goods/') && (options.share || options.share_copy)) {
...@@ -716,6 +720,31 @@ export default { ...@@ -716,6 +720,31 @@ export default {
} }
return ''; return '';
},
// 将多余的参数删除: ?abc=&cba=1 => ?cba=1
removeEmptyQueryParams(url) {
try {
// 分割URL，分离基础URL和查询字符串
const [baseUrl, queryPart] = url.split('?');
// 若没有查询字符串，直接返回基础URL
if (!queryPart) return baseUrl;
// 分割查询字符串为参数数组
const queryParams = queryPart.split('&');
// 过滤掉空值参数
const filteredParams = queryParams.filter(param => {
const [key, value] = param.split('=');
return value;
});
// 重新组合查询字符串并附加到基础URL上
const cleanedQuery = filteredParams.join('&');
return baseUrl + (cleanedQuery ? `?${cleanedQuery}` : '');
} catch (err) {
console.log('parseUrlError:', err);
return url;
}
} }
}, },
onUnload() { onUnload() {
......
src/pages/login/index.vue
...@@ -666,7 +666,7 @@ export default { ...@@ -666,7 +666,7 @@ export default {
app.fenxiaoModel.becomeRelation(wx.getStorageSync("becomeInfo")?JSON.parse(wx.getStorageSync("becomeInfo")):'').then(res=>{ app.fenxiaoModel.becomeRelation(wx.getStorageSync("becomeInfo")?JSON.parse(wx.getStorageSync("becomeInfo")):'').then(res=>{
log.info('pushPageType调用becomeRelation-381') log.info('pushPageType调用becomeRelation-381')
log.info(res,'pushPageType-becomeRelation') log.info(res,'pushPageType-becomeRelation')
if(res) { if(res && res.data == 'true') {
wx.removeStorage({ wx.removeStorage({
key: "becomeInfo" key: "becomeInfo"
}); });
......
src/pages/pages_subpack/article/index.vue
...@@ -282,7 +282,7 @@ export default { ...@@ -282,7 +282,7 @@ export default {
getSpokesmanInit(extConfig) { getSpokesmanInit(extConfig) {
//绑定上下级关系 //绑定上下级关系
app.fenxiaoModel.becomeRelation(extConfig).then(res => { app.fenxiaoModel.becomeRelation(extConfig).then(res => {
if (res) { if (res && res.data == 'true') {
wx.removeStorage({ wx.removeStorage({
key: "becomeInfo" key: "becomeInfo"
}); });
......
src/pages/tabBar1/index.vue
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
getSpokesmanInit(extConfig) { getSpokesmanInit(extConfig) {
//绑定上下级关系 //绑定上下级关系
app.fenxiaoModel.becomeRelation(extConfig).then((res) => { app.fenxiaoModel.becomeRelation(extConfig).then((res) => {
if (res) { if (res && res.data == 'true') {
wx.removeStorage({ wx.removeStorage({
key: "becomeInfo", key: "becomeInfo",
}); });
......
src/pages/tabBar2/index.vue
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
getSpokesmanInit(extConfig) { getSpokesmanInit(extConfig) {
//绑定上下级关系 //绑定上下级关系
app.fenxiaoModel.becomeRelation(extConfig).then((res) => { app.fenxiaoModel.becomeRelation(extConfig).then((res) => {
if (res) { if (res && res.data == 'true') {
wx.removeStorage({ wx.removeStorage({
key: "becomeInfo", key: "becomeInfo",
}); });
......
src/pages/tabBar3/index.vue
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
getSpokesmanInit(extConfig) { getSpokesmanInit(extConfig) {
//绑定上下级关系 //绑定上下级关系
app.fenxiaoModel.becomeRelation(extConfig).then((res) => { app.fenxiaoModel.becomeRelation(extConfig).then((res) => {
if (res) { if (res && res.data == 'true') {
wx.removeStorage({ wx.removeStorage({
key: "becomeInfo", key: "becomeInfo",
}); });
......
src/pages/tabBar4/index.vue
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
getSpokesmanInit(extConfig) { getSpokesmanInit(extConfig) {
//绑定上下级关系 //绑定上下级关系
app.fenxiaoModel.becomeRelation(extConfig).then((res) => { app.fenxiaoModel.becomeRelation(extConfig).then((res) => {
if (res) { if (res && res.data == 'true') {
wx.removeStorage({ wx.removeStorage({
key: "becomeInfo", key: "becomeInfo",
}); });
......
src/pages/userInfo/index.vue
...@@ -78,6 +78,12 @@ ...@@ -78,6 +78,12 @@
/> />
<van-cell class="noSelect" v-else title="生日" value="未设置" is-link /> <van-cell class="noSelect" v-else title="生日" value="未设置" is-link />
</div> </div>
<!-- 地区 -->
<div @click="areaShow = true">
<van-cell v-if="userMsg.provinceName" :value="userMsg.provinceName" title="地区" is-link />
<van-cell v-else class="noSelect" value="未设置" title="地区" is-link />
</div>
<div class="line"></div> <div class="line"></div>
<!--手机--> <!--手机-->
...@@ -121,6 +127,17 @@ ...@@ -121,6 +127,17 @@
/> />
</van-popup> </van-popup>
</div> </div>
<!-- 地区弹出框 -->
<div catchtouchmove="ture">
<van-popup :show="areaShow" position="bottom">
<van-picker
:columns="provinceNameList"
:show-toolbar="true"
@confirm="onConfirmArea"
@cancel="onCancelArea"
/>
</van-popup>
</div>
<!-- <div @click="click">按下试试</div> --> <!-- <div @click="click">按下试试</div> -->
</div> </div>
</template> </template>
...@@ -131,6 +148,7 @@ import index from "@/api/index"; ...@@ -131,6 +148,7 @@ import index from "@/api/index";
import { DFSImg } from "@/utils/index"; import { DFSImg } from "@/utils/index";
import { themeColor } from "@/utils/mayi.js"; import { themeColor } from "@/utils/mayi.js";
import { formatTime } from "@/utils/index"; import { formatTime } from "@/utils/index";
import tool from "@/utils/tool"
const app = getApp() const app = getApp()
export default { export default {
name: "userInfo", name: "userInfo",
...@@ -142,6 +160,8 @@ export default { ...@@ -142,6 +160,8 @@ export default {
realname: "", realname: "",
mobilephone: "", mobilephone: "",
nickname: "", nickname: "",
provinceCode: "",
provinceName: ""
}, },
imgArr: [], imgArr: [],
minDate: new Date(1900, 1, 1).getTime(), minDate: new Date(1900, 1, 1).getTime(),
...@@ -149,6 +169,9 @@ export default { ...@@ -149,6 +169,9 @@ export default {
birthShow: false, birthShow: false,
sex_show: false, sex_show: false,
sex_list: ["女", "男", "未设置"], sex_list: ["女", "男", "未设置"],
areaShow: false,
provinceList: null,
provinceNameList: [],
imgNumLimit: 1, imgNumLimit: 1,
currentTime: new Date().getTime(), currentTime: new Date().getTime(),
currentTime2: new Date().getTime(), currentTime2: new Date().getTime(),
...@@ -216,12 +239,24 @@ export default { ...@@ -216,12 +239,24 @@ export default {
this.$router.push("/personalCenter"); this.$router.push("/personalCenter");
} }
}, },
getUserMsg() { async getUserMsg() {
if (!this.provinceList) {
await tool.appArea().then(res => {
this.provinceList = res.province_list || {};
const list = [];
for (const key in this.provinceList) {
const item = this.provinceList[key];
list.push(item);
}
this.provinceNameList = list;
})
}
live.getUserInfo().then((res) => { live.getUserInfo().then((res) => {
let result = res.data.data; let result = res.data.data;
this.userMsg = { this.userMsg = {
...result, ...result,
birth: result.birth ? result.birth.split(" ")[0] : "", birth: result.birth ? result.birth.split(" ")[0] : "",
provinceName: this.provinceList[result.provinceCode] || "",
headPortraitUrl: DFSImg( headPortraitUrl: DFSImg(
result.headPortraitUrl, result.headPortraitUrl,
400, 400,
...@@ -250,6 +285,7 @@ export default { ...@@ -250,6 +285,7 @@ export default {
this.update_info_data.gender = this.userMsg.gender.toString(); this.update_info_data.gender = this.userMsg.gender.toString();
this.update_info_data.headPortraitUrl = this.userMsg.headPortraitUrl; this.update_info_data.headPortraitUrl = this.userMsg.headPortraitUrl;
this.update_info_data.realname = this.userMsg.realname; this.update_info_data.realname = this.userMsg.realname;
this.update_info_data.provinceCode = this.userMsg.provinceCode;
if (this.userMsg.nickname == "" || this.userMsg.nickname == " ") { if (this.userMsg.nickname == "" || this.userMsg.nickname == " ") {
wx.showToast({ wx.showToast({
...@@ -314,6 +350,23 @@ export default { ...@@ -314,6 +350,23 @@ export default {
correctTel(val) { correctTel(val) {
return /^1\d{10}$/.test(val); return /^1\d{10}$/.test(val);
}, },
onConfirmArea(selection) {
const value = selection.mp.detail.value;
let code;
for (const key in this.provinceList) {
const item = this.provinceList[key];
if (item === value) {
code = key;
break;
}
}
this.userMsg.provinceCode = code;
this.userMsg.provinceName = value;
this.areaShow = false;
},
onCancelArea() {
this.areaShow = false;
},
sexTransform(value) { sexTransform(value) {
console.log(value, "--------------249"); console.log(value, "--------------249");
if (value == 0) { if (value == 0) {
......
src/pages/wxPay/index.vue
...@@ -252,7 +252,11 @@ export default { ...@@ -252,7 +252,11 @@ export default {
log.info("支付失败", res, this.options.orderSn); log.info("支付失败", res, this.options.orderSn);
this.message = "支付失败"; this.message = "支付失败";
if ((res.errMsg = "requestPayment:fail cancel")) { if ((res.errMsg = "requestPayment:fail cancel")) {
wxPay.cancelPayment(this.options.orderSn).then(() => { const params = {
orderSn: this.options.orderSn,
batchNumber: this.batchNumber
}
wxPay.cancelPayment(params).then(() => {
log.info("取消成功"); log.info("取消成功");
}); });
} }
......
src/utils/mayi.js
...@@ -43,7 +43,6 @@ export const noLoginList = [ ...@@ -43,7 +43,6 @@ export const noLoginList = [
"personalCenter-spokesmanCenter-mine-spokesmanHomePage", "personalCenter-spokesmanCenter-mine-spokesmanHomePage",
"liveBroadcast-lived", "liveBroadcast-lived",
"personalCenter-spokesmanCenter-mine-getBusinessCard", "personalCenter-spokesmanCenter-mine-getBusinessCard",
"changeAdr"
]; ];
// path // path
export const noLoginListPath = noLoginList.map(item => { export const noLoginListPath = noLoginList.map(item => {
......
static/nativeComponents/AreaNavigation/index.js deleted 100644 → 0
// static/nativeComponents/AreaNavigation/index.js
const app = getApp()
const { indexApi } = app;
Component({
/**
* 组件的属性列表
*/
properties: {
datas : {
type : Object
},
changeLocation:{
type : String
}
},
/**
* 组件的初始数据
*/
data: {
noShow : false,
positionCity: "",
changeShow: false,
positionName: '定位中',
wxReady: false,
designateAreaObj : null,
showSpokesManHome: false,
},
ready(){
console.log('++++++++++++++++++++定位组件加载好了++++++++++++++++++++')
console.log(this.data.changeLocation,'changeLocation')
console.log(getCurrentPages())
this.setData({
designateAreaObj: this.data.datas.componentData.designateAreaObj
})
//分销商货架存在
if(
app.fenxiaoModel.spokesmanInfo&&
app.fenxiaoModel.spokesmanInfo.parentSpokesmanDistributionModel == '1'&&
app.fenxiaoModel.spokesmanInfo.distributorHomepage.id
) {
this.setData({
showSpokesManHome: true
})
}else {
this.setData({
showSpokesManHome: false
})
}
console.log(this.data.datas.componentData.designateAreaObj,'2222')
if (!wx.getStorageSync('location')) {
wx.navigateTo({
url: `/pages/changeAdr/main?areaGroupId=${this.data.datas.componentData.designateAreaObj.areaGroupId}&noLocation=1`
})
return
}
if (this.data.datas.componentInfo.visible == 1) {
let _this = this;
if (wx.getStorageSync('location')) {
this.setData({
'designateAreaObj.id': JSON.parse(wx.getStorageSync('location')).id,
'designateAreaObj.regionName': JSON.parse(wx.getStorageSync('location')).regionName,
'designateAreaObj.regionType': JSON.parse(wx.getStorageSync('location')).regionType,
'designateAreaObj.systemRegionId': JSON.parse(wx.getStorageSync('location')).systemRegionId,
'designateAreaObj.outId': JSON.parse(wx.getStorageSync('location')).outId,
'designateAreaObj.areaGroupId': JSON.parse(wx.getStorageSync('location')).areaGroupId,
})
this.setData({
positionName: this.data.designateAreaObj.regionName
})
}
console.log('组件1', this.data.designateAreaObj)
if(this.data.changeLocation == 1){
return
}
wx.getFuzzyLocation({
type: 'wgs84',
success(res) {
console.log('组件1111', _this.data.designateAreaObj)
console.log(res, '++++++++++获取地区')
const latitude = res.latitude
const longitude = res.longitude
console.log('组件2', _this.data.designateAreaObj)
indexApi.queryLocation(longitude, latitude).then(data => {
if (data.data.code == '200') {
let city = ''
data.data.data.forEach(item => {
if (item.operatingAreaAreaId) {
city = item;
}
})
if (city == '') {
_this.setData({
positionCity: data.data.data[0]
})
} else {
_this.setData({
positionCity: city
})
}
if(!wx.getStorageSync('location')){
_this.setData({
'designateAreaObj.id': _this.data.positionCity.operatingAreaAreaId,
'designateAreaObj.regionName': _this.data.positionCity.regionName,
'designateAreaObj.regionType': _this.data.positionCity.regionType,
'designateAreaObj.systemRegionId': _this.data.positionCity.systemRegionId,
'designateAreaObj.outId': _this.data.positionCity.outId,
})
}
console.log(_this.data.positionCity, '定位城市信息')
console.log(_this.data.designateAreaObj, '组件信息')
let str = JSON.stringify({
id: _this.data.positionCity.operatingAreaAreaId,
regionName: _this.data.positionCity.regionName,
regionType: _this.data.positionCity.regionType,
systemRegionId: _this.data.positionCity.systemRegionId,
outId: _this.data.positionCity.outId,
areaGroupId: _this.data.designateAreaObj.areaGroupId,
})
console.log(str, 'str.......')
wx.setStorageSync('location', str)
if (_this.data.positionCity.operatingAreaAreaId == _this.data.designateAreaObj.id) {
_this.setData({
positionName: _this.data.positionCity.regionName
})
} else {
_this.setData({
changeShow: true
})
}
} else {
if (!wx.getStorageSync('location')) {
if (_this.data.designateAreaObj.id) {
wx.setStorageSync('location', JSON.stringify({
id: _this.data.designateAreaObj.id,
regionName: _this.data.designateAreaObj.regionName,
regionType: _this.data.designateAreaObj.regionType,
systemRegionId: _this.data.designateAreaObj.systemRegionId,
areaGroupId: _this.data.designateAreaObj.areaGroupId,
outId: _this.data.designateAreaObj.outId
}))
_this.setData({
positionName: _this.data.designateAreaObj.regionName
})
}
}
}
}).catch(err => {
console.log('定位')
if (!wx.getStorageSync('location')) {
if (_this.data.designateAreaObj.id) {
wx.setStorageSync('location', JSON.stringify({
id: _this.data.designateAreaObj.id,
regionName: _this.data.designateAreaObj.regionName,
regionType: _this.data.designateAreaObj.regionType,
systemRegionId: _this.data.designateAreaObj.systemRegionId,
areaGroupId: _this.data.designateAreaObj.areaGroupId,
outId: _this.data.designateAreaObj.outId
}))
_this.setData({
positionName: _this.data.designateAreaObj.regionName
})
}
}
})
},
fail(error) {
console.log('定位失败')
if(!wx.getStorageSync('location')){
if(_this.data.designateAreaObj.id){
wx.setStorageSync('location', JSON.stringify({
id : _this.data.designateAreaObj.id,
regionName: _this.data.designateAreaObj.regionName,
regionType: _this.data.designateAreaObj.regionType,
systemRegionId : _this.data.designateAreaObj.systemRegionId,
areaGroupId : _this.data.designateAreaObj.areaGroupId,
outId : _this.data.designateAreaObj.outId
}))
_this.setData({
positionName : _this.data.designateAreaObj.regionName
})
}
}
}
})
}
console.log('111111++++++++++++++++++++定位组件加载好了++++++++++++++++++++111')
},
pageLifetimes : {
show(){
console.log('组件页面出来show', this.data.designateAreaObj)
console.log('组件页面出来show', this.data.positionCity)
if(wx.getStorageSync('location')){
let locationObj = JSON.parse(wx.getStorageSync('location'))
if (locationObj.id){
if (locationObj.id != this.data.positionCity.operatingAreaAreaId){
this.setData({
positionName: locationObj.regionName
})
this.setData({
'designateAreaObj.id': locationObj.id,
'designateAreaObj.regionName': locationObj.regionName,
'designateAreaObj.regionType': locationObj.regionType,
'designateAreaObj.systemRegionId': locationObj.systemRegionId,
'.designateAreaObj.areaGroupId': locationObj.areaGroupId,
'designateAreaObj.outId': locationObj.outId
})
let obj = {
operatingAreaAreaId: locationObj.id,
regionName: locationObj.regionName,
regionType: locationObj.regionType,
systemRegionId: locationObj.systemRegionId,
areaGroupId: locationObj.areaGroupId,
outId: locationObj.outId,
}
this.setData({
positionCity : obj
})
}
// app.getThemePage({ mixid: "antgood", shopid: 67 })
return
}
if (locationObj.regionName != this.data.positionCity.regionName){
this.setData({
positionName: locationObj.regionName
})
this.setData({
'designateAreaObj.id': locationObj.id,
'designateAreaObj.regionName': locationObj.regionName,
'designateAreaObj.regionType': locationObj.regionType,
'designateAreaObj.systemRegionId': locationObj.systemRegionId,
'designateAreaObj.areaGroupId': locationObj.areaGroupId,
'designateAreaObj.outId': locationObj.outId
})
let obj = {
operatingAreaAreaId: locationObj.id,
regionName: locationObj.regionName,
regionType: locationObj.regionType,
systemRegionId: locationObj.systemRegionId,
areaGroupId: locationObj.areaGroupId,
outId: locationObj.outId,
}
this.setData({
positionCity: obj
})
// app.getThemePage({ mixid: "antgood", shopid: 67 })
return
}
}
}
},
/**
* 组件的方法列表
*/
methods: {
//切换城市
changeTo(e){
console.log(this.data.designateAreaObj)
this.setData({
'designateAreaObj.id': this.data.positionCity.operatingAreaAreaId,
'designateAreaObj.regionName': this.data.positionCity.regionName,
'designateAreaObj.regionType': this.data.positionCity.regionType,
'designateAreaObj.systemRegionId': this.data.positionCity.systemRegionId,
// 'designateAreaObj.areaGroupId': this.data.positionCity.areaGroupId,
'designateAreaObj.outId': this.data.positionCity.outId
})
console.log(this.data.designateAreaObj)
console.log(this.data.positionCity)
let change = JSON.stringify(this.data.designateAreaObj)
this.setData({
positionName: this.data.positionCity.regionName,
changeShow : false
})
wx.setStorageSync('location', change )
app.trackCpn(e, this.data.datas.componentName, 'tzChangeTo')
wx.reLaunch({
url: '/pages/home/main?changeLocation=1'
})
},
continueBrowser(e){
console.log(this.data.designateAreaObj,'this.data.designateAreaObj')
wx.setStorageSync('location', JSON.stringify(this.data.designateAreaObj))
this.setData({
positionName: this.data.designateAreaObj.regionName,
changeShow: false
})
// wx.startPullDownRefresh()
app.trackCpn(e, this.data.datas.componentName, 'continueBrowser')
wx.reLaunch({
url: '/pages/home/main?changeLocation=1'
})
},
changeOtherCity(e){
console.log(getCurrentPages())
app.trackCpn(e, this.data.datas.componentName, 'changeOtherCity')
wx.navigateTo({
url: '/pages/changeAdr/main?areaGroupId=' + this.data.designateAreaObj.areaGroupId,
})
},
toSearchPage(e){
app.trackCpn(e, this.data.datas.componentName, 'toSearchPage')
app.$themeToLink({
type : 1,
link: '/goodsSearch/goodsSearch'
})
}
},
})
static/nativeComponents/AreaNavigation/index.json deleted 100644 → 0
{
"component": true,
"usingComponents": {
"van-dialog": "/static/vant/dialog/index",
"van-icon": "/static/vant/icon/index",
"van-sticky":"/static/vant/sticky/index"
}
}
\ No newline at end of file
static/nativeComponents/AreaNavigation/index.wxml deleted 100644 → 0
<!--static/nativeComponents/AreaNavigation/index.wxml-->
<van-sticky offset-top="{{showSpokesManHome?44:0}}" wx:if="{{datas.componentData.scrollPosition}}">
<view class="area-navigation clearfix" style="background-color:{{datas.componentData.backgroundColor}}">
<view style="width:100%;display:flex;">
<view class="area-l" style="font-size:{{datas.componentData.fontSize / 16 + 'em'}};color:{{datas.componentData.fontColor}};font-weight:{{datas.componentData.fontWeight}}" bindtap="changeOtherCity">
<view class="antt ant-gongsidizhi"></view>
<text class="title">{{positionName}}</text>
<van-icon name="arrow-down" style="margin-left:4rpx" />
</view>
<view class="area-r">
<input class="area-search" type="text" bindtap="toSearchPage" style="background-color:{{datas.componentData.searchBgColor}};font-size:{{datas.componentData.searchFontSize / 16 + 'em'}};color:{{datas.componentData.searchFontColor}};font-weight:{{datas.componentData.searchFontWeight}}">
</input>
</view>
</view>
</view>
</van-sticky>
<view wx:if="{{!datas.componentData.scrollPosition}}">
<view class="area-navigation clearfix" style="background-color:{{datas.componentData.backgroundColor}}">
<view style="width:100%;display:flex;">
<view class="area-l" style="font-size:{{datas.componentData.fontSize / 16 + 'em'}};color:{{datas.componentData.fontColor}};font-weight:{{datas.componentData.fontWeight}}" bindtap="changeOtherCity">
<view class="antt ant-gongsidizhi"></view>
<text class="title">{{positionName}}</text>
<van-icon name="arrow-down" style="margin-left:4rpx" />
</view>
<view class="area-r">
<input class="area-search" type="text" style="background-color:{{datas.componentData.searchBgColor}};font-size:{{datas.componentData.searchFontSize / 16 + 'em'}};color:{{datas.componentData.searchFontColor}};font-weight:{{datas.componentData.searchFontWeight}}">
</input>
</view>
</view>
</view>
</view>
<van-dialog
show="{{noShow}}"
use-slot
showConfirmButton="{{false}}"
>
<view class="change-dialog">
<view style="line-height:60rpx">您所在的地区暂未开放</view>
<view class="change-btn">切换其他城市</view>
</view>
</van-dialog>
<van-dialog
show="{{changeShow}}"
use-slot
showConfirmButton="{{false}}"
>
<view class="change-dialog">
<view style="line-height:60rpx">
定位显示为{{ positionCity.regionName }}
</view>
<view class="change-btn line-clamp1" bindtap="changeTo">
切换到{{ positionCity.regionName }}
</view>
<view class="continue line-clamp1" bindtap="continueBrowser">
继续浏览{{ designateAreaObj.regionName }}
</view>
</view>
</van-dialog>
static/nativeComponents/AreaNavigation/index.wxss deleted 100644 → 0
/* static/nativeComponents/AreaNavigation/index.wxss */
@import '../../nicon/iconfont.wxss';
.area-navigation {
width: 100%;
box-sizing: border-box;
padding: 12rpx 24rpx;
z-index: 99999999;
font-size: 32rpx;
top: 0;
}
.area-navigation-margintop {
padding-top: 100rpx;
}
.area-l{
line-height: 60rpx;
}
.area-l .ant-gongsidizhi{
line-height: 60rpx;
float: left;
}
.area-l .title{
display: block;
float: left;
}
.area-r {
margin-left: 20rpx;
flex: 1;
}
.area-search {
width: 100%;
height: 60rpx;
border-radius: 30rpx;
box-sizing: border-box;
padding: 0 24rpx;
line-height: 60rpx;
border: none;
}
.change-dialog {
text-align: center;
padding: 20rpx 80rpx 36rpx !important;
box-sizing: border-box;
}
.change-dialog .continue {
height: 60rpx;
padding: 0 20rpx;
box-sizing: border-box;
width: 100%;
border-radius: 30rpx;
background-color: white;
text-align: center;
line-height: 60rpx;
margin: 20rpx auto 0;
border: 1rpx solid #999;
font-size: 28rpx;
}
.change-dialog .change-btn {
height: 60rpx;
border-radius: 30rpx;
line-height: 60rpx;
margin: 20rpx auto 0;
width: 100%;
box-sizing: border-box;
color: white;
background-color: var(--main-color);
text-align: center;
font-size: 28rpx;
padding: 0 20rpx;
}
\ No newline at end of file
static/nativeComponents/GoodsList/index.js
...@@ -363,25 +363,36 @@ const componentOptions = { ...@@ -363,25 +363,36 @@ const componentOptions = {
} }
}, },
async briefProduct(query) { async briefProduct(query) {
await goodsApi.queryBriefProductInfo(query).then(res => { const storageIds = this.getStorageSync('ids');
if (res.data.code == 200) { storageIds[this.data.goodsListIndex] = query.terminalProductIds;
let data = res.data.data.list; this.setStorageSync('ids', storageIds);
let ids = data.map(element => {
let goodsList = this.render ? res.data.list : res.data.data.list;
return element.terminalProductId;
});
let storageIds = this.getStorageSync('ids') const storageDatasList = this.getStorageSync('storageDatasList');
storageIds[this.data.goodsListIndex] = ids storageDatasList[this.data.goodsListIndex] = this.data.datas.componentData;
this.setStorageSync('ids',storageIds) this.setStorageSync('storageDatasList', storageDatasList);
let storageDatasList = this.getStorageSync('storageDatasList')
storageDatasList[this.data.goodsListIndex] = this.data.datas.componentData
this.setStorageSync('storageDatasList',storageDatasList)
this.moreProduct(true); this.moreProduct(true);
}
}); // FIXME: 原来逻辑
// await goodsApi.queryBriefProductInfo(query).then(res => {
// if (res.data.code == 200) {
// let data = res.data.data.list;
// let ids = data.map(element => {
// let goodsList = this.render ? res.data.list : res.data.data.list;
// return element.terminalProductId;
// });
// let storageIds = this.getStorageSync('ids')
// storageIds[this.data.goodsListIndex] = ids
// this.setStorageSync('ids',storageIds)
// let storageDatasList = this.getStorageSync('storageDatasList')
// storageDatasList[this.data.goodsListIndex] = this.data.datas.componentData
// this.setStorageSync('storageDatasList',storageDatasList)
// this.moreProduct(true);
// }
// });
}, },
async moreProduct(flag) { async moreProduct(flag) {
...@@ -415,11 +426,12 @@ const componentOptions = { ...@@ -415,11 +426,12 @@ const componentOptions = {
goodsList = res.data.data; goodsList = res.data.data;
let pageGoodsList = this.data.pageGoodsList[this.data.goodsListIndex] || []; let pageGoodsList = this.data.pageGoodsList[this.data.goodsListIndex] || [];
this.goodsListVal(goodsList, 1,flag); this.goodsListVal(goodsList, 1,flag);
} else {
this.setData({ scrollLoading: false });
} }
}); });
}, },
goodsListVal(goodsList, type, flag) { goodsListVal(goodsList, type, flag) {
console.log('goodsListVal', goodsList, type, flag);
let { attributeValueList } = this.data.datas.componentData; let { attributeValueList } = this.data.datas.componentData;
goodsList.forEach((item, index) => { goodsList.forEach((item, index) => {
item.marketingTag = item.defaultTags item.marketingTag = item.defaultTags
...@@ -477,7 +489,6 @@ const componentOptions = { ...@@ -477,7 +489,6 @@ const componentOptions = {
pageGoodsList[that.data.datasIndex] = list; pageGoodsList[that.data.datasIndex] = list;
} }
this.setStorageSync('pageGoodsList', pageGoodsList); this.setStorageSync('pageGoodsList', pageGoodsList);
console.log('goodsListVal->2', that.data.goodsListIndex, that.data.datasIndex, list)
// 获取是否要开启请求拦截 // 获取是否要开启请求拦截
...@@ -752,7 +763,6 @@ const componentOptions = { ...@@ -752,7 +763,6 @@ const componentOptions = {
}); });
}, },
setStorageSync(key, val) { setStorageSync(key, val) {
console.log('setStorageSync->', this.data.storageKey, key, val)
return wx.setStorageSync(`${this.data.storageKey}_${key}`,val) return wx.setStorageSync(`${this.data.storageKey}_${key}`,val)
}, },
getStorageSync(key) { getStorageSync(key) {
......
static/nativeComponents/GoodsList/index.wxml
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
style="display:grid;grid-template-columns:repeat({{datas.componentData.columnNum}},minmax(0px, 1fr));gap:{{datas.componentData.proGap*2}}rpx;" style="display:grid;grid-template-columns:repeat({{datas.componentData.columnNum}},minmax(0px, 1fr));gap:{{datas.componentData.proGap*2}}rpx;"
> >
<view <view
wx:for="{{pageGoodsList[datasIndex]}}" wx:for="{{datas.componentData.goodsList}}"
wx:key="index" wx:key="index"
class="goods-item {{'goodsItemIndex'+index}}" class="goods-item {{'goodsItemIndex'+index}}"
style="margin-bottom:20rpx;" style="margin-bottom:20rpx;"
......
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