Bladeren bron

Merge branch 'xiaoMaDoor' into dev

tags/福建版C.9.1.01
meo 5 jaren geleden
bovenliggende
commit
2e9920e847
53 gewijzigde bestanden met toevoegingen van 1393 en 1262 verwijderingen
  1. +10
    -10
      app.json
  2. +1
    -1
      components/navbar/navbar.js
  3. +65
    -0
      custom-tab-bar/index.js
  4. +3
    -0
      custom-tab-bar/index.json
  5. +8
    -0
      custom-tab-bar/index.wxml
  6. +38
    -0
      custom-tab-bar/index.wxss
  7. +15
    -15
      ext.json
  8. +15
    -24
      index/index.js
  9. +12
    -0
      index/index.json
  10. +19
    -4
      index/index.wxml
  11. +1
    -1
      index/index.wxss
  12. +773
    -767
      index/passCar.js
  13. +0
    -0
      index/passCar.json
  14. +1
    -1
      index/passCar.wxml
  15. +1
    -1
      index/passCar.wxss
  16. +10
    -5
      index/searchbar.js
  17. +0
    -0
      index/searchbar.json
  18. +0
    -0
      index/searchbar.wxml
  19. +0
    -0
      index/searchbar.wxss
  20. +236
    -276
      index/user.js
  21. +2
    -2
      index/user.json
  22. +141
    -103
      index/user.wxml
  23. +3
    -1
      index/user.wxss
  24. +1
    -1
      pages/acSignIn/index.js
  25. +2
    -2
      pages/addPark/addPark.js
  26. +1
    -1
      pages/bannerdetail/index.js
  27. +1
    -1
      pages/bargain/bargain.js
  28. +1
    -1
      pages/bargain/bargainDatail/bargainDatail.js
  29. +1
    -1
      pages/cardorder/index/index.js
  30. +1
    -1
      pages/cardorder/index/index.wxml
  31. +1
    -1
      pages/coupon/detail/index.js
  32. +1
    -1
      pages/couponorder/index/index.js
  33. +1
    -1
      pages/couponorder/index/index.wxml
  34. +1
    -1
      pages/discountCardList/discountCardList.js
  35. +1
    -1
      pages/discountCardList/discountCardList.wxml
  36. +2
    -2
      pages/getphoneInfo/index.js
  37. +5
    -5
      pages/getuserinfo/index.js
  38. +5
    -5
      pages/index/index.js
  39. +1
    -1
      pages/index/searchbar/detail/index.js
  40. +1
    -1
      pages/integralmall/index.js
  41. +1
    -1
      pages/integralmall/payIntegcouponStatus/index.js
  42. +0
    -12
      pages/main/index.json
  43. +1
    -1
      pages/order/index/index.js
  44. +1
    -1
      pages/passCar/couponList/couponList.wxml
  45. +1
    -1
      pages/radetail/index.js
  46. +1
    -1
      pages/radetail/success/index.js
  47. +1
    -1
      pages/rushToBuy/index.js
  48. +1
    -1
      pages/specialcourtesy/specialcourtesy.js
  49. +1
    -1
      pages/spellDetail/index.js
  50. +1
    -1
      pages/spellGroup/mySpellGroup/index.js
  51. +1
    -1
      pages/spellGroup/spellGroup.js
  52. +1
    -1
      pages/topicDetail/index.js
  53. +1
    -1
      pages/user/myactivity/index.js

+ 10
- 10
app.json Bestand weergeven

