diff --git a/app.js b/app.js
index e95b50c..53c2aa5 100644
--- a/app.js
+++ b/app.js
@@ -2,6 +2,12 @@
import commonApi from "./utils/https/common"
App({
onLaunch: function (options) {
+ if(options.query.authCode){
+ wx.setStorageSync('authCode', options.query.authCode)
+ }
+ else {
+ wx.removeStorageSync('authCode')
+ }
this.updateApp()
let rect = wx.getSystemInfoSync();
this.globalData.safeBottom = rect.safeArea?(rect.safeArea.bottom - rect.safeArea.height):0
@@ -11,37 +17,28 @@ App({
this.globalData.uuid = res.data.uuid;
wx.setStorageSync('uuid', res.data.uuid)
})
- // 展示本地存储能力
- var logs = wx.getStorageSync('logs') || []
- logs.unshift(Date.now())
- wx.setStorageSync('logs', logs)
+
- // 登录
- wx.login({
- success: res => {
- // 发送 res.code 到后台换取 openId, sessionKey, unionId
- }
- })
// 获取用户信息
- wx.getSetting({
- success: res => {
- if (res.authSetting['scope.userInfo']) {
- // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
- wx.getUserInfo({
- success: res => {
- // 可以将 res 发送给后台解码出 unionId
- this.globalData.userInfo = res.userInfo
+ // wx.getSetting({
+ // success: res => {
+ // if (res.authSetting['scope.userInfo']) {
+ // // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
+ // wx.getUserInfo({
+ // success: res => {
+ // // 可以将 res 发送给后台解码出 unionId
+ // this.globalData.userInfo = res.userInfo
- // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
- // 所以此处加入 callback 以防止这种情况
- if (this.userInfoReadyCallback) {
- this.userInfoReadyCallback(res)
- }
- }
- })
- }
- }
- })
+ // // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+ // // 所以此处加入 callback 以防止这种情况
+ // if (this.userInfoReadyCallback) {
+ // this.userInfoReadyCallback(res)
+ // }
+ // }
+ // })
+ // }
+ // }
+ // })
this.getShareCategoryId()
},
// 更新提示
@@ -178,7 +175,7 @@ App({
'OFFLINE_WAIT':'线下退款处理中'
},
codeState:['未使用','已使用','已失效','已取消'],
- weburl:"",
+ weburl:"https://wechat.b2c.zj-trip.net",
pay_methods:{
NONE:"无需支付",
WEIXIN:"微信支付",
diff --git a/pages/index/index.js b/pages/index/index.js
index d274e4d..33d914b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -2,6 +2,7 @@
//获取应用实例
let app = getApp()
import commonApi from "../../utils/https/common"
+import userApi from "../../utils/https/user"
import util from "../../utils/util"
Page({
data: {
@@ -353,7 +354,6 @@ Page({
}
break;
case 3:
- console.log(item.tdata);
if((item.tdata.indexOf('http://')!=-1 || item.tdata.indexOf('https://')!=-1) && item.tdata.indexOf('m.cloud.sz-trip.com')==-1){
// 外部h5
console.log(item.tdata)
@@ -387,10 +387,33 @@ Page({
}
break;
case 4:
- wx.navigateToMiniProgram({
- appId: item.tdata.appid,
- path:item.tdata.page
- })
+ if(item.tdata.appid=='wxe5ca0f71e918e352' && wx.getStorageSync('jstrip_userid')){
+ // 如果是苏心游的小程序 直接把authCode带过去
+ userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
+ let weburl = item.tdata.page
+ if(weburl.indexOf('?')!=-1){
+ weburl += '&authCode='+res.data;
+ }
+ else {
+ weburl += '?authCode='+res.data
+ }
+ wx.navigateToMiniProgram({
+ appId: item.tdata.appid,
+ path:weburl
+ })
+ }).catch(err=>{
+ wx.navigateToMiniProgram({
+ appId: item.tdata.appid,
+ path:item.tdata.page
+ })
+ })
+ }
+ else {
+ wx.navigateToMiniProgram({
+ appId: item.tdata.appid,
+ path:item.tdata.page
+ })
+ }
break;
default:
break;
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index 2fb6811..c9d9a12 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -37,9 +37,12 @@
wx:if="{{info && info.scene_data && info.scene_data.id}}" class="scene-box">
- {{info.scene_data.title}}
+
+ {{info.scene_data.title}}
+ 查看 >>
+
{{info.scene_data.address}}
- 查看详情
+
diff --git a/pages/info/activityInfo/index.wxss b/pages/info/activityInfo/index.wxss
index cba4f6b..e4b81f2 100644
--- a/pages/info/activityInfo/index.wxss
+++ b/pages/info/activityInfo/index.wxss
@@ -100,7 +100,7 @@
display: flex;
justify-content: space-between;
width: 697rpx;
- height: 193rpx;
+ height: 140rpx;
background: #FFFFFF;
box-shadow: 0px 0px 16rpx 0px rgba(0, 0, 0, 0.14);
border-radius: 13rpx;
@@ -113,23 +113,33 @@
}
.scene-box image {
display: block;
- width: 253rpx;
+ width: 120rpx;
margin: 20rpx;
- height: 153rpx;
+ height: 100rpx;
flex-shrink: 0;
margin-right: 26rpx;
}
.scene-info {
flex: 1;
- width: 400rpx;
+ width: 500rpx;
margin: 20rpx;
margin-left: 0;
}
+.scene-title-box {
+ display: flex;
+ font-size: 24rpx;
+ color: #0B898E;
+ justify-content: space-between;
+ align-items: center;
+}
.scene-title {
color: #000;
font-size: 31rpx;
font-weight: 500;
}
+.scene-title-box view:nth-child(2){
+ flex-shrink: 0;
+}
.scene-address {
color: #999;
font-size: 25rpx;
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 95355ee..97bbea4 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -29,6 +29,22 @@ Page({
})
})
}
+ else if(app.globalData.weburl.indexOf('m.jszhwlpt.com')!=-1 || app.globalData.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
+ // 如果是去苏心游或者镇江的话
+ userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
+ let weburl = app.globalData.weburl
+ if(weburl.indexOf('?')!=-1){
+ weburl += '&original_sys_name=jdsz&auth_code='+res.data;
+ }
+ else {
+ weburl += '?original_sys_name=jdsz&auth_code='+res.data
+ }
+ this.setData({
+ info:res.data,
+ webUrl:weburl
+ })
+ })
+ }
else {
this.setData({
webUrl:app.globalData.weburl
diff --git a/project.private.config.json b/project.private.config.json
index 2e4c4c5..b3b1e72 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -13,9 +13,9 @@
"miniprogram": {
"list": [
{
- "name": "pages/order/joinOrder/success/index",
- "pathName": "pages/order/joinOrder/index",
- "query": "id=1001",
+ "name": "pages/index/index",
+ "pathName": "pages/index/index",
+ "query": "authCode=2c290d21383ccd3350747bba95f306f0",
"scene": null
},
{
diff --git a/utils/https.js b/utils/https.js
index 7bc570f..fc1d46c 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -103,6 +103,39 @@ function _post(url,data={}) {
}
function user_post(url,data={}){
+ console.log(wx.getStorageSync('authCode'))
+ if(wx.getStorageSync('authCode')){
+ // 如果有授权码的话 用授权码去获取下用户信息
+ return new Promise((resolved,rejected)=>{
+ _post("/uservice/user/loginWithUserCenterAuthCode",{
+ auth_code:wx.getStorageSync('authCode')
+ }).then(res=>{
+ if(res && res.data){
+ wx.setStorageSync('jstrip_userid', res.data.id)
+ wx.setStorageSync('jstrip_token', res.data.token)
+ wx.setStorageSync('jstrip_userInfo', res.data)
+ wx.removeStorageSync('authCode')
+ }
+ user_post_new(url,data).then(res=>{
+ resolved(res)
+ }).catch(err=>{
+ rejected(err)
+ })
+ }).catch(err=>{
+ user_post_new(url,data).then(res=>{
+ resolved(res)
+ }).catch(err=>{
+ rejected(err)
+ })
+ })
+ })
+
+ }
+ else {
+ return user_post_new(url,data)
+ }
+}
+function user_post_new(url,data={}){
var token = wx.getStorageSync("jstrip_token"),userId = wx.getStorageSync("jstrip_userid");
//为了用户体验，加一个loading效果
wx.showLoading({ title: '加载中', mask: true });
@@ -140,7 +173,11 @@ function user_post(url,data={}){
header: header,
success: (res) => {
wx.hideLoading();
- if (res.data.code == 401) {
+ console.log(url)
+ if(url.indexOf('user/getJumpThirdAppCode')!=-1){
+
+ }
+ else if (res.data.code == 401) {
// 登录出现问题，需要重新登录
wx.removeStorageSync("jstrip_userid");
wx.removeStorageSync("jstrip_token");