ソースを参照

添加集团版

release
GL 4年前
コミット
4de7a7522c
11個のファイルの変更370行の追加132行の削除
  1. +4
    -0
      app.js
  2. +129
    -128
      app.json
  3. +31
    -1
      index/index.js
  4. +5
    -0
      index/index.wxml
  5. +18
    -1
      index/index.wxss
  6. +1
    -1
      pages/integralmall/index.wxml
  7. +86
    -0
      pages/location/location.js
  8. +5
    -0
      pages/location/location.json
  9. +25
    -0
      pages/location/location.wxml
  10. +60
    -0
      pages/location/location.wxss
  11. +6
    -1
      pages/spellTimeout/index.wxss

+ 4
- 0
app.js ファイルの表示

@@ -42,6 +42,10 @@ App({
})
.then(res => {
wx.setStorageSync('openId',res.data.openId)
if (res.data.subMalls){
const squareList = JSON.parse(res.data.subMalls)
wx.setStorageSync("squareList", squareList)
}
if (res.data && res.data.score) {
if (res.data.score != 0) {
that.globalData.score = res.data.score;


+ 129
- 128
app.json ファイルの表示

@@ -1,130 +1,131 @@
{
"pages": [
"pages/index/index",
"pages/main/index",
"index/index",
"index/searchbar",
"index/passCar",
"index/user",
"pages/searchbar/searchbar",
"pages/integralmall/integraHistory/index",
"pages/integralmall/payIntegcouponStatus/index",
"pages/integralmall/payIntegcoupondetail/index",
"pages/joinFrDpell/index",
"pages/spellDetail/index",
"pages/radetail/success/index",
"pages/spellTimeout/index",
"pages/spellGroup/mySpellGroup/index",
"pages/spellGroup/spellGroup",
"pages/complete/index",
"pages/topicDetail/index",
"pages/acSignIn/index",
"pages/index/merchantList/index",
"pages/index/searchbar/detail/index",
"pages/bargain/bargainDatail/bargainDatail",
"pages/bargain/bargain",
"pages/cardorder/index/index",
"pages/scanPay/scanPay",
"pages/edit/edit",
"pages/radetail/index",
"pages/radetail/joinActivity/edit",
"pages/bannerdetail/index",
"pages/getuserinfo/index",
"pages/phoneinput/phoneinput",
"pages/user/myactivity/index",
"pages/coupon/detail/index",
"pages/rushToBuy/index",
"pages/couponorder/index/index",
"pages/couponorder/detail/index",
"pages/cardorder/detail/index",
"pages/cardorder/userule/userule",
"pages/order/detail/index",
"pages/order/index/index",
"pages/ques/ques",
"pages/getphoneInfo/index",
"pages/addPark/addPark",
"pages/orderquanma/index",
"pages/passCar/couponList/couponList",
"pages/passCar/couponDetail/couponDetail",
"pages/managelicenseplate/managelicenseplate",
"pages/payrule/payrule",
"pages/grade/grade",
"pages/exchange/exchange",
"pages/game/index",
"pages/canvas/index",
"pages/specialcourtesy/specialcourtesy",
"pages/discountCardList/discountCardList",
"pages/cardListDetail/cardListDetail",
"pages/freeBannerDetail/index",
"pages/paySuccess/paySuccess",
"pages/ConsumeDetail/ConsumeDetail",
"pages/externallinks/index",
"pages/czdetail/czdetail",
"pages/spellGroup/paySpellGroup/index",
"pages/integralmall/index",
"pages/mallInfo/mallInfo"
],
"subpackages": [
{
"root": "pages2",
"name": "pages2",
"independent": false,
"pages": [
"live/livelist/index"
]
}
],
"navigateToMiniProgramAppIdList": [
"wx192b7d2e8dcbefd0",
"wxc07f9d67923d676d",
"wxbd08b4baa10fcc1d"
],
"permission": {
"scope.userLocation": {
"desc": "你的位置信息将用于小程序位置接口的效果展示"
}
},
"tabBar": {
"custom": true,
"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": "我的"
}
]
},
"usingComponents": {},
"window": {
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTitleText": "",
"navigationBarTextStyle": "black",
"navigationStyle": "custom"
},
"networkTimeout": {
"request": 30000,
"downloadFile": 10000
},
"debug": false,
"sitemapLocation": "sitemap.json"
"pages": [
"pages/index/index",
"pages/main/index",
"index/index",
"index/searchbar",
"index/passCar",
"index/user",
"pages/searchbar/searchbar",
"pages/integralmall/integraHistory/index",
"pages/integralmall/payIntegcouponStatus/index",
"pages/integralmall/payIntegcoupondetail/index",
"pages/joinFrDpell/index",
"pages/spellDetail/index",
"pages/radetail/success/index",
"pages/spellTimeout/index",
"pages/spellGroup/mySpellGroup/index",
"pages/spellGroup/spellGroup",
"pages/complete/index",
"pages/topicDetail/index",
"pages/acSignIn/index",
"pages/index/merchantList/index",
"pages/index/searchbar/detail/index",
"pages/bargain/bargainDatail/bargainDatail",
"pages/bargain/bargain",
"pages/cardorder/index/index",
"pages/scanPay/scanPay",
"pages/edit/edit",
"pages/radetail/index",
"pages/radetail/joinActivity/edit",
"pages/bannerdetail/index",
"pages/getuserinfo/index",
"pages/phoneinput/phoneinput",
"pages/user/myactivity/index",
"pages/coupon/detail/index",
"pages/rushToBuy/index",
"pages/couponorder/index/index",
"pages/couponorder/detail/index",
"pages/cardorder/detail/index",
"pages/cardorder/userule/userule",
"pages/order/detail/index",
"pages/order/index/index",
"pages/ques/ques",
"pages/getphoneInfo/index",
"pages/addPark/addPark",
"pages/orderquanma/index",
"pages/passCar/couponList/couponList",
"pages/passCar/couponDetail/couponDetail",
"pages/managelicenseplate/managelicenseplate",
"pages/payrule/payrule",
"pages/grade/grade",
"pages/exchange/exchange",
"pages/game/index",
"pages/canvas/index",
"pages/specialcourtesy/specialcourtesy",
"pages/discountCardList/discountCardList",
"pages/cardListDetail/cardListDetail",
"pages/freeBannerDetail/index",
"pages/paySuccess/paySuccess",
"pages/ConsumeDetail/ConsumeDetail",
"pages/externallinks/index",
"pages/czdetail/czdetail",
"pages/spellGroup/paySpellGroup/index",
"pages/integralmall/index",
"pages/mallInfo/mallInfo",
"pages/location/location"
],
"subpackages": [
{
"root": "pages2",
"name": "pages2",
"independent": false,
"pages": [
"live/livelist/index"
]
}
],
"navigateToMiniProgramAppIdList": [
"wx192b7d2e8dcbefd0",
"wxc07f9d67923d676d",
"wxbd08b4baa10fcc1d"
],
"permission": {
"scope.userLocation": {
"desc": "你的位置信息将用于小程序位置接口的效果展示"
}
},
"tabBar": {
"custom": true,
"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": "我的"
}
]
},
"usingComponents": {},
"window": {
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTitleText": "",
"navigationBarTextStyle": "black",
"navigationStyle": "custom"
},
"networkTimeout": {
"request": 30000,
"downloadFile": 10000
},
"debug": false,
"sitemapLocation": "sitemap.json"
}