@@ -1,6 +1,10 @@
{
"pages": [
"pages/index/index",
"index/index",
"index/searchbar",
"index/passCar",
"index/user",
"pages/integralmall/integraHistory/index",
"pages/integralmall/payIntegcouponStatus/index",
"pages/integralmall/payIntegcoupondetail/index",
@@ -13,8 +17,6 @@
"pages/complete/index",
"pages/topicDetail/index",
"pages/acSignIn/index",
"pages/main/index",
"pages/index/searchbar/index",
"pages/index/merchantList/index",
"pages/index/searchbar/detail/index",
"pages/bargain/bargainDatail/bargainDatail",
@@ -27,7 +29,6 @@
"pages/bannerdetail/index",
"pages/getuserinfo/index",
"pages/phoneinput/phoneinput",
"pages/user/index",
"pages/user/myactivity/index",
"pages/coupon/detail/index",
"pages/rushToBuy/index",
@@ -38,7 +39,6 @@
"pages/order/detail/index",
"pages/order/index/index",
"pages/ques/ques",
"pages/passCar/passCar",
"pages/getphoneInfo/index",
"pages/addPark/addPark",
"pages/orderquanma/index",
@@ -70,35 +70,35 @@
}
},
"tabBar": {
"color": "#abb1be",
"selectedColor": "#FD782D",
"custom": true,
"list": [
{
"pagePath": "pages/main/index",
"pagePath": "index/index",
"iconPath": "assets/images/home.png",
"selectedIconPath": "assets/images/home-a.png",
"text": "首页"
},
{
"pagePath": "pages/index/searchbar/index",
"pagePath": "index/searchbar",
"iconPath": "assets/images/mendian.png",
"selectedIconPath": "assets/images/mendian-a.png",
"text": "门店"
},
{
"pagePath": "pages/passCar/passCar",
"pagePath": "index/passCar",
"iconPath": "assets/images/park.png",
"selectedIconPath": "assets/images/park-a.png",
"text": "停车"
},
{
"pagePath": "pages/user/index",
"pagePath": "index/user",
"iconPath": "assets/images/user.png",
"selectedIconPath": "assets/images/user-a.png",
"text": "我的"
}
]
},
"usingComponents": {},
"window": {
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#FFFFFF",


+ 1
- 1
components/navbar/navbar.js Bestand weergeven

@@ -32,7 +32,7 @@ Component({
methods: {
backHome: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
back: function () {


+ 65
- 0
custom-tab-bar/index.js Bestand weergeven

@@ -0,0 +1,65 @@
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let ifStoreApp = extConfig.attr.ifStoreApp;
Component({
data: {
selected: 0,
"color": "#abb1be",
"selectedColor": "#FD782D",
"list": [
{
"pagePath": "/index/index",
"iconPath": "../assets/images/home.png",
"selectedIconPath": "../assets/images/home-a.png",
"text": "首页"
},
{
"pagePath": "/index/searchbar",
"iconPath": "../assets/images/mendian.png",
"selectedIconPath": "../assets/images/mendian-a.png",
"text": "门店"
},
{
"pagePath": "/index/passCar",
"iconPath": "../assets/images/park.png",
"selectedIconPath": "../assets/images/park-a.png",
"text": "停车"
},
{
"pagePath": "/index/user",
"iconPath": "../assets/images/user.png",
"selectedIconPath": "../assets/images/user-a.png",
"text": "我的"
}
]
},
attached() {
if (ifStoreApp==1){
this.setData({
list: [
{
"pagePath": "/index/index",
"iconPath": "../assets/images/home.png",
"selectedIconPath": "../assets/images/home-a.png",
"text": "首页"
},
{
"pagePath": "/index/user",
"iconPath": "../assets/images/user.png",
"selectedIconPath": "../assets/images/user-a.png",
"text": "我的"
}
]
})
}
},
methods: {
switchTab(e) {
const data = e.currentTarget.dataset
const url = data.path
wx.switchTab({url})
this.setData({
selected: data.index
})
}
}
})

+ 3
- 0
custom-tab-bar/index.json Bestand weergeven

@@ -0,0 +1,3 @@
{
"component": true
}

+ 8
- 0
custom-tab-bar/index.wxml Bestand weergeven

@@ -0,0 +1,8 @@
<!--miniprogram/custom-tab-bar/index.wxml-->
<cover-view class="tab-bar">
<cover-view class="tab-bar-border"></cover-view>
<cover-view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
<cover-image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></cover-image>
<cover-view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</cover-view>
</cover-view>
</cover-view>

+ 38
- 0
custom-tab-bar/index.wxss Bestand weergeven

@@ -0,0 +1,38 @@
.tab-bar {
position: fixed;
bottom: 0;
left: 0;
right: 0;
height: 48px;
background: white;
display: flex;
padding-bottom: env(safe-area-inset-bottom);
}

.tab-bar-border {
background-color: rgba(0, 0, 0, 0.33);
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 1px;
transform: scaleY(0.5);
}

.tab-bar-item {
flex: 1;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}

.tab-bar-item cover-image {
width: 27px;
height: 27px;
}

.tab-bar-item cover-view {
font-size: 10px;
}

+ 15
- 15
ext.json Bestand weergeven

@@ -21,6 +21,7 @@
"etcpVersion": "release",
"etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback",
"ifHaveWebSocket": "0",
"ifStoreApp": "1",
"ifHaveCarModular": "1"
},
"name": "富茂客官开发",
@@ -29,34 +30,33 @@
},
"debug": false,
"tabBar": {
"custom": true,
"list": [
{
"text": "首页",
"pagePath": "index/index",
"iconPath": "assets/images/home.png",
"pagePath": "pages/main/index",
"selectedIconPath": "assets/images/home-a.png"
"selectedIconPath": "assets/images/home-a.png",
"text": "首页"
},
{
"text": "门店",
"pagePath": "index/searchbar",
"iconPath": "assets/images/mendian.png",
"pagePath": "pages/index/searchbar/index",
"selectedIconPath": "assets/images/mendian-a.png"
"selectedIconPath": "assets/images/mendian-a.png",
"text": "门店"
},
{
"text": "停车",
"pagePath": "index/passCar",
"iconPath": "assets/images/park.png",
"pagePath": "pages/passCar/passCar",
"selectedIconPath": "assets/images/park-a.png"
"selectedIconPath": "assets/images/park-a.png",
"text": "停车"
},
{
"text": "我的",
"pagePath": "index/user",
"iconPath": "assets/images/user.png",
"pagePath": "pages/user/index",
"selectedIconPath": "assets/images/user-a.png"
"selectedIconPath": "assets/images/user-a.png",
"text": "我的"
}
],
"color": "#abb1be",
"selectedColor": "#FD782D"
]
},
"window": {
"backgroundTextStyle": "dark",


pages/main/index.js → index/index.js Bestand weergeven

@@ -1,13 +1,16 @@
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let ifStoreApp = extConfig.attr.ifStoreApp;
const navigationBarHeight = (getApp().statusBarHeight + 60) + 'px'
const Http = require("../../utils/HttpBasics");
const imgurl = require("../../utils/imgurl");
const config = require("../../config/config");
const QR = require("../../utils/memberqrcode.js");
const util = require("../../utils/util");
const bgColor = require("../../utils/bgColor.js")
const Http = require("../utils/HttpBasics");
const imgurl = require("../utils/imgurl");
const config = require("../config/config");
const QR = require("../utils/memberqrcode.js");
const util = require("../utils/util");
const bgColor = require("../utils/bgColor.js")
let app = getApp();
Page({
data: {
ifStoreApp: ifStoreApp,
navigationBarTitle: '首页',
navigationBarHeight,
chengzhangBox: bgColor.colorFirst.main.chengzhangBox,
@@ -106,30 +109,12 @@ Page({
})
}
},
// hideQrcode: function() {
// let that = this;
// that.setData({
// showQrcode: false
// })
// },
//跳往限时秒杀
gotoRushBuy: function() {
wx.navigateTo({
url: '/pages/rushToBuy/index',
})
},

//搜索门店
// searchbar:function(){
// wx.switchTab({
// url: '/pages/index/searchbar/index',
// })
// },

// createQrCode: function(url, canvasId, cavW, cavH) {
// //调用插件中的draw方法,绘制二维码图片
// QR.api.draw(url, canvasId, cavW, cavH);
// },
swiperChange: function(e) {
this.setData({
swiperCurrent: e.detail.current
@@ -221,6 +206,12 @@ Page({
// util.barcode("barcode", optionss.quancode, 510, 100);
},
onShow: function() {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected: 0
})
}
let that = this;
that.setData({
havePlayEd: app.globalData.havePlayEd ? app.globalData.havePlayEd : false

+ 12
- 0
index/index.json Bestand weergeven

@@ -0,0 +1,12 @@
{
"usingComponents": {
"c-banner": "../components/banner/index",
"discount-card": "../components/discountCard/index",
"c-coupons": "../pages/main/coupons/index",
"g-entry": "../components/gameentry/gentry",
"c-hot": "../components/hot/index",
"navbar": "../components/navbar/navbar"
},
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#F4F5F9"
}

pages/main/index.wxml → index/index.wxml Bestand weergeven

@@ -1,7 +1,7 @@
<navbar text="首页"></navbar>
<view class="container" style="padding-top:{{navigationBarHeight}};">
<!-- 会员信息 -->
<view class='userinfo' >
<view class='userinfo' wx:if="{{ifStoreApp!=1}}">
<!-- 头像 -->
<view class='infoLeft'>
<view class="user-avatar">
@@ -30,7 +30,7 @@
<!-- banner -->
<c-banner wx:key="unique" list="{{list}}" />
<!-- 频道 -->
<view class='channelBox'>
<view class='channelBox' wx:if="{{ifStoreApp!=1}}">
<view class='kjBox' bindtap='gotoBargain'>
<image src='{{kanjia}}' mode='aspectFill'></image>
<text>砍价</text>
@@ -43,7 +43,7 @@
<image src='{{xiaofeika}}' mode='aspectFill'></image>
<text>消费卡</text>
</view>
<view class='kjBox' bindtap='gotogame' >
<view class='kjBox' bindtap='gotogame'>
<image src='{{xingyun}}' mode='aspectFill' bindtap=''></image>
<text>游戏频道</text>
</view>
@@ -52,8 +52,23 @@
<text>积分商城</text>
</view>
</view>
<!-- 频道 -->
<view class='channelBox' wx:if="{{ifStoreApp==1}}" style="width:525rpx;">
<view class='kjBox' bindtap='gotoBargain'>
<image src='{{kanjia}}' mode='aspectFill'></image>
<text>砍价</text>
</view>
<view class='kjBox' bindtap='gotoSpellGroup'>
<image src='{{pintuan}}' mode='aspectFill'></image>
<text>拼团</text>
</view>
<view class='kjBox' bindtap='gotoRushBuy'>
<image src='{{xiaofeika}}' mode='aspectFill'></image>
<text>限时抢购</text>
</view>
</view>
<!-- 每日头条 限时抢购 -->
<view class='toutiao' bindtap='gotoRushBuy' wx:if="{{showQg}}" >
<view class='toutiao' bindtap='gotoRushBuy' wx:if="{{showQg&&ifStoreApp!=1}}" >
<view class='imgBox'>
<image src='{{toutiao}}' mode='aspectFill'></image>
</view>

pages/main/index.wxss → index/index.wxss Bestand weergeven

@@ -1,4 +1,4 @@
@import "../../app.wxss";
@import "../app.wxss";
page{
background: #F4F5F9;
}

index/passCar.js
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


pages/passCar/passCar.json → index/passCar.json Bestand weergeven


pages/passCar/passCar.wxml → index/passCar.wxml Bestand weergeven

@@ -115,7 +115,7 @@
<image src="{{noCoupon}}" mode="widthFix" />
<text class="txt001">请您敬请期待</text>
<text class='txt002'>我们正在筹备一大波优惠活动</text>
<navigator class='nav' url="/pages/main/index" open-type="switchTab" hover-class="other-navigator-hover">
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover">
<button hover-class='active'>前往首页看看</button>
</navigator>
</view>

pages/passCar/passCar.wxss → index/passCar.wxss Bestand weergeven

@@ -1,4 +1,4 @@
@import "../../app.wxss";
@import "../app.wxss";

page {
background-color: #fff;

pages/index/searchbar/index.js → index/searchbar.js Bestand weergeven

@@ -1,7 +1,7 @@
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const Http = require("../../../utils/HttpBasics");
const imgurl = require("../../../utils/imgurl");
const config = require("../../../config/config");
const Http = require("../utils/HttpBasics");
const imgurl = require("../utils/imgurl");
const config = require("../config/config");
let app = getApp();
Page({

@@ -18,7 +18,7 @@ Page({
page:1,
isFirstPage:false,
isLastPage:false,
teljpgUrl: imgurl.teljpg.url,
teljpgUrl: imgurl.teljpg.url
},
// 左侧点击事件
jumpIndex(e) {
@@ -53,10 +53,15 @@ Page({
})
},
onShow(){
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
this.getTabBar().setData({
selected: 1
})
}
let that = this;
wx.getSystemInfo({
success: function (res) {
console.log(res.windowHeight, navigationBarHeight);
that.setData({
windowHeight: res.windowHeight + parseInt(navigationBarHeight)
})

pages/index/searchbar/index.json → index/searchbar.json Bestand weergeven


pages/index/searchbar/index.wxml → index/searchbar.wxml Bestand weergeven


pages/index/searchbar/index.wxss → index/searchbar.wxss Bestand weergeven


pages/user/index.js → index/user.js Bestand weergeven

@@ -1,276 +1,236 @@
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
var config = require("../../config/config.js");
var app = getApp();
const Http = require("../../utils/HttpBasics");
const QR = require("../../utils/memberqrcode.js");
const imgurl = require("../../utils/imgurl");
const bgColor = require("../../utils/bgColor.js")
Page({
/**
* 页面的初始数据
*/
data: {
navigationBarHeight,
banneColor: bgColor.colorFirst.user.banneColor,
levelBg: bgColor.colorFirst.user.levelBg,
view: bgColor.colorFirst.user.view,
redirectUrl: imgurl.redirect.url,
qrcodeUrl: imgurl.qrcode.url,
editUrl: imgurl.edit.url,
activeUrl: imgurl.active.url,
dingUrl: imgurl.ding.url,
quansUrl: imgurl.quans.url,
wmintegral: imgurl.wmintegral.url,
cardiconUrl: imgurl.cardicon.url,
myactivitygift: imgurl.myactivitygift.url,
myactivity: imgurl.myactivity.url,
cheUrl: imgurl.che.url,
giftUrl: imgurl.gift.url,
wmbarginicon: imgurl.wmbarginicon.url,
wmspellgroup: imgurl.wmspellgroup.url,
canIUse: wx.canIUse('official-account'),
mineFlag:"",
flag: 'hidden',
score: '0',
name: "",
birthdate: "",
sex: "",
showEdit: false,
ismember: false,
showQrcode: false,
canvasHidden: false,
maskHidden: true,
imagePath: '',
appVersion: "",
showmemberqrcode: false,
placeholder: ''
},
checkUserStatus() {
let that = this;
Http.get({
url: config.api.checkPhoneStatus,
data: {}
}).then(res => {
}).catch(err => {
wx.navigateTo({
url: `/pages/getphoneInfo/index?mineFlag=mine`,
})
})
},
/**
* 跳转到成长值的页面
*/
gotograde: function() {
wx.navigateTo({
url: '/pages/czdetail/czdetail',
})
},
navigateTo() {
wx.navigateTo({
url: `/pages/main/index`
});
},
showVersion: function() {
/**
* 长按显示版本号
*/
let that = this;
if (that.data.flag == 'hidden') {
that.setData({
flag: 'show'
});
}
},
gotoedit: function() {
wx.navigateTo({
url: '/pages/edit/edit',
})
},
onLoad() {
this.getLocation();
this.updateScene();
},
/**
* 获得经纬度
*/
getLocation() {
let that = this;
wx.getLocation({
type: "wgs84",
success: function(res) {
console.log(res)
if (res && res.longitude && res.latitude) {
Http.post({
url: config.api.updateLBS,
data: {
latitude: res.latitude,
longitude: res.longitude
}
}).then(res => {
console.log(res)
})
}
},
fail: error => {
console.log(error);
}
})
},
/**
* 用户更新scene
*/
updateScene(){
Http.post({
url: config.api.updateScene,
data: {
scene: app.globalData.scene
}
}).then(res => {
console.log(res)
})
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
let that = this;
that.checkUserStatus();
that.setData({
appVersion: extConfig.appVersion,
})
/**
* couponNum
* couponNum2
*/
let num = wx.getStorageSync('couponNum');
let num1 = wx.getStorageSync('couponNum2');
wx.hideTabBarRedDot({
index: 3
});
wx.hideTabBarRedDot({
index: 3
});
if (num == 'couponNum1') {
wx.setStorage({
key: 'couponNum',
data: "couponNum1",
})
that.setData({
couponNum: "couponNum1"
})
} else if (num == 'couponNum') {
that.setData({
couponNum: "couponNum"
})
};
if (num1 == 'couponNum3') {
wx.setStorage({
key: 'couponNum2',
data: "couponNum3",
})
that.setData({
couponNum2: "couponNum3"
})
} else if (num1 == 'couponNum2') {
that.setData({
couponNum2: "couponNum2"
});
};
Http.get({
url: config.api.getScore,
data: {}
}).then(res => {
if (res.data.address && res.data.name && res.data.sex && res.data.birthdate) {
that.setData({
showEdit: true
})
}
that.setData({
score: res.data.score,
levelName: res.data.levelName,
})
if (res.data.nickName) {
that.setData({
ismember: true,
memberId: res.data.id
})
var size = this.setCanvasSize();
var initUrl = JSON.stringify({
flagid: res.data.id
});
that.createQrCode(initUrl, "mycanvas1", size.w, size.h);
}
})
.catch(err => {
wx.showModal({
title: '提示',
content: err.errMsg,
showCancel: false
})
})
//暂时注释
// that.getrun();
},
hideQrcode: function() {
let that = this;
that.setData({
showQrcode: false
})
},
//适配不同屏幕大小的canvas
setCanvasSize: function() {
var size = {};
try {
var res = wx.getSystemInfoSync();
var scale = 750 / 500;
//不同屏幕下canvas的适配比例;设计稿是750宽
var width = res.windowWidth / scale;
var height = width;
//canvas画布为正方形
size.w = width;
size.h = height;
} catch (e) {
// Do something when catch error
console.log("获取设备信息失败" + e);
}
return size;
},
createQrCode: function(url, canvasId, cavW, cavH) {
//调用插件中的draw方法,绘制二维码图片
QR.api.draw(url, canvasId, cavW, cavH);
},
qrcode: function(e) {
var that = this;
that.setData({
showQrcode: true
})
wx.showToast({
title: '生成中...',
icon: 'loading',
duration: 2000
});
var st = setTimeout(function() {
wx.hideToast()
var size = that.setCanvasSize();
var url = JSON.stringify({
END: "C",
TYPE: "memberCode",
ID: that.data.memberId,
})
that.createQrCode(url, "mycanvas1", size.w, size.h);
that.setData({
maskHidden: true
});
clearTimeout(st);
}, 1000)
},
close: function() {
this.setData({
showmemberqrcode: false,
})
}
});
var app = getApp();
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
let ifStoreApp = extConfig.attr.ifStoreApp;
const Http = require("../utils/HttpBasics");
const imgurl = require("../utils/imgurl");
var config = require("../config/config.js");
const bgColor = require("../utils/bgColor.js")
Page({
/**
* 页面的初始数据
*/
data: {
navigationBarHeight,
ifStoreApp:ifStoreApp,
banneColor: bgColor.colorFirst.user.banneColor,
levelBg: bgColor.colorFirst.user.levelBg,
view: bgColor.colorFirst.user.view,
redirectUrl: imgurl.redirect.url,
editUrl: imgurl.edit.url,
activeUrl: imgurl.active.url,
dingUrl: imgurl.ding.url,
quansUrl: imgurl.quans.url,
wmintegral: imgurl.wmintegral.url,
cardiconUrl: imgurl.cardicon.url,
myactivitygift: imgurl.myactivitygift.url,
myactivity: imgurl.myactivity.url,
cheUrl: imgurl.che.url,
giftUrl: imgurl.gift.url,
wmbarginicon: imgurl.wmbarginicon.url,
wmspellgroup: imgurl.wmspellgroup.url,
canIUse: wx.canIUse('official-account'),
mineFlag:"",
flag: 'hidden',
score: '0',
name: "",
birthdate: "",
sex: "",
showEdit: false,
ismember: false,
canvasHidden: false,
maskHidden: true,
imagePath: '',
appVersion: "",
placeholder: ''
},
checkUserStatus() {
let that = this;
Http.get({
url: config.api.checkPhoneStatus,
data: {}
}).then(res => {
}).catch(err => {
wx.navigateTo({
url: `/pages/getphoneInfo/index?mineFlag=mine`,
})
})
},
/**
* 跳转到成长值的页面
*/
gotograde: function() {
wx.navigateTo({
url: '/pages/czdetail/czdetail',
})
},
showVersion: function() {
/**
* 长按显示版本号
*/
let that = this;
if (that.data.flag == 'hidden') {
that.setData({
flag: 'show'
});
}
},
gotoedit: function() {
wx.navigateTo({
url: '/pages/edit/edit',
})
},
onLoad() {
this.getLocation();
this.updateScene();
},
/**
* 获得经纬度
*/
getLocation() {
let that = this;
wx.getLocation({
type: "wgs84",
success: function(res) {
console.log(res)
if (res && res.longitude && res.latitude) {
Http.post({
url: config.api.updateLBS,
data: {
latitude: res.latitude,
longitude: res.longitude
}
}).then(res => {
console.log(res)
})
}
},
fail: error => {
console.log(error);
}
})
},
/**
* 用户更新scene
*/
updateScene(){
Http.post({
url: config.api.updateScene,
data: {
scene: app.globalData.scene
}
}).then(res => {
console.log(res)
})
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {
if (ifStoreApp==1){
this.getTabBar().setData({
selected: 1
})
}else{
this.getTabBar().setData({
selected: 3
})
}
}
let that = this;
that.checkUserStatus();
that.setData({
appVersion: extConfig.appVersion,
})
/**
* couponNum
* couponNum2
*/
let num = wx.getStorageSync('couponNum');
let num1 = wx.getStorageSync('couponNum2');
wx.hideTabBarRedDot({
index: 3
});
if (num == 'couponNum1') {
wx.setStorage({
key: 'couponNum',
data: "couponNum1",
})
that.setData({
couponNum: "couponNum1"
})
} else if (num == 'couponNum') {
that.setData({
couponNum: "couponNum"
})
};
if (num1 == 'couponNum3') {
wx.setStorage({
key: 'couponNum2',
data: "couponNum3",
})
that.setData({
couponNum2: "couponNum3"
})
} else if (num1 == 'couponNum2') {
that.setData({
couponNum2: "couponNum2"
});
};
Http.get({
url: config.api.getScore,
data: {}
}).then(res => {
if (res.data.address && res.data.name && res.data.sex && res.data.birthdate) {
that.setData({
showEdit: true
})
}
that.setData({
score: res.data.score,
levelName: res.data.levelName,
})
if (res.data.nickName) {
that.setData({
ismember: true,
memberId: res.data.id
})
var size = this.setCanvasSize();
var initUrl = JSON.stringify({
flagid: res.data.id
});
}
})
.catch(err => {
wx.showModal({
title: '提示',
content: err.errMsg,
showCancel: false
})
})
//暂时注释
// that.getrun();
},
//适配不同屏幕大小的canvas
setCanvasSize: function() {
var size = {};
try {
var res = wx.getSystemInfoSync();
var scale = 750 / 500;
//不同屏幕下canvas的适配比例;设计稿是750宽
var width = res.windowWidth / scale;
var height = width;
//canvas画布为正方形
size.w = width;
size.h = height;
} catch (e) {
// Do something when catch error
console.log("获取设备信息失败" + e);
}
return size;
}
});

pages/user/index.json → index/user.json Bestand weergeven

@@ -1,7 +1,7 @@
{
"usingComponents": {
"i-button": "../../dist/button/index",
"navbar": "../../components/navbar/navbar"
"i-button": "../dist/button/index",
"navbar": "../components/navbar/navbar"
},
"navigationBarBackgroundColor": "#FD832D",
"navigationBarTextStyle": "white",

pages/user/index.wxml → index/user.wxml Bestand weergeven

@@ -1,104 +1,142 @@
<navbar text="我的" background='#FD832D' color="white"></navbar>
<view class="user" style="padding-top:{{navigationBarHeight}};">
<view class="top" style='background:{{banneColor}}'></view>
<view class="top-content">
<view class='user_title '>
<view class="user-avatar" bindtap='gotoedit'>
<open-data class="open" type="userAvatarUrl"></open-data>
</view>
<view class="user-name" bindtap='gotoedit'>
<open-data class="name" type="userNickName" ></open-data>
<view class=' usre_level'style='background:{{levelBg}}'>
<text class='chengzhang '>{{levelName}}</text>
</view>
</view>
<view class="user-phone" bindtap='gotograde'>
<text class="my">我的</text>
<text class="chengzhang_h" >成长值{{score}}</text>
<text class="my my_line">|</text>
<!-- <text class="my">更多成长值</text> -->
<text class="view" style='color:{{view}}'>更多成长值</text>
</view>
<view class="user-btns">
<!-- 我的订单 -->
<navigator url="/pages/order/index/index?id=all">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{dingUrl}}" mode='widthFix'></image>我的订单</view>
</view>
</navigator>
<!-- 我的券包 -->
<navigator url="/pages/couponorder/index/index">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{quansUrl}}" mode='widthFix'></image>我的券包</view>
<view>
<text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text>
</view>
</view>
</navigator>
<navigator url="/pages/cardorder/index/index">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{cardiconUrl}}" mode='widthFix'></image>我的卡包</view>
<view>
<text class="couponnum" wx:if="{{couponNum2=='couponNum2'}}"></text>
</view>
</view>
</navigator>
</view>
</view>
</view>
<view class='btns_bg'>
<view class="user-btns">
<!-- 我的砍价 -->
<navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmbarginicon}}" mode='widthFix'></image>我的砍价</view>
</view>
</navigator>
<!-- 我的拼团 -->
<navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmspellgroup}}" mode='widthFix'></image>我的拼团</view>
</view>
</navigator>
<!-- 积分商城 -->
<navigator url="/pages/integralmall/index">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmintegral}}" mode='widthFix'></image>积分商城</view>
</view>
</navigator>
<!-- 当商场开启使用折扣按钮的时候, -->
<navigator url="/pages/specialcourtesy/specialcourtesy">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{giftUrl}}" mode='widthFix'></image>特享礼遇</view>
</view>
</navigator>
<navigator url="/pages/user/myactivity/index" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{myactivity}}" mode='widthFix'></image>我的活动</view>
</view>
</navigator>
</view>
</view>
<view class="margin"></view>
<view bindlongtap='showVersion' class='version'>
<view wx:if="{{flag=='show'}}">版本号:{{appVersion}}</view>
<view wx:if="{{flag=='hidden'}}"></view>
</view>
<view class='of' wx:if="{{canIUse}}">
<official-account class="gzh"></official-account>
</view>
</view>
<view class='showQrcode' bindtap='hideQrcode' wx:if="{{showQrcode}}">
<view class="canvas-box">
<canvas hidden="{{canvasHidden}}" style="height:500rpx;background:0 0 0 .6;margin-top:10rpx;" canvas-id="mycanvas1" />
<text class='memberIds'>会员ID{{memberId}}</text>
</view>
<navbar text="我的" background='#FD832D' color="white"></navbar>
<view class="user" style="padding-top:{{navigationBarHeight}};">
<view class="top" style='background:{{banneColor}}'></view>
<view class="top-content" wx:if="{{ifStoreApp!=1}}">
<view class='user_title '>
<view class="user-avatar" bindtap='gotoedit'>
<open-data class="open" type="userAvatarUrl"></open-data>
</view>
<view class="user-name" bindtap='gotoedit'>
<open-data class="name" type="userNickName" ></open-data>
<view class=' usre_level'style='background:{{levelBg}}'>
<text class='chengzhang '>{{levelName}}</text>
</view>
</view>
<view class="user-phone" bindtap='gotograde'>
<text class="my">我的</text>
<text class="chengzhang_h" >成长值{{score}}</text>
<text class="my my_line">|</text>
<!-- <text class="my">更多成长值</text> -->
<text class="view" style='color:{{view}}'>更多成长值</text>
</view>
<view class="user-btns">
<!-- 我的订单 -->
<navigator url="/pages/order/index/index?id=all">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{dingUrl}}" mode='widthFix'></image>我的订单</view>
</view>
</navigator>
<!-- 我的券包 -->
<navigator url="/pages/couponorder/index/index">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{quansUrl}}" mode='widthFix'></image>我的券包</view>
<view>
<text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text>
</view>
</view>
</navigator>
<navigator url="/pages/cardorder/index/index">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{cardiconUrl}}" mode='widthFix'></image>我的卡包</view>
<view>
<text class="couponnum" wx:if="{{couponNum2=='couponNum2'}}"></text>
</view>
</view>
</navigator>
</view>
</view>
</view>
<view class='btns_bg' wx:if="{{ifStoreApp!=1}}">
<view class="user-btns">
<!-- 我的砍价 -->
<navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmbarginicon}}" mode='widthFix'></image>我的砍价</view>
</view>
</navigator>
<!-- 我的拼团 -->
<navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmspellgroup}}" mode='widthFix'></image>我的拼团</view>
</view>
</navigator>
<!-- 积分商城 -->
<navigator url="/pages/integralmall/index">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmintegral}}" mode='widthFix'></image>积分商城</view>
</view>
</navigator>
<!-- 当商场开启使用折扣按钮的时候, -->
<navigator url="/pages/specialcourtesy/specialcourtesy">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{giftUrl}}" mode='widthFix'></image>特享礼遇</view>
</view>
</navigator>
<navigator url="/pages/user/myactivity/index" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{myactivity}}" mode='widthFix'></image>我的活动</view>
</view>
</navigator>
</view>
</view>
<!-- 小马快店样式 -->
<view class="top-content" wx:if="{{ifStoreApp==1}}">
<view class='user_title '>
<view class="user-avatar" bindtap='gotoedit'>
<open-data class="open" type="userAvatarUrl"></open-data>
</view>
<view class="user-name" bindtap='gotoedit'>
<open-data class="name" type="userNickName" ></open-data>
</view>
<view class="user-btns">
<!-- 我的订单 -->
<navigator url="/pages/order/index/index?id=all">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{dingUrl}}" mode='widthFix'></image>我的订单</view>
</view>
</navigator>
<!-- 我的券包 -->
<navigator url="/pages/couponorder/index/index">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{quansUrl}}" mode='widthFix'></image>我的券包</view>
<view>
<text class="couponnum" wx:if="{{couponNum=='couponNum'}}"></text>
</view>
</view>
</navigator>
<!-- 我的砍价 -->
<navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmbarginicon}}" mode='widthFix'></image>我的砍价</view>
</view>
</navigator>
<!-- 我的拼团 -->
<navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate">
<view class="user-btn app-border-bottom">
<view>
<image class='icons' src="{{wmspellgroup}}" mode='widthFix'></image>我的拼团</view>
</view>
</navigator>
</view>
</view>
</view>
<view class="margin"></view>
<view bindlongtap='showVersion' class='version'>
<view wx:if="{{flag=='show'}}">版本号:{{appVersion}}</view>
<view wx:if="{{flag=='hidden'}}"></view>
</view>
<view class='of' wx:if="{{canIUse}}">
<official-account class="gzh"></official-account>
</view>
</view>

