From 4b6e9d9e91c2a2c54c21b1a2df6c0265c54b1043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=85=A2=E6=85=A2?= <994797151@qq.com>
Date: Mon, 24 May 2021 15:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/interfaces/index.js    |  2 +-
 api/request.js             |  4 ++--
 pages/classify/classify.js | 19 +++++++++++++++----
 pages/index/index.js       |  5 ++++-
 project.config.json        |  4 ++--
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/api/interfaces/index.js b/api/interfaces/index.js
index 30037ff..adcc8f2 100644
--- a/api/interfaces/index.js
+++ b/api/interfaces/index.js
@@ -8,7 +8,7 @@ const index = (area_name, user_lng, user_lat) => req({url: "home", data: {area_n
 const choice = (type, area_name, user_lng, user_lat) => req({url: "home/group", data: {type: type,area_name: area_name, user_lng: user_lng, user_lat:user_lat}})
 
 //权益分类
-const classify = (category_id) => req({url: "categories/" + category_id})
+const classify = (category_id, area_name, user_lng, user_lat) => req({url: "categories/" + category_id, data: {area_name: area_name, user_lng: user_lng, user_lat:user_lat}})
 
 //周五福利详情
 const welfares = (welfare_id) => req({url: "welfare/" + welfare_id})
diff --git a/api/request.js b/api/request.js
index 7365d7c..bfe24b0 100644
--- a/api/request.js
+++ b/api/request.js
@@ -2,8 +2,8 @@ import {errInfo} from './err'
 import {updToken} from './updateToken'
 
 // 请求方式配置
-// https://card.ysd-bs.com
-const api 	 = "https://lifetest.ysd-bs.com/api/" //正式地址
+//  https://card.ysd-bs.com 正式地址
+const api 	 = "https://lifetest.ysd-bs.com/api/" //测试地址
 const header = {
 	"Accept"	: "application/json"
 }
diff --git a/pages/classify/classify.js b/pages/classify/classify.js
index c886244..cc9fd4e 100644
--- a/pages/classify/classify.js
+++ b/pages/classify/classify.js
@@ -15,15 +15,26 @@ Page({
         content     : '',  //内容简介
         noticeShow  : '',   //公告开关
         infoItems   : [],   //卡券专区
+        id          : '',
+        areaname    : '',
+        latitude    : '',
+        userlng     : ''
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad (options) {
-        this.indexNav(options.id)
-    },
+        this.setData({
+            id       : options.id,
+            areaname : options.areaname,
+            latitude : options.latitude,
+            userlng  : options.userlng
+        })
 
+        this.indexNav(options.id,options.areaname,options.latitude,options.userlng)
+
+    },
     /**
      * 生命周期函数--监听页面显示
      */
@@ -34,8 +45,8 @@ Page({
     /**
      * 卡权益分类
      */
-    indexNav(id) {
-        wx.$api.index.classify(id).then(res=>{
+    indexNav(id, areaname,latitude,userlng) {
+        wx.$api.index.classify(id, areaname,latitude,userlng).then(res=>{
             this.setData({
                 noticeData  : res.data.notice,
                 infoData    : res.data.info,
diff --git a/pages/index/index.js b/pages/index/index.js
index e060074..fb3abe9 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -146,12 +146,15 @@ Page({
      * 处理未登录时的转跳
      */
     userNav(e){
+        let user_lng  = this.data.longitude,  //经度
+            user_lat  = this.data.latitude,   //纬度
+            area_name = this.data.address.area//城市名称
         let id   = e.currentTarget.dataset.id
         wx.getStorage({
             key     : 'token',
             success:res=>{
                 wx.navigateTo({
-                  url: '/pages/classify/classify?id=' + id
+                  url: '/pages/classify/classify?id=' + id + '&userlng=' + user_lng + '&latitude=' + user_lat + '&areaname=' + area_name
                 })
             },
             fail: (err) => {
diff --git a/project.config.json b/project.config.json
index 042a07e..070976e 100644
--- a/project.config.json
+++ b/project.config.json
@@ -41,8 +41,8 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.12.1",
-    "appid": "wxb2e3e8091d9feac3",
-    "projectname": "%E4%BA%BF%E6%97%B6%E4%BB%A3",
+    "appid": "wx8e424dbdc443381f",
+    "projectname": "%E4%BA%BF%E6%97%B6%E4%BB%A3%EF%BC%88%E6%B5%8B%E8%AF%95%EF%BC%89",
     "debugOptions": {
         "hidedInDevtools": []
     },