From 03d5631ace0bbdf47acdcfd2c03df5c0924aaf31 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 23 May 2019 19:57:23 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=89=B9=E4=BA=AB=E7=A4=BC=E9=81=87][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E7=89=B9=E4=BA=AB=E7=A4=BC=E9=81=87?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.js | 18 +--
config/config.js | 6 +-
pages/index/searchbar/detail/index.wxss | 1 -
pages/passCar/passCar.js | 20 +--
pages/specialcourtesy/specialcourtesy.wxml | 6 +-
pages/specialcourtesy/specialcourtesy.wxss | 145 +++++++++++++--------
pages/user/index.js | 123 ++++++++++-------
7 files changed, 187 insertions(+), 132 deletions(-)
diff --git a/app.js b/app.js
index d53c374..8712f83 100644
--- a/app.js
+++ b/app.js
@@ -5,7 +5,6 @@ App({
data: {},
onLaunch: function (options) {
var that = this;
- console.log("onLuanch")
that.globalData.sceneAddress = options.scene;
/**
* 用户登录
@@ -99,21 +98,6 @@ App({
}
})
},
- /**
- * 获取地址位置信息
- */
- getLocation: function () {
- var that = this;
- wx.getLocation({
- type: "wgs84",
- success: function (res) {
- that.globalData.locationInfo = res;
- },
- fail: error => {
- console.log(error);
- }
- });
- },
globalData: {
// token
token: null,
@@ -134,7 +118,7 @@ App({
carLogin: false,
// 当前商场信息
market: {
- name: "陕西大悦城"
+ name: ""
},
// websocket
socketClient: null,
diff --git a/config/config.js b/config/config.js
index e5f8699..545d644 100755
--- a/config/config.js
+++ b/config/config.js
@@ -281,7 +281,11 @@ var config = {
/**
* 会员积分记录
*/
- integralList:'/credit/list'
+ integralList:'/credit/list',
+ /**
+ * 用户更新位置信息
+ */
+ updateLBS:"/user/updateLBS"
},
weapp: {
AppId: weappId
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index 65c41a2..94ea8c8 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -45,7 +45,6 @@
.merchant-detail {
width: 100%;
- padding: 30rpx 0 0;
background: #fff;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 278c88c..8fd9d13 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -145,23 +145,23 @@ Page({
appId: config.weapp.AppId,
}
})
- .then(res => {
- let weapNote = JSON.parse(res.data.weapNote);
- that.setData({
- desc: weapNote.carpage.desc,
- title: weapNote.carpage.title
- })
- })
- .catch(err => {
- console.log(err);
+ .then(res => {
+ let weapNote = JSON.parse(res.data.weapNote);
+ that.setData({
+ desc: weapNote.carpage.desc,
+ title: weapNote.carpage.title
})
+ })
+ .catch(err => {
+ console.log(err);
+ })
// 登录
var scene = decodeURIComponent(options.scene);
that.setData({
scene: scene
});
if (app.globalData.token) { } else {
- app.getLocation();
+ // app.getLocation();
that.userLogin()
}
},
diff --git a/pages/specialcourtesy/specialcourtesy.wxml b/pages/specialcourtesy/specialcourtesy.wxml
index 373fe71..878cba6 100644
--- a/pages/specialcourtesy/specialcourtesy.wxml
+++ b/pages/specialcourtesy/specialcourtesy.wxml
@@ -19,7 +19,11 @@
{{item.discount/10}}折
{{item.merchantName}}