+ 31
- 1
index/index.js ファイルの表示

@@ -81,7 +81,19 @@ Page({
openId: '',
showGg: false,
ggdata: {},
liveFlag:0//直播按钮显隐标志位
liveFlag:0,//直播按钮显隐标志位
squareName:"",//当前广场
isShowSqare:false,
},
//获取当前广场名
gitSuperiorName(){
},
//跳转到其他广场列表
goSquareList(){
wx.navigateTo({
url: '/pages/location/location',
})
},
goLive(){
wx.navigateTo({
@@ -203,10 +215,25 @@ Page({
url: '/pages/specialcourtesy/specialcourtesy',
})
},
//是否属于集团
ifShowSqare(){
if (wx.getStorageSync("squareList")){
this.setData({
isShowSqare:true
})
}else{
this.setData({
isShowSqare: false
})
}
},


/**
* 生命周期函数--监听页面初次渲染完成
*/
onLoad: function(options) {
this.ifShowSqare();
this.getLocation();
let that = this;
let optionss;
@@ -261,6 +288,9 @@ Page({
}
})
},
onUnload(){
wx.removeStorageSync('squareList')
},
onShow: function() {
if (typeof this.getTabBar === 'function' &&
this.getTabBar()) {


+ 5
- 0
index/index.wxml ファイルの表示

@@ -1,5 +1,10 @@
<navbar text="首页"></navbar>
<view class="container" style="padding-top:{{navigationBarHeight}};">
<!-- 所属集团 -->
<view class="underling" bindtap="goSquareList" wx:if="{{isShowSqare}}">
<image class="underlingImg" mode="widthFix" src="https://formall.oss-accelerate.aliyuncs.com/cimg/dingwei.png"></image>
<view class="underlingName" >{{"当前广场"}} ↓</view>
</view>
<!-- 会员信息 -->
<view class='userinfo' wx:if="{{ifStoreApp!=1}}">
<!-- 头像 -->


+ 18
- 1
index/index.wxss ファイルの表示

@@ -2,6 +2,21 @@
page{
background: #F4F5F9;
}
.underlingImg{

width: 30rpx;
height: 60rpx;
font-size: 30prx;
float: left;
}
.underlingName{
float: left;
line-height: 30rpx;
}
.underling{
font-size: 30rpx;
overflow: hidden;
}
.index-position {
background: rgba(0, 0, 0, 0.5);
height: 88rpx;
@@ -52,7 +67,9 @@ page {
display: block;
width: 100%;
}

.underling{
margin: 10rpx 30rpx;
}
.userinfo{
width:690rpx;
height: 96rpx;


+ 1
- 1
pages/integralmall/index.wxml ファイルの表示

@@ -10,7 +10,7 @@
</view>
<view class='bot'>
<view class='myName'>
<open-data class="name" type="userNickName"></open-data>
<open-data class="name" type="userNickName"></open-data>squareList
<view class=' usre_level'>
<text class='chengzhang '>{{levelName}}</text>
</view>


+ 86
- 0
pages/location/location.js ファイルの表示

@@ -0,0 +1,86 @@
// pages/location/location.js
Page({

/**
* 页面的初始数据
*/
data: {
squareList: [], //广场列表
},

/**
* 跳转到其他小程序
* 接受唯一参数 appId
* */
goSquare(event) {
let appid = event.currentTarget.dataset.appid
wx.navigateToMiniProgram({
appId: appid,
success(res) {
// 打开成功
}
})
},




/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
const squareList = wx.getStorageSync('squareList')
this.setData({
squareList : squareList
})
},

/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function() {

},

/**
* 生命周期函数--监听页面显示
*/
onShow: function() {

},

/**
* 生命周期函数--监听页面隐藏
*/
onHide: function() {

},

/**
* 生命周期函数--监听页面卸载
*/
onUnload: function() {

},

/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function() {

},

/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function() {

},

/**
* 用户点击右上角分享
*/
onShareAppMessage: function() {

}
})

+ 5
- 0
pages/location/location.json ファイルの表示

@@ -0,0 +1,5 @@
{
"usingComponents": {
"navbar": "../../../components/navbar/navbar"
}
}

+ 25
- 0
pages/location/location.wxml ファイルの表示

@@ -0,0 +1,25 @@
<!--pages/location/location.wxml-->
<navbar back home text="广场" background='#fff'></navbar>
<view class="Boxa">
<!-- <view class="presentSiteBox">
<view class="presentText">当前位置 </view>
<view class="gpsBox">
<view class="city"> 北京市</view>
<view class="gps">GPS定位 </view>
</view>
<view class="wire"> </view>
</view> -->

<view class="siteText"> 城市广场</view>

<view wx:for="{{squareList}}" wx:key= "index" bindtap="goSquare" data-appid="{{item.appId}}">
<view class="siteBox">
<view class="plazaName">{{item.name}}</view>
<view class="site">{{item.addr}} </view>
<!-- <view class="distance">1.23Km </view> -->
</view>
<view class="wire"> </view>
</view>


</view>

+ 60
- 0
pages/location/location.wxss ファイルの表示

@@ -0,0 +1,60 @@
/* pages/location/location.wxss */
.Boxa{
width: 90%;
margin: 0 5%;
margin-top: 130rpx;
}
.presentSiteBox{
overflow: hidden;
margin-bottom: 70rpx;
}
.presentText{
font-size: 24rpx;
color: rgb(153, 153, 153);
overflow: hidden
}
.gpsBox{
margin-top: 54rpx;
overflow: hidden;
margin-bottom: 20rpx;
}
.city{
font-size: 40rpx;
float: left
}
.gps{
float: left;
font-size: 24rpx;
line-height: 60rpx;
color: rgb(153, 153, 153);
margin-left: 40rpx;
}
.siteText{
font-size: 24rpx;
color: rgb(153, 153, 153);
margin-top: 2rpx;
}
.plazaName{
margin-top: 60rpx;
font-size: 34rpx;
}
.siteBox{
margin-bottom: 30rpx;
overflow: hidden
}
.site{
margin-top: 30rpx;
font-size: 24rpx;
color: rgb(153, 153, 153);
float: left;
}
.distance{
margin-top: 30rpx;
font-size: 24rpx;
color: rgb(153, 153, 153);
float: right
}
.wire{
border: 2rpx solid rgb(204, 204, 204)
}

+ 6
- 1
pages/spellTimeout/index.wxss ファイルの表示

@@ -3,10 +3,15 @@ page {
height: auto;
overflow: auto;
background: #f89132;
background-image: url('https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/cimg/spelldetail-bg.png');
background-image: url('https://formall.oss-accelerate.aliyuncs.com/cimg/spelldetail-bg.png');
background-size: cover;
background-repeat: no-repeat;
}
.underlingImg{
white-space: 30rpx;
height: 60rpx;
}
.status{
width: 690rpx;
padding:25px 0 0;


読み込み中…
キャンセル
保存