pages/user/index.wxss → index/user.wxss Bestand weergeven

@@ -74,7 +74,9 @@ page{
border-radius: 50%;
overflow: hidden;
top:-64rpx;
left: 300rpx;
left: 0;
right: 0;
margin: auto;
}

.chengzhang {

+ 1
- 1
pages/acSignIn/index.js Bestand weergeven

@@ -57,7 +57,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
}
})

+ 2
- 2
pages/addPark/addPark.js Bestand weergeven

@@ -72,7 +72,7 @@ Page({
jumpTo: function () {
// 返回
wx.navigateBack({
url: '/pages/passCar/passCar'
url: '/index/passCar'
})
},
handleTap: function (e) {
@@ -358,7 +358,7 @@ Page({
}
else{
wx.navigateBack({
url: '/pages/passCar/passCar?addcar=' + carNumber,
url: '/index/passCar?addcar=' + carNumber,
})
}
}


+ 1
- 1
pages/bannerdetail/index.js Bestand weergeven

@@ -45,7 +45,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
});

+ 1
- 1
pages/bargain/bargain.js Bestand weergeven

@@ -33,7 +33,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onLoad: function (options) {


+ 1
- 1
pages/bargain/bargainDatail/bargainDatail.js Bestand weergeven

@@ -78,7 +78,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
/**


+ 1
- 1
pages/cardorder/index/index.js Bestand weergeven

@@ -37,7 +37,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onLoad: function() {


+ 1
- 1
pages/cardorder/index/index.wxml Bestand weergeven

@@ -10,7 +10,7 @@
<image src="{{noCoupon}}" mode="widthFix" />
<text class="txt001">请您敬请期待</text>
<text class='txt002'>我们正在筹备一大波优惠活动</text>
<navigator class='nav' url="/pages/main/index" open-type="switchTab" hover-class="other-navigator-hover">
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover">
<button hover-class='active'>前往首页看看</button>
</navigator>
</view>


+ 1
- 1
pages/coupon/detail/index.js Bestand weergeven

@@ -204,7 +204,7 @@ Page({
},
goback: function() {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
/**


+ 1
- 1
pages/couponorder/index/index.js Bestand weergeven

@@ -54,7 +54,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
//点击跳转到券详情页面


+ 1
- 1
pages/couponorder/index/index.wxml Bestand weergeven

@@ -10,7 +10,7 @@
<image src="{{couponUrl}}" mode="widthFix" />
<text class="txt001">请您敬请期待</text>
<text class='txt002'>我们正在筹备一大波优惠活动</text>
<navigator class='nav' url="/pages/main/index" open-type="switchTab" hover-class="other-navigator-hover">
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover">
<button hover-class='active'>前往首页看看</button>
</navigator>
</view>


+ 1
- 1
pages/discountCardList/discountCardList.js Bestand weergeven

@@ -40,7 +40,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onLoad(options) {


+ 1
- 1
pages/discountCardList/discountCardList.wxml Bestand weergeven

@@ -13,7 +13,7 @@
<image src="{{noCoupon}}" mode="aspectFill" lazy-load="true" />
<text class="txt001">请您敬请期待</text>
<text class='txt002'>我们正在筹备一大波优惠活动</text>
<navigator class='nav' url="/pages/main/index" open-type="switchTab" hover-class="other-navigator-hover">
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover">
<button hover-class='active'>前往首页看看</button>
</navigator>
</view>


+ 2
- 2
pages/getphoneInfo/index.js Bestand weergeven

@@ -116,7 +116,7 @@ Page({
})
} else if (that.data.mineFlag == 'mine'){
wx.switchTab({
url: '/pages/user/index'
url: '/index/user'
});
} else {
wx.showToast({
@@ -129,7 +129,7 @@ Page({
})
} else {
wx.switchTab({
url: '/pages/passCar/passCar',
url: '/index/passCar',
})
}
}


+ 5
- 5
pages/getuserinfo/index.js Bestand weergeven

@@ -177,12 +177,12 @@ Page({
} else if (app.globalData.type == 'uc') {
// 我的
wx.switchTab({
url: '/pages/user/index'
url: '/index/user'
});
} else if (app.globalData.type == 'in') {
// 首页
wx.switchTab({
url: '/pages/main/index'
url: '/index/index'
});
}
// 积分
@@ -193,7 +193,7 @@ Page({
}else if (app.globalData.type == 'pc') {
// 停车
wx.switchTab({
url: '/pages/passCar/passCar'
url: '/index/passCar'
});
} else if (app.globalData.type == 'mc') {
// 我的券包
@@ -254,11 +254,11 @@ Page({
else if (app.globalData.type == 'ml') {
// 门店
wx.switchTab({
url: '/pages/index/searchbar/index'
url: '/index/searchbar'
});
} else {
wx.switchTab({
url: "/pages/main/index"
url: "/index/index"
});
}
}


+ 5
- 5
pages/index/index.js Bestand weergeven

@@ -229,7 +229,7 @@ Page({
// 我的
else if (app.globalData.type == 'uc') {
wx.switchTab({
url: '/pages/user/index'
url: '/index/user'
});
}
// 积分
@@ -241,14 +241,14 @@ Page({
// 首页
else if (app.globalData.type == 'in') {
wx.switchTab({
url: '/pages/main/index'
url: '/index/index'
});
}
// 停车
else if (app.globalData.type == 'pc') {
// 停车
wx.switchTab({
url: '/pages/passCar/passCar'
url: '/index/passCar'
});
}
// 我的券包
@@ -324,7 +324,7 @@ Page({
// 门店
else if (app.globalData.type == 'ml') {
wx.switchTab({
url: '/pages/index/searchbar/index'
url: '/index/searchbar'
})
}
// 通过分享进入的门店详情
@@ -335,7 +335,7 @@ Page({
}else {
// 主页
wx.switchTab({
url: '/pages/main/index'
url: '/index/index'
})
}
})


+ 1
- 1
pages/index/searchbar/detail/index.js Bestand weergeven

@@ -41,7 +41,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
/**


+ 1
- 1
pages/integralmall/index.js Bestand weergeven

@@ -43,7 +43,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onLoad: function (options) {


+ 1
- 1
pages/integralmall/payIntegcouponStatus/index.js Bestand weergeven

@@ -70,7 +70,7 @@ Page({
*/
gotoIndex(){
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
/**


+ 0
- 12
pages/main/index.json Bestand weergeven

@@ -1,12 +0,0 @@
{
"usingComponents": {
"c-banner": "../../components/banner/index",
"discount-card": "../../components/discountCard/index",
"c-coupons": "./coupons/index",
"g-entry": "../../components/gameentry/gentry",
"c-hot": "../../components/hot/index",
"navbar": "../../components/navbar/navbar"
},
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#F4F5F9"
}

+ 1
- 1
pages/order/index/index.js Bestand weergeven

@@ -35,7 +35,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onLoad(e) {


+ 1
- 1
pages/passCar/couponList/couponList.wxml Bestand weergeven

@@ -9,7 +9,7 @@
<image src="{{noCoupon}}" mode="widthFix" />
<text class="txt001">请您敬请期待</text>
<text class='txt002'>我们正在筹备一大波优惠活动</text>
<navigator class='nav' url="/pages/main/index" open-type="switchTab" hover-class="other-navigator-hover">
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover">
<button hover-class='active'>前往首页看看</button>
</navigator>
</view>


+ 1
- 1
pages/radetail/index.js Bestand weergeven

@@ -98,7 +98,7 @@ Page({
},
goback: function() {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onShareAppMessage: function (options) {


+ 1
- 1
pages/radetail/success/index.js Bestand weergeven

@@ -41,7 +41,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
/**


+ 1
- 1
pages/rushToBuy/index.js Bestand weergeven

@@ -26,7 +26,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
//列表


+ 1
- 1
pages/specialcourtesy/specialcourtesy.js Bestand weergeven

@@ -56,7 +56,7 @@ Page({

goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
/**


+ 1
- 1
pages/spellDetail/index.js Bestand weergeven

@@ -54,7 +54,7 @@ Page({
},
gotoIndex(){
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
gotoshare() {


+ 1
- 1
pages/spellGroup/mySpellGroup/index.js Bestand weergeven

@@ -108,7 +108,7 @@ Page({
},
gotoIndex: function() {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
/**


+ 1
- 1
pages/spellGroup/spellGroup.js Bestand weergeven

@@ -35,7 +35,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onLoad: function (options) {


+ 1
- 1
pages/topicDetail/index.js Bestand weergeven

@@ -29,7 +29,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
topicShow(id){


+ 1
- 1
pages/user/myactivity/index.js Bestand weergeven

@@ -37,7 +37,7 @@ Page({
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
url: '/index/index',
})
},
onLoad(options) {


Laden…
Annuleren
Opslaan