Skip to content

严立 / mini-shimao

Go to a project
Commit b8f260ee by 严立
Options

LL - 俱乐部审核

parent 1cb6e92b
Inline Side-by-side
Showing with 1025 additions and 68 deletions
app.json
{
"pages": [
"pages/home/home/home",
"pages/home/guide/guide",
"pages/home/history/history",
"pages/home/dynamic/dynamic",
"pages/home/dynamic-detail/dynamic-detail",
"pages/home/night-appointment/night-appointment",
"pages/home/guide/guide",
"pages/home/history/history",
"pages/play/home/home",
"pages/play/service/service",
"pages/play/service-sell/service-sell",
......@@ -18,10 +17,10 @@
"pages/play/point-detail/point-detail",
"pages/play/strategy-detail/strategy-detail",
"pages/commodity/home/home",
"pages/commodity/menu-food/menu-food",
"pages/commodity/shopping-cart/shopping-cart",
"pages/commodity/project/project",
"pages/commodity/project-detail/project-detail",
"pages/commodity/menu-food/menu-food",
"pages/commodity/room-appointment/room-appointment",
"pages/campsite/home/home",
"pages/campsite/home-mirror/home-mirror",
......@@ -30,6 +29,7 @@
"pages/mine/order/order",
"pages/mine/card/card",
"pages/mine/club/club",
"pages/mine/club-manage/club-manage",
"pages/mine/accumulate/accumulate",
"pages/mine/appointment/appointment",
"pages/mine/appointment-ticket/appointment-ticket",
......@@ -37,6 +37,8 @@
"pages/mine/authentication-input/authentication-input",
"pages/mine/question/question",
"pages/mine/question-more/question-more",
"pages/mine/address/address",
"pages/mine/address-add/address-add",
"pages/pay/home/home",
"pages/pay/order-input/order-input",
"pages/pay/order-state/order-state",
......@@ -51,6 +53,10 @@
"pages/club/create/create",
"pages/club/enter/enter",
"pages/mall/home/home",
"pages/mall/goods/goods",
"pages/mall/exchange-tip/exchange-tip",
"pages/mall/exchange-state/exchange-state",
"pages/mall/exchange-record/exchange-record",
"pages/login/login"
],
"usingComponents": {
......
app.wxss
......@@ -7,6 +7,12 @@
@import './component/theme/layout.wxss';
@import './component/theme/theme.wxss';
.text_overflow_point {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.arrow-more {
width: 32rpx;
height: 32rpx;
......@@ -17,6 +23,11 @@
height: 32rpx;
}
.icon_40 {
width: 40rpx;
height: 40rpx;
}
.icon_48 {
width: 48rpx;
height: 48rpx;
......
component/m-dialog/m-dialog.js
......@@ -16,8 +16,11 @@ Component({
content: '这里是提示信息',
cancel: '取消',
confirm: '确定',
placeholder: '',
success: function () { },
fail: function () { },
inputContent: '',
winDialog: false,
},
......@@ -28,13 +31,20 @@ Component({
},
methods: {
onInputBlur: function (funcEvent) {
console.log(funcEvent)
this.setData({
inputContent: funcEvent.detail.value
})
},
onCancel: function () {
this.data.fail()
App.ui.hideDialog()
},
onConfirm: function () {
this.data.success()
this.data.success({ input: this.data.inputContent })
App.ui.hideDialog()
},
}
......
component/m-dialog/m-dialog.wxml
......@@ -42,4 +42,24 @@
</view>
</view>
</block>
<!-- 对话框 - 标题和内容，取消确定按钮 -->
<block wx:if="{{type === 'input'}}">
<view class="container-dialog column cb">
<view class="dialog-title row cc ac">
<text class="regular">{{title}}</text>
</view>
<view class="dialog-content row cc">
<text class="secondary">{{content}}</text>
</view>
<view class="dialog-input row cc">
<input auto-focus placeholder="{{placeholder}}" placeholder-class="dialog-input-placeholder" bindblur="onInputBlur"></input>
</view>
<view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
<view class="dialog-operation-line row cc ac border-base"></view>
<button class="dialog-operation-confirm row cc ac primary" bindtap="onConfirm">{{confirm}}</button>
</view>
</view>
</block>
</view>
\ No newline at end of file
component/m-dialog/m-dialog.wxss
......@@ -10,7 +10,7 @@
.container-dialog {
width: 590rpx;
height: 308rpx;
min-height: 308rpx;
padding-top: 48rpx;
border-radius: 4px;
background: #FFFFFF;
......@@ -37,6 +37,29 @@
margin-top: 24rpx;
}
.dialog-input > input {
width: 510rpx;
height: 72rpx;
margin: 0 0 42rpx 0;
padding: 0 24rpx;
border-radius: 4px;
background: #F5F6F8;
font-size: 26rpx;
font-weight: 400;
line-height: 32rpx;
color: #15191F;
}
.dialog-input-placeholder {
width: 462rpx;
height: 32rpx;
font-size: 26rpx;
font-weight: 400;
line-height: 32rpx;
color: #C2C7CF;
}
/* 操作按钮 */
.dialog-operation {
border-style: solid none none none;
......
component/m-input/m-input.wxml
<view class="m-input">
<view class="container-text row ac {{className}}" hidden="{{!winText}}" bindtap="setInputShow">
<text class="container-text-value" hidden="{{value === '' ? true : false}}">{{value}}</text>
<text class="container-text-placeholder" hidden="{{value === '' ? false : true}}">{{placeholder}}</text>
<view class="m-input-content row ac">
<text class="container-text-value" hidden="{{value === '' ? true : false}}">{{value}}</text>
<text class="container-text-placeholder" hidden="{{value === '' ? false : true}}">{{placeholder}}</text>
</view>
</view>
<view class="container-input row ac {{className}}" hidden="{{!winInput}}">
<input
class="row ac"
value="{{value}}"
type="{{type}}"
maxlength="{{maxlength}}"
placeholder="{{placeholder}}"
placeholder-class="container-text-placeholder"
focus="{{inputFocus}}"
bindinput="onInput"
bindfocus="onInputFocus"
bindblur="onInputBlur"
bindconfirm="onInputConfirm"
></input>
<view class="m-input-content row ac">
<input
class="row ac"
value="{{value}}"
type="{{type}}"
maxlength="{{maxlength}}"
placeholder="{{placeholder}}"
placeholder-class="container-text-placeholder"
focus="{{inputFocus}}"
bindinput="onInput"
bindfocus="onInputFocus"
bindblur="onInputBlur"
bindconfirm="onInputConfirm"
></input>
</view>
</view>
</view>
\ No newline at end of file
component/m-input/m-input.wxss
......@@ -2,18 +2,22 @@
position: relative;
}
.m-input-content {
width: 100%;
height: 100%;
overflow-x: scroll;
}
.container-text-value {
white-space: nowrap;
color: #000000;
}
.container-text-placeholder {
white-space: nowrap;
color: #C2C7CF;
}
.container-text {
overflow: hidden;
}
.container-input {
color: #15191F;
}
......
component/m-tab/m-tab.wxml
<view class="m-tab {{classTab}}">
<scroll-view class="{{classTabList}}" scroll-x="true" scroll-left="{{scrollLeft}}" bindscroll="eventTabScroll">
<view class="{{classTabList}}">
<block wx:for="{{item}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="m-item-mark {{classTabItem}}" data-item="{{item}}" data-index="{{index}}" bindtap="onItem">
<view class="row cc ac {{classActive}}" wx:if="{{activeIndex === index}}">
......@@ -11,5 +11,5 @@
</view>
</view>
</block>
</scroll-view>
</view>
</view>
\ No newline at end of file
component/m-tab/m-tab.wxss
......@@ -11,6 +11,7 @@
padding: 0;
white-space: nowrap;
border: none;
overflow: scroll;
}
.m-tab-list::-webkit-scrollbar {
......
component/m-textarea/m-textarea.wxml
<view class="m-textarea">
<view class="m-textarea-text {{className}}" hidden="{{!winText}}" bindtap="setInputShow">
<text class="m-textarea-text-value" wx:if="{{value === '' ? false : true}}">{{value}}</text>
<text class="m-textarea-text-placeholder" wx:if="{{value === '' ? true : false}}">{{placeholder}}</text>
<view class="m-textarea-text-wrap">
<text class="m-textarea-text-value" wx:if="{{value === '' ? false : true}}">{{value}}</text>
<text class="m-textarea-text-placeholder" wx:if="{{value === '' ? true : false}}">{{placeholder}}</text>
</view>
</view>
<view class="m-textarea-input {{className}}" hidden="{{!winInput}}">
<textarea
value="{{value}}"
placeholder="{{placeholder}}"
placeholder-class="m-textarea-text-placeholder"
maxlength="{{inputMax}}"
focus="{{inputFocus}}"
bindinput="onInput"
bindfocus="onInputFocus"
bindblur="onInputBlur"
bindconfirm="onInputConfirm"
></textarea>
<view class="m-textarea-text-wrap">
<textarea
value="{{value}}"
placeholder="{{placeholder}}"
placeholder-class="m-textarea-text-placeholder"
maxlength="{{inputMax}}"
focus="{{inputFocus}}"
bindinput="onInput"
bindfocus="onInputFocus"
bindblur="onInputBlur"
bindconfirm="onInputConfirm"
></textarea>
</view>
</view>
<view class="m-textarea-quantity">
......
component/m-textarea/m-textarea.wxss
......@@ -2,14 +2,21 @@
position: relative;
}
.m-textarea-text {
overflow: hidden;
.m-textarea-text-wrap {
width: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
}
.m-textarea-text-value {
color: #000000;
}
.m-textarea-input > view {
margin: 0 0 40rpx 0;
}
.m-textarea-text-placeholder {
display: inline-block;
font-size: 30rpx;
......
image/icon/warning-1.png
image/icon/warning-1.png

2.16 KB | W: | H:

image/icon/warning-1.png

369 Bytes | W: | H:

image/icon/warning-1.png
image/icon/warning-1.png
image/icon/warning-1.png
image/icon/warning-1.png
  • 2-up
  • Swipe
  • Onion skin
image/icon/warning-2.png
image/icon/warning-2.png

2.36 KB | W: | H:

image/icon/warning-2.png

379 Bytes | W: | H:

image/icon/warning-2.png
image/icon/warning-2.png
image/icon/warning-2.png
image/icon/warning-2.png
  • 2-up
  • Swipe
  • Onion skin
image/icon/warning-3.png
image/icon/warning-3.png

2.17 KB | W: | H:

image/icon/warning-3.png

374 Bytes | W: | H:

image/icon/warning-3.png
image/icon/warning-3.png
image/icon/warning-3.png
image/icon/warning-3.png
  • 2-up
  • Swipe
  • Onion skin
image/icon/warning-4.png
image/icon/warning-4.png

2.32 KB | W: | H:

image/icon/warning-4.png

355 Bytes | W: | H:

image/icon/warning-4.png
image/icon/warning-4.png
image/icon/warning-4.png
image/icon/warning-4.png
  • 2-up
  • Swipe
  • Onion skin
pages/club/create/create.js
......@@ -52,7 +52,7 @@ Page({
this.setData({
establishInfo: this.establishBuffer
})
console.log(funcEvent)
console.log(this.data.establishInfo)
},
onEstablish: function () {
......@@ -67,14 +67,12 @@ Page({
for (let i = 0, l = funcEstablishInfoKey.length; i < l; i++) {
// error 信息验证，如果存在非空字段，则表示有数据校验不通过。
if (funcEstablishInfoKey[i].indexOf('error') >= 0 && this.data.establishInfo[funcEstablishInfoKey[i]]) {
console.log('验证不通过')
funcPass = false
}
// 常规字段验证，确保没有非空字段。
if (funcEstablishInfoKey[i].indexOf('error') < 0 && this.data.establishInfo[funcEstablishInfoKey[i]] === '') {
this.onInputBlur({ detail: { id: funcEstablishInfoKey[i], value: '' }})
console.log('验证不通过')
funcPass = false
}
}
......@@ -88,10 +86,10 @@ Page({
url: 'v3/club/createClub',
params: {
'name': this.data.establishInfo.clubName,
'summary': this.data.establishInfo.describe,
'summary': this.data.establishInfo.clubDescribe,
'userName': this.data.establishInfo.userName,
'mobile': this.data.establishInfo.userPhone,
'wxAccount': 'wxAccount'
'wxAccount': ''
}
}).then((response) => {
App.ui.hideToast()
......
pages/club/home/home.js
......@@ -4,7 +4,7 @@ Page({
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
bannerCreatTop: wx.getStorageSync('navStatusHeight') + wx.getStorageSync('navTitleHeight') + 30,
bannerCreatTop: 0,
tabItem: [
{ 'text': '全部', 'value': '' },
......@@ -186,7 +186,6 @@ Page({
* @returns
*/
onTabChange: function (funcEvent) {
console.log(funcEvent6)
let funcItem = funcEvent.detail
this.setData({
clubList: [],
......@@ -204,4 +203,12 @@ Page({
onPageScroll: function (funcEvent) {
App.pageScroll(funcEvent, this)
},
eventNavChangeHeight: function (funcEvent) {
console.log(funcEvent)
let funcNavHeight = funcEvent.detail.navHeight
this.setData({
bannerCreatTop: funcNavHeight + 30 * wx.getStorageSync('unitProportion')
})
},
})
\ No newline at end of file
pages/club/home/home.wxml
<m-nav titleText="俱乐部" styleIndex="{{2}}" scrollHeight="{{navScroll}}" isOccupy="{{false}}"></m-nav>
<m-nav titleText="俱乐部" styleIndex="{{2}}" scrollHeight="{{navScroll}}" isOccupy="{{false}}" bindnavChangeHeight="eventNavChangeHeight"></m-nav>
<!-- 创建权限提醒 -->
<view class="member-power row cc ac" wx:if="{{winPowerInfoEstablish}}">
......
pages/mall/exchange-record/exchange-record.js 0 → 100644
// pages/mall/exchange-record/exchange-record.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/mall/exchange-record/exchange-record.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mall/exchange-record/exchange-record.wxml 0 → 100644
<!--pages/mall/exchange-record/exchange-record.wxml-->
<text>pages/mall/exchange-record/exchange-record.wxml</text>
pages/mall/exchange-record/exchange-record.wxss 0 → 100644
/* pages/mall/exchange-record/exchange-record.wxss */
\ No newline at end of file
pages/mall/exchange-state/exchange-state.js 0 → 100644
// pages/mall/exchange-state/exchange-state.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/mall/exchange-state/exchange-state.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mall/exchange-state/exchange-state.wxml 0 → 100644
<!--pages/mall/exchange-state/exchange-state.wxml-->
<text>pages/mall/exchange-state/exchange-state.wxml</text>
pages/mall/exchange-state/exchange-state.wxss 0 → 100644
/* pages/mall/exchange-state/exchange-state.wxss */
\ No newline at end of file
pages/mall/exchange-tip/exchange-tip.js 0 → 100644
// pages/mall/exchange-tip/exchange-tip.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/mall/exchange-tip/exchange-tip.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mall/exchange-tip/exchange-tip.wxml 0 → 100644
<!--pages/mall/exchange-tip/exchange-tip.wxml-->
<text>pages/mall/exchange-tip/exchange-tip.wxml</text>
pages/mall/exchange-tip/exchange-tip.wxss 0 → 100644
/* pages/mall/exchange-tip/exchange-tip.wxss */
\ No newline at end of file
pages/mall/goods/goods.js 0 → 100644
Page({
data: {
banner: [],
},
onLoad: function (options) {
},
/**
* banner 切换图片同步自定义标识组件
* @function
* @param {object} - funcEvent
* @returns
*/
eventSwiperChange: function(funcEvent) {
this.setData({
bannerIndex: funcEvent.detail.current
})
},
})
\ No newline at end of file
pages/mall/goods/goods.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mall/goods/goods.wxml 0 → 100644
<view class="container">
<view id="banner" class="banner">
<swiper autoplay circular class="banner-swiper" indicator-dots="{{false}}" interval="2000" duration="500" bindchange="eventSwiperChange">
<block wx:for="{{banner}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<swiper-item class="banner-swiper-item">
<image class="banner-swiper-image" src="{{item}}"></image>
</swiper-item>
</block>
</swiper>
<view class="banner-swiper-point">
<swiper-point bannerStyle="{{1}}" bannerActiveIndex="{{bannerIndex}}"></swiper-point>
</view>
<view class="banner-wave">
<image src="/image/ornament-2.png" mode="widthFix"></image>
</view>
</view>
</view>
\ No newline at end of file
pages/mall/goods/goods.wxss 0 → 100644
/* banner 样式 */
.banner {
position: relative;
width: 750rpx;
height: 800rpx;
background: #fff;
}
.banner-swiper, .banner-swiper-item, .banner-swiper-image {
position: absolute;
top: 0 !important;
left: 0 !important;
width: 750rpx;
height: 800rpx;
}
.banner-swiper-point {
position: relative;
top: 680rpx;
left: 0;
}
.banner-wave {
z-index: 1;
position: relative;
top: 740rpx;
left: 0;
width: 750rpx;
height: 60rpx;
}
.banner-wave image {
display: block;
width: 750rpx;
height: 60rpx;
}
\ No newline at end of file
pages/mall/home/home.js
let App = getApp()
Page({
data: {
recommendList: {
'0': [], // 专场数据
'1': [], // 专场数据
},
tabItemCommodity: [
{ text: '全部', value: '' },
{ text: '文创', value: '' },
......@@ -20,7 +25,65 @@ Page({
},
onLoad: function (options) {
this.queryRecommend()
},
queryRecommend: function () {
App.request({
url: 'v3/integralGood/getGoodList',
params: {
'pageNo': 1,
'pageSize': 5,
'tagId': '304',
}
}).then((response) => {
let funcData = response.data.list
let funcList = []
for (let i = 0, l = funcData.length; i < l; i++) {
let funcItem = {
'id': funcData[i].commodityId,
'name': funcData[i].name,
'cover': funcData[i].cover,
'price': funcData[i].price,
'exchangeQuantity': funcData[i].sellNumber,
}
funcList.push(funcItem)
}
let funcRecommendList = this.data.recommendList
funcRecommendList['0'] = funcList
this.setData({
recommendList: funcRecommendList
})
}).catch((response) => { })
App.request({
url: 'v3/integralGood/getGoodList',
params: {
'pageNo': 1,
'pageSize': 5,
'tagId': '305',
}
}).then((response) => {
let funcData = response.data.list
let funcList = []
for (let i = 0, l = funcData.length; i < l; i++) {
let funcItem = {
'id': funcData[i].commodityId,
'name': funcData[i].name,
'cover': funcData[i].cover,
'price': funcData[i].price,
'exchangeQuantity': funcData[i].sellNumber,
}
funcList.push(funcItem)
}
let funcRecommendList = this.data.recommendList
funcRecommendList['1'] = funcList
this.setData({
recommendList: funcRecommendList
})
}).catch((response) => {})
},
/**
......
pages/mall/home/home.wxml
......@@ -28,13 +28,13 @@
<text>亲自专场</text>
</view>
<view class="recommend_list">
<block wx:for="{{3}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<block wx:for="{{recommendList['0']}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="recommend_item">
<view class="recommend_item_info column">
<image src=""></image>
<text class="recommend_item_info_name">金桂浮月收纳盒</text>
<image src="{{item.cover}}"></image>
<text class="recommend_item_info_name">{{item.name}}</text>
<view class="recommend_item_info_price row ac">
<text>20000</text>
<text>{{item.price}}</text>
<text>积分</text>
</view>
</view>
......@@ -51,13 +51,13 @@
<text>亲自专场</text>
</view>
<view class="recommend_list">
<block wx:for="{{3}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<block wx:for="{{recommendList['1']}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="recommend_item">
<view class="recommend_item_info column">
<image src=""></image>
<text class="recommend_item_info_name">金桂浮月收纳盒</text>
<image src="{{item.cover}}"></image>
<text class="recommend_item_info_name">{{item.name}}</text>
<view class="recommend_item_info_price row ac">
<text>20000</text>
<text>{{item.price}}</text>
<text>积分</text>
</view>
</view>
......
pages/mine/address-add/address-add.js 0 → 100644
// pages/mine/address-add/address-add.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/mine/address-add/address-add.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mine/address-add/address-add.wxml 0 → 100644
<!--pages/mine/address-add/address-add.wxml-->
<text>pages/mine/address-add/address-add.wxml</text>
pages/mine/address-add/address-add.wxss 0 → 100644
/* pages/mine/address-add/address-add.wxss */
\ No newline at end of file
pages/mine/address/address.js 0 → 100644
// pages/mine/address/address.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/mine/address/address.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mine/address/address.wxml 0 → 100644
<!--pages/mine/address/address.wxml-->
<text>pages/mine/address/address.wxml</text>
pages/mine/address/address.wxss 0 → 100644
/* pages/mine/address/address.wxss */
\ No newline at end of file
pages/mine/club-manage/club-manage.js 0 → 100644
let App = getApp()
Page({
data: {
tabItem: [
{ text: '待审核', value: 0 },
{ text: '已通过', value: 1 },
{ text: '已回绝', value: 2 },
],
tabIndex: 0,
examineList: [],
pageIndex: 1,
pageSize: 5,
},
onLoad: function (options) {
console.log(options)
this.setData({
clubInfo: { id: options.id }
})
this.queryExamine()
},
/**
* 查询我加入的
* @function
* @param
* @returns
*/
queryExamine: function () {
App.request({
url: 'v3/club/getAuditList',
params: {
'pageNo': this.data.pageIndex,
'pageSize': this.data.pageSize,
'state': this.data.tabItem[this.data.tabIndex].value,
'clubId': this.data.clubInfo.id,
}
}).then((response) => {
console.log(response)
let funcData = response.data.list
let funcList = []
for (let i = 0, l = funcData.length; i < l; i++) {
let funcItem = {
'idMember': funcData[i].memberId, // 成员 id
'idExamine': funcData[i].joinClubAuditId, // 审核 id
'name': funcData[i].name, // 名称
'nickname': funcData[i].nickname, // 昵称
'avatar': funcData[i].img, // 头像
'userType': Number(funcData[i].userType), // 用户身份
'remarks': funcData[i].remarks,
'phone': funcData[i].mobile,
'wx': funcData[i].wxAccount,
}
funcList.push(funcItem)
}
this.setData({
examineList: funcList
})
}).catch((response) => {})
},
onExamineRefuse: function (funcEvent) {
App.ui.showDialog({
type: 'input',
title: '是否确认审核通过？',
content: '审核通过后无法恢复',
cancel: '取消',
confirm: '确定',
placeholder: '不通过原因',
success: (response) => {
let funcItem = funcEvent.currentTarget.dataset.item
App.request({
url: 'v3/club/getAuditList',
params: {
'state': '2',
'remarks': response.input,
'joinClubAuditId': funcItem.idExamine,
}
}).then((response) => {
}).catch((response) => {})
},
fail: () => {},
})
},
onExaminePass: function (funcEvent) {
App.ui.showDialog({
type: 'confirm',
title: '是否确认审核通过？',
content: '审核通过后无法恢复',
cancel: '取消',
confirm: '确定',
success: () => {
let funcItem = funcEvent.currentTarget.dataset.item
App.request({
url: 'v3/club/getAuditList',
params: {
'state': '1',
'remarks': '',
'joinClubAuditId': funcItem.idExamine,
}
}).then((response) => {
}).catch((response) => {})
},
fail: () => {},
})
},
eventTabChange: function (funcEvent) {
let funcTabIndex = funcEvent.detail.index
this.setData({
tabIndex: funcTabIndex
})
this.queryExamine()
},
})
\ No newline at end of file
pages/mine/club-manage/club-manage.json 0 → 100644
{
"usingComponents": {}
}
\ No newline at end of file
pages/mine/club-manage/club-manage.wxml 0 → 100644
<m-toast></m-toast>
<m-dialog></m-dialog>
<m-nav titleText="我的俱乐部" styleIndex="{{1}}"></m-nav>
<view class="tab">
<m-tab item="{{tabItem}}" classTabList="row cb tab_list" bindtabChange="eventTabChange"></m-tab>
</view>
<view class="container">
<view class="member_list column ac">
<block wx:for="{{examineList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<!-- 待审核列表 -->
<view class="member_item column" wx:if="{{tabIndex === 0}}">
<view class="member_info_name row ac">
<image class="member_avatar" src="{{item.avatar}}"></image>
<text class="text_overflow_point">{{item.name}}</text>
<text class="owner-mark" wx:if="{{item.userType === 1}}">业主</text>
</view>
<view class="member_info_other column">
<view class="row ac">
<text>手机号</text>
<text class="text_overflow_point">15046661378</text>
</view>
<view class="row ac">
<text>微信昵称</text>
<text class="text_overflow_point">羊羊羊</text>
</view>
<view class="row ac">
<text>微信号</text>
<text class="text_overflow_point">wxid19910803</text>
</view>
<view class="row ac">
<text>备注</text>
<text class="text_overflow_point">5号楼3单元703业主</text>
</view>
</view>
<view class="member_info_operation row cb ac">
<text data-item="{{item}}" bindtap="onExamineRefuse">审核不通过</text>
<text data-item="{{item}}" bindtap="onExaminePass">审核通过</text>
</view>
</view>
<!-- 已通过列表 -->
<view class="member_item_pass row ac" wx:if="{{tabIndex === 1}}">
<image src="{{item.avatar}}"></image>
<view class="member_item_pass_info row cb ac">
<view class="column">
<text>{{item.name}}</text>
<text>{{item.phone}}</text>
</view>
<image class="icon_40" src="{{imageBase + 'icon/warning-5.png'}}"></image>
</view>
</view>
<!-- 已回绝列表 -->
<view class="member_item_refuse column" wx:if="{{tabIndex === 2}}">
</view>
</block>
</view>
</view>
\ No newline at end of file
pages/mine/club-manage/club-manage.wxss 0 → 100644
/* tab 样式 */
.tab {
margin-top: 60rpx;
}
.tab_list {
padding: 0 24rpx;
}
/* 待审核列表 */
.member_list {
width: 750rpx;
min-height: 85vh;
padding: 0 40rpx 100rpx 40rpx;
background: #F3F4F6;
}
.member_item {
width: 670rpx;
height: 462rpx;
margin: 48rpx 0 0 0;
padding: 40rpx 0 0 0;
border-radius: 4px;
background: #FFFFFF;
}
.member_info_name {
padding: 0 32rpx;
}
.member_info_name > text:nth-child(2) {
max-width: 400rpx;
margin: 0 16rpx 0 0;
font-size: 30rpx;
font-weight: 800;
line-height: 42px;
color: #15191F;
}
.member_avatar {
width: 80rpx;
height: 80rpx;
margin: 0 32rpx 0 0;
border-radius: 4px;
background: #999999;
}
.member_info_other {
margin: 20rpx 0 0 0;
padding: 0 32rpx 0 144rpx;
}
.member_info_other > view {
margin: 12rpx 0 0 0;
}
.member_info_other text {
height: 36rpx;
font-size: 26rpx;
font-weight: 400;
line-height: 36rpx;
color: #959DA9;
}
.member_info_other text:nth-child(1) {
width: 104rpx;
margin: 0 24rpx 0 0;
text-align-last: justify;
}
.member_info_other text:nth-child(2) {
max-width: 270rpx;
margin: 0 24rpx 0 0;
text-align-last: justify;
}
.member_info_operation {
width: 670rpx;
height: 94rpx;
margin: 42rpx 0 0 ;
padding: 0 102rpx;
border-top: 1px #E2E7EF solid;
}
.member_info_operation > text:nth-child(1) {
height: 36rpx;
font-size: 26rpx;
font-weight: 800;
line-height: 36rpx;
color: #E66060;
}
.member_info_operation > text:nth-child(2) {
height: 36rpx;
font-size: 26rpx;
font-weight: 800;
line-height: 36rpx;
color: #656E7B;
}
/* 已通过，已回绝列表 */
.member_item_pass,
.member_item_refuse {
width: 750rpx;
height: 146rpx;
}
.member_item_pass > image {
width: 88rpx;
height: 88rpx;
margin: 0 24rpx 0 40rpx;
border-radius: 4px;
background: #999999;
}
.member_item_pass_info {
flex-grow: 1;
height: 146rpx;
padding: 0 40rpx 0 0;
border-bottom: 1px #E2E7EF solid;
}
\ No newline at end of file
pages/mine/club/club.js
......@@ -75,6 +75,7 @@ Page({
'name': funcData[i].name,
'member': funcData[i].memberNum,
'memberId': funcData[i].memberId,
'examine': funcData[i].count, // 入会审核数量
'state': Number(funcData[i].state),
'date': funcData[i].date,
'isOwner': Number(funcData[i].owner) === 0 ? false : true
......@@ -228,6 +229,11 @@ Page({
}
},
onExamine: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item
wx.navigateTo({ url: '/pages/mine/club-manage/club-manage?id=' + funcItem.id })
},
onClubMore: function () {
wx.redirectTo({ url: '/pages/club/home/home' })
},
......
pages/mine/club/club.wxml
......@@ -26,7 +26,7 @@
<text>{{item.date + ' 提交申请'}}</text>
<text>{{'审核待通过'}}</text>
</view>
<view class="club-operation row cb ae">
<view class="club_operation row cb ae">
<button class="row cc ac" data-item="{{item}}" bindtap="onCancel">取消申请</button>
</view>
</view>
......@@ -47,8 +47,13 @@
<text wx:if="{{tabIndex === 0}}">{{item.date + ' 加入'}}</text>
<text wx:if="{{tabIndex === 1}}">{{item.date + ' 创建'}}</text>
</view>
<view class="club-operation row cb ae">
<view class="club_operation row cb ae">
<block wx:if="{{item.examine}}" >
<view class="club_operation_examine row cc ac">
<text>{{item.examine}}</text>
</view>
<button class="row cc ac"data-item="{{item}}" bindtap="onExamine">入会审核</button>
</block>
</view>
</view>
</view>
......@@ -67,7 +72,7 @@
<text>{{item.date + ' 提交申请'}}</text>
<text>{{'审核未通过'}}</text>
</view>
<view class="club-operation row cb ae">
<view class="club_operation row cb ae">
<button class="row cc ac" data-item="{{item}}" bindtap="onDelete">删除</button>
</view>
</view>
......
pages/mine/club/club.wxss
......@@ -36,7 +36,7 @@
.club-list {
width: 750rpx;
min-height: 85vh;
padding: 0 40rpx;
padding: 0 40rpx 100rpx 40rpx;
}
.club-item {
......@@ -101,7 +101,11 @@
color: #959DA9;
}
.club-operation > button {
.club_operation {
position: relative;
}
.club_operation > button {
width: 120rpx;
height: 56rpx;
border-radius: 4px;
......@@ -113,6 +117,22 @@
color: #656E7B;
}
.club_operation_examine {
z-index: 4;
position: absolute;
top: -16rpx;
right: -16rpx;
min-width: 32rpx;
height: 32rpx;
border-radius: 16rpx;
background: #E66060;
font-size: 22rpx;
font-weight: 500;
line-height: 32rpx;
color: #FFFFFF;
}
/* 空列表样式 */
.club_list_nothing_tip {
height: 216rpx;
......
pages/mine/home/home.js
......@@ -507,10 +507,12 @@ Page({
* @returns
*/
onIntegralDetail: function (funcEvent) {
let integral = funcEvent.currentTarget.dataset.integral
wx.navigateTo({
url: '/pages/mine/accumulate/accumulate?integral=' + integral,
})
// let integral = funcEvent.currentTarget.dataset.integral
// wx.navigateTo({
// url: '/pages/mine/accumulate/accumulate?integral=' + integral,
// })
wx.navigateTo({ url: '/pages/mall/home/home' })
},
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment