diff --git a/app.js b/app.js
index 76fae02..446bedd 100644
--- a/app.js
+++ b/app.js
@@ -22,7 +22,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest9?true:false;
+ data.isTest = data.isTest11?true:false;
this.globalData.configJson = data
})
diff --git a/pages/index/index.js b/pages/index/index.js
index 6a88f34..64b1a2f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -29,7 +29,8 @@ Page({
urltopage:{},
scrollLeft:0,
videoPrize:false,
- prizeInfo:null
+ prizeInfo:null,
+ otherPlat:null
},
onLoad: function (options) {
if(options.from){
@@ -260,6 +261,13 @@ Page({
url:"/pages/pbService/web/index"
})
},
+ gotoMini:function(e){
+ let appid = e.currentTarget.dataset.appid,path = e.currentTarget.dataset.path
+ wx.navigateToMiniProgram({
+ appId: appid,
+ path:path
+ })
+ },
garbage:function(){
wx.navigateToMiniProgram({
appId: 'wx13be821f3b1afed3',
@@ -499,8 +507,10 @@ Page({
if(app.globalData.configJson){
this.setData({
indexHot:app.globalData.configJson.indexHot,
- isTest:app.globalData.configJson.isTest
+ isTest:app.globalData.configJson.isTest,
+ otherPlat:app.globalData.configJson.otherPlats
})
+ console.log(app.globalData.configJson)
this.getFourProduct()
}
else {
@@ -509,6 +519,26 @@ Page({
},300)
}
},
+ gotoOther:function(e){
+ let item = e.currentTarget.dataset.item;
+ if(item.type=='h5'){
+ app.globalData.weburl = item.url
+ wx.navigateTo({
+ url:"/pages/pbService/web/index"
+ })
+ }
+ else if(item.type=='mini'){
+ wx.navigateToMiniProgram({
+ appId: item.appid,
+ path:item.path
+ })
+ }
+ else if(item.type=='page'){
+ wx.navigateTo({
+ url: item.page,
+ })
+ }
+ },
/**
* 用户点击右上角分享
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index d13eca8..6d813a7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -49,7 +49,7 @@
一卡游苏州
-
+
场馆预约
@@ -259,6 +259,10 @@
文旅单位
+
+
+ 国保微展示
+
@@ -273,10 +277,21 @@
wx:for="{{10}}" src="https://static.ticket.sz-trip.com/xcxImages/index/six{{index+1}}.png" mode="widthFix">
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 278e5bc..d378928 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -583,4 +583,26 @@
left: 0;
right: 0;
top: 120rpx;
+}
+.other-plats {
+ display: flex;
+ font-size: 25rpx;
+ margin: 20rpx;
+ text-align: center;
+ margin-bottom: 70rpx;
+ color: #333333;
+ line-height: 42rpx;
+ flex-wrap: wrap;
+}
+.other-plats image {
+ width: 107rpx;
+ display: block;
+ height: 107rpx;
+}
+.other-plat {
+ margin-right: 79rpx;
+ margin-top: 20rpx;
+}
+.other-plat:nth-child(4n){
+ margin-right: 0;
}
\ No newline at end of file
diff --git a/pages/user/user.js b/pages/user/user.js
index d4dd12a..a48712b 100644
--- a/pages/user/user.js
+++ b/pages/user/user.js
@@ -1,6 +1,7 @@
import common from "../../utils/https/common";
// pages/user/user.js
import userApi from "../../utils/https/user"
+let app = getApp()
Page({
/**
@@ -21,6 +22,12 @@ Page({
})
},
+ supplier:function(){
+ app.globalData.weburl = "https://m.cloud.sz-trip.com/Audit"
+ wx.navigateTo({
+ url: '/pages/pbService/web/index',
+ })
+ },
retail:function(){
common.user_post('commission/getCommissionUser',{}).then(res=>{
if(res.code==0){
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 9af4ba4..29787f8 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -61,9 +61,9 @@
我的收藏
-
+
商户审核
-
+