Commit 4ddd37da by 程默

Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

parents 6c7850ed 3f29eeda
{ {
"description": "项目配置文件。", "description": "项目配置文件。",
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"enhance": true, "enhance": true,
"postcss": true, "postcss": true,
"minified": true, "minified": true,
"newFeature": true, "newFeature": true,
"coverView": true, "coverView": true,
"nodeModules": true, "nodeModules": true,
"autoAudits": true, "autoAudits": true,
"showShadowRootInWxmlPanel": false, "showShadowRootInWxmlPanel": false,
"scopeDataCheck": false, "scopeDataCheck": false,
"uglifyFileName": true, "uglifyFileName": true,
"checkInvalidKey": true, "checkInvalidKey": true,
"checkSiteMap": true, "checkSiteMap": true,
"uploadWithSourceMap": true, "uploadWithSourceMap": true,
"useMultiFrameRuntime": true, "useMultiFrameRuntime": true,
"useApiHook": true, "useApiHook": true,
"useApiHostProcess": true, "useApiHostProcess": true,
"babelSetting": { "babelSetting": {
"ignore": [], "ignore": [],
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"bundle": false, "bundle": false,
"useIsolateContext": true, "useIsolateContext": true,
"useCompilerModule": true, "useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false, "userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false, "userConfirmedBundleSwitch": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
"minifyWXSS": true "minifyWXSS": true
}, },
"miniprogramRoot": "dist/wx/", "miniprogramRoot": "dist/wx/",
"compileType": "miniprogram", "compileType": "miniprogram",
"appid": "wx8a509d2f2ac15903", "appid": "wx8a509d2f2ac15903",
"projectname": "mayi-mp-shop", "projectname": "mayi-mp-shop",
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},
"libVersion": "2.15.0", "libVersion": "2.15.0",
"condition": { "condition": {
"plugin": { "plugin": {
"list": [] "list": []
}, },
"game": { "game": {
"list": [] "list": []
}, },
"gamePlugin": { "gamePlugin": {
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"list": [ "list": [
{ {
"id": 0, "id": 0,
"name": "pages/index/main", "name": "pages/index/main",
"pathName": "pages/index/main", "pathName": "pages/index/main",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": -1, "id": -1,
"name": "pages/login/main", "name": "pages/login/main",
"pathName": "pages/login/main", "pathName": "pages/login/main",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"id": 2, "id": 2,
"name": "pages/index/main", "name": "pages/index/main",
"pathName": "pages/index/main", "pathName": "pages/index/main",
"query": "scene=pid_6141", "query": "scene=pid_6141",
"scene": 1047 "scene": 1047
}, },
{ {
"name": "pages/tabBar1/main", "name": "pages/tabBar1/main",
"pathName": "pages/tabBar1/main", "pathName": "pages/tabBar1/main",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "pages/tabBar4/main", "name": "pages/tabBar4/main",
"pathName": "pages/tabBar4/main", "pathName": "pages/tabBar4/main",
"query": "", "query": "",
"scene": null "scene": null
}, },
{ {
"name": "pages/home/main", "name": "pages/home/main",
"pathName": "pages/home/main", "pathName": "pages/home/main",
"scene": null "scene": null
} }
] ]
} }
} }
} }
\ No newline at end of file
...@@ -52,13 +52,16 @@ ...@@ -52,13 +52,16 @@
reLocationStatus: true, reLocationStatus: true,
systemInfo : null, systemInfo : null,
tabbarHeight : 0, tabbarHeight : 0,
noLocation : '' noLocation : '',
areaGroupId : ''
} }
}, },
onLoad(options){ onLoad(options){
this.noLocation = options.noLocation this.noLocation = options.noLocation
this.areaGroupId = options.areaGroupId
this.systemInfo = wx.getSystemInfoSync() this.systemInfo = wx.getSystemInfoSync()
let menuButtonInfo = wx.getMenuButtonBoundingClientRect() let menuButtonInfo = wx.getMenuButtonBoundingClientRect()
...@@ -104,15 +107,14 @@ ...@@ -104,15 +107,14 @@
changeCity(item,type){ changeCity(item,type){
this.locationStatus = true this.locationStatus = true
if(type == 1){ if(type == 1){
wx.setStorageSync('location',JSON.stringify({ wx.setStorageSync('location',JSON.stringify({
id : item.operatingAreaAreaId, id : item.operatingAreaAreaId,
regionName : item.regionName, regionName : item.regionName,
regionType : item.regionType, regionType : item.regionType,
systemRegionId : item.systemRegionId, systemRegionId : item.systemRegionId,
areaGroupId : item.groupId, areaGroupId : this.areaGroupId,
outId : item.outId outId : item.outId
})) }))
}else{ }else{
...@@ -121,7 +123,7 @@ ...@@ -121,7 +123,7 @@
regionName : item.regionName, regionName : item.regionName,
regionType : item.regionType, regionType : item.regionType,
systemRegionId : item.systemRegionId, systemRegionId : item.systemRegionId,
areaGroupId : item.areaGroupId, areaGroupId : this.areaGroupId,
outId : item.outId outId : item.outId
})) }))
} }
......
...@@ -37,6 +37,8 @@ Component({ ...@@ -37,6 +37,8 @@ Component({
designateAreaObj: this.data.datas.componentData.designateAreaObj designateAreaObj: this.data.datas.componentData.designateAreaObj
}) })
console.log(this.data.datas.componentData.designateAreaObj,'2222')
if (!wx.getStorageSync('location')) { if (!wx.getStorageSync('location')) {
wx.navigateTo({ wx.navigateTo({
url: `/pages/changeAdr/main?areaGroupId=${this.data.datas.componentData.designateAreaObj.areaGroupId}&noLocation=1` url: `/pages/changeAdr/main?areaGroupId=${this.data.datas.componentData.designateAreaObj.areaGroupId}&noLocation=1`
...@@ -306,7 +308,7 @@ Component({ ...@@ -306,7 +308,7 @@ Component({
}, },
continueBrowser(){ continueBrowser(){
console.log(this.data.designateAreaObj) console.log(this.data.designateAreaObj,'this.data.designateAreaObj')
wx.setStorageSync('location', JSON.stringify(this.data.designateAreaObj)) wx.setStorageSync('location', JSON.stringify(this.data.designateAreaObj))
this.setData({ this.setData({
positionName: this.data.designateAreaObj.regionName, positionName: this.data.designateAreaObj.regionName,
......
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