From c71889f5befce83e493b38af47696fc4914d9e1c Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 23 Sep 2021 19:59:26 +0800
Subject: [PATCH] no message

---
 components/popup/index.wxss | 3 +--
 pages/home/index/index.js   | 4 ++--
 pages/home/index/index.wxml | 1 +
 pages/index/index.js        | 9 +++------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/components/popup/index.wxss b/components/popup/index.wxss
index c9c3870..28686f1 100644
--- a/components/popup/index.wxss
+++ b/components/popup/index.wxss
@@ -1,8 +1,7 @@
 .wux-popup {
   position: fixed;
-  z-index: 1000;
   width: 100%;
-  max-width: 680rpx
+  max-width: 640rpx
 }
 .wux-popup-position.wux-popup-position--center .wux-popup {
   top: 50%;
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 191a584..c223f51 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -199,14 +199,14 @@ Component({
     onShareAppMessage: function () {
       return {
         title: '纸通宝--废纸交易、最新情报、最优资讯',
-        path: '/pages/home/index'
+        path: '/pages/index/index'
       }
     },
     // 分享至朋友圈
     onShareTimeline() {
       return {
         title: '纸通宝--废纸交易、最新情报、最优资讯',
-        path: '/pages/home/index'
+        path: '/pages/index/index'
       }
     },
   }
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 0cee596..b17f678 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -160,6 +160,7 @@
 					<view style="font-size: 26rpx;margin-top: 8rpx;">千鸟物流</view>
 				</wux-grid>
 				<wux-grid hover-class="none">
+				  <!-- <button></button> -->
 					<image style="height: 68rpx;width: 68rpx;margin-top: 18rpx;" src="/assets/myinfo/fxztb.png"></image>
 					<view style="font-size: 26rpx;margin-top: 8rpx;">分享纸通宝</view>
 				</wux-grid>
diff --git a/pages/index/index.js b/pages/index/index.js
index 831e3fc..27dcadd 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -7,10 +7,7 @@ const wxqqmap = require('../../libs/qqmap-wx-jssdk.min')
 const event = require('../../utils/event')
 const storage = require('../../utils/storage')
 const app = getApp()
-const qqwxmap = new wxqqmap({
-  key: 'GAMBZ-CBGCK-GB6J3-A6PJX-F6ZHH-IWFUD' // 必填，这里最好填自己申请的的 
-  // key: 'NGOBZ-UL7ED-WJ34D-PMWW7-LBDI2-J5FYK'
-})
+const qqwxmap = new wxqqmap({ key: 'GAMBZ-CBGCK-GB6J3-A6PJX-F6ZHH-IWFUD'})
 var fragments = []
 
 Page({
@@ -87,7 +84,7 @@ Page({
   defaultIndex: function () {
     this.locationing()
     this.onResume()
-    if (this.data.path) {
+    if (this.data.path && '/pages/index/index' != this.data.path) {
       util.navigateTo(this.data.path)
     }
     getPopupInfo().then(result => {
@@ -106,7 +103,7 @@ Page({
           location: res,
           success: function (res) {
             app.nowLocation.cityName = res.result.address_component.city.replace('市', '')
-            app.nowLocation.cityCode = res.result.ad_info.city_code
+            app.nowLocation.cityCode = res.result.ad_info.city_code.replace('156', '')
             if(!app.nowCity){
               app.nowCity = { cityName: app.nowLocation.cityName, cityCode: app.nowLocation.cityCode }
               that.setData({ cityName: app.nowLocation.cityName })