Skip to content

严立 / mini-shimao

Go to a project
Commit 13035af7 by 严立
Options

LL - 积分商城订单状态完成

parent 17f52045
Inline Side-by-side
Showing with 353 additions and 220 deletions
pages/club/information/information.js
...@@ -10,7 +10,6 @@ Page({ ...@@ -10,7 +10,6 @@ Page({
winEnter: false, // 加入提交提示 winEnter: false, // 加入提交提示
winPowerInfoEnter: false, // 加入权限提示 winPowerInfoEnter: false, // 加入权限提示
winExamineRemark: false,
winExamineTip: false, winExamineTip: false,
}, },
...@@ -29,8 +28,6 @@ Page({ ...@@ -29,8 +28,6 @@ Page({
'content': '', 'content': '',
'isOwner': false 'isOwner': false
}, },
examineRemark: options.remark ? options.remark : '',
winExamineRemark: options.remark ? true : false,
}) })
this.queryClubInfo() this.queryClubInfo()
this.queryActivity() this.queryActivity()
...@@ -193,7 +190,6 @@ Page({ ...@@ -193,7 +190,6 @@ Page({
winPowerInfoEstablish: false, winPowerInfoEstablish: false,
winEnter: false, winEnter: false,
winPowerInfoEnter: false, winPowerInfoEnter: false,
winExamineRemark: false,
}) })
}, },
......
pages/club/information/information.wxml
...@@ -69,7 +69,9 @@ ...@@ -69,7 +69,9 @@
</view> </view>
</view> </view>
</block> </block>
<view class="card-item column ac"></view> <view class="card_item_last row">
<text>　</text>
</view>
</view> </view>
</view> </view>
...@@ -95,7 +97,7 @@ ...@@ -95,7 +97,7 @@
<m-button-bottom text="申请加入" bindclick="onEnterClub"></m-button-bottom> <m-button-bottom text="申请加入" bindclick="onEnterClub"></m-button-bottom>
</view> </view>
<!-- 加入权限提醒 --> <!-- 俱乐部加入权限提醒 -->
<view class="member-power row cc ac" wx:if="{{winPowerInfoEnter}}"> <view class="member-power row cc ac" wx:if="{{winPowerInfoEnter}}">
<view class="member-power-info col cc ac"> <view class="member-power-info col cc ac">
<text>权限提醒</text> <text>权限提醒</text>
...@@ -108,14 +110,3 @@ ...@@ -108,14 +110,3 @@
<view class="submit-success row cc ac" wx:if="{{winEnter}}">> <view class="submit-success row cc ac" wx:if="{{winEnter}}">>
<image src="{{resourcesBase + 'operation-tip/club-enter.png'}}" bindtap="onCloseTip"></image> <image src="{{resourcesBase + 'operation-tip/club-enter.png'}}" bindtap="onCloseTip"></image>
</view> </view>
\ No newline at end of file
<!-- 加入审核拒绝提示 -->
<view class="dialog_examine row cc ac" wx:if="{{winExamineRemark}}">
<view class="dialog_examine_content column cc ac">
<text class="font_bold_50 color_regular">审核说明</text>
<view class="dialog_examine_content_remark row">
<text class="font_normal_30 color_cancel">{{'失败原因：' + examineRemark}}</text>
</view>
<button class="dialog_examine_close font_bold_30 color_regular row cc ac" bindtap="onCloseTip">我知道了</button>
</view>
</view>
\ No newline at end of file
pages/club/information/information.wxss
...@@ -114,9 +114,13 @@ ...@@ -114,9 +114,13 @@
background: #F5F6F8; background: #F5F6F8;
} }
.card-item:last-child { .card_item_last {
width: 1px !important; display: inline-block;
width: 2px;
height: 552rpx;
border: 1px rgba(0, 0, 0, 0) solid;
background: rgba(0, 0, 0, 0); background: rgba(0, 0, 0, 0);
overflow: hidden;
} }
.card-item-cover { .card-item-cover {
...@@ -281,36 +285,3 @@ ...@@ -281,36 +285,3 @@
line-height: 42rpx; line-height: 42rpx;
color: #15191F; color: #15191F;
} }
\ No newline at end of file
/* 弹窗 - 审核拒绝备注 */
.dialog_examine {
z-index: 7;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, .65);
}
.dialog_examine_content {
width: 606rpx;
height: 538rpx;
border-radius: 2px;
background: #FFFFFF;
}
.dialog_examine_content_remark {
width: 526rpx;
height: 162rpx;
margin: 48rpx 0 0 0;
overflow-y: scroll;
}
.dialog_examine_close {
width: 526rpx;
height: 80rpx;
margin: 72rpx 0 0 0;
border-radius: 4rpx;
border: 1px solid #15191F;
}
\ No newline at end of file
pages/mall/exchange-record/exchange-record.js
...@@ -34,7 +34,8 @@ Page({ ...@@ -34,7 +34,8 @@ Page({
'price': funcData[i].smOrderDetails[0].unitPrice, 'price': funcData[i].smOrderDetails[0].unitPrice,
'priceTotal': funcData[i].smOrderDetails[0].totalPrices, 'priceTotal': funcData[i].smOrderDetails[0].totalPrices,
'quantity': funcData[i].smOrderDetails[0].number, 'quantity': funcData[i].smOrderDetails[0].number,
'state': Number(funcData[i].status) 'state': Number(funcData[i].status),
'timeCreate': App.modular.miment(funcData[i].createDate).format('YYYY-MM-DD hh:mm:ss')
} }
funcList.push(funcItem) funcList.push(funcItem)
} }
......
pages/mall/exchange-record/exchange-record.wxml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!-- 待发货 --> <!-- 待发货 -->
<view class="record_item column" wx:if="{{item.state === 1}}" data-item="{{item}}" bindtap="onRecordDetail"> <view class="record_item column" wx:if="{{item.state === 1}}" data-item="{{item}}" bindtap="onRecordDetail">
<view class="row cb ac"> <view class="row cb ac">
<text class="font_normal_26 color_secondary">{{'订单编号：'}}</text> <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
<text class="font_normal_26 color_warning">待发货</text> <text class="font_normal_26 color_warning">待发货</text>
</view> </view>
<view class="record_item_info row ac"> <view class="record_item_info row ac">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<!-- 待收货 --> <!-- 待收货 -->
<view class="record_item column" wx:if="{{item.state === 2 || item.state === 5}}" data-item="{{item}}" bindtap="onRecordDetail"> <view class="record_item column" wx:if="{{item.state === 2 || item.state === 5}}" data-item="{{item}}" bindtap="onRecordDetail">
<view class="row cb ac"> <view class="row cb ac">
<text class="font_normal_26 color_secondary">{{'订单编号：'}}</text> <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
<text class="font_normal_26 color_warning">待收货</text> <text class="font_normal_26 color_warning">待收货</text>
</view> </view>
<view class="record_item_info row ac"> <view class="record_item_info row ac">
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<!-- 已完成 --> <!-- 已完成 -->
<view class="record_item column" wx:if="{{item.state === 3}}" data-item="{{item}}" bindtap="onRecordDetail"> <view class="record_item column" wx:if="{{item.state === 3}}" data-item="{{item}}" bindtap="onRecordDetail">
<view class="row cb ac"> <view class="row cb ac">
<text class="font_normal_26 color_secondary">{{'下单时间：'}}</text> <text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
<text class="font_normal_26 color_secondary">已完成</text> <text class="font_normal_26 color_secondary">已完成</text>
</view> </view>
<view class="record_item_info row ac"> <view class="record_item_info row ac">
...@@ -73,6 +73,29 @@ ...@@ -73,6 +73,29 @@
<button class="record_item_operation_logistics row cc ac" data-item="{{item}}" catchtap="onDelete">删除订单</button> <button class="record_item_operation_logistics row cc ac" data-item="{{item}}" catchtap="onDelete">删除订单</button>
</view> </view>
</view> </view>
<!-- 已过期 -->
<view class="record_item column" wx:if="{{item.state === 4}}" data-item="{{item}}" bindtap="onRecordDetail">
<view class="row cb ac">
<text class="font_normal_26 color_secondary">{{'下单时间：' + item.timeCreate}}</text>
<text class="font_normal_26 color_secondary">已过期</text>
</view>
<view class="record_item_info row ac">
<view class="record_item_info_cover">
<image src="{{item.cover}}"></image>
</view>
<view class="record_item_info_name row ac">
<text class="font_bold_30 color_regular">{{item.name}}</text>
</view>
<view class="record_item_info_price column ce ae">
<text class="font_bold_30 color_regular">{{item.priceTotal + ' 积分'}}</text>
<text class="font_normal_26 color_secondary">x1</text>
</view>
</view>
<view class="record_item_operation row ce ac">
<button class="record_item_operation_logistics row cc ac" data-item="{{item}}" catchtap="onDelete">删除订单</button>
</view>
</view>
</block> </block>
</view> </view>
</view> </view>
\ No newline at end of file
pages/mall/exchange-record/exchange-record.wxss
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
} }
.record_list { .record_list {
margin: 40rpx 0 0 0; margin: 10rpx 0 0 0;
} }
.record_item { .record_item {
...@@ -31,14 +31,20 @@ ...@@ -31,14 +31,20 @@
.record_item_info_name { .record_item_info_name {
width: 256rpx; width: 256rpx;
max-height: 80px; max-height: 80px;
padding: 0 0 10rpx 0;
} }
.record_item_info_price { .record_item_info_price {
flex-grow: 1; flex-grow: 1;
padding: 0 0 10rpx 0;
}
.record_item_info_price > text:nth-child(2) {
margin: 10rpx 0 0 0;
} }
.record_item_operation { .record_item_operation {
margin: 48rpx 0 0 0; margin: 38rpx 0 0 0;
} }
.record_item_operation_logistics { .record_item_operation_logistics {
......
pages/mall/exchange-state/exchange-state.js
...@@ -36,6 +36,12 @@ Page({ ...@@ -36,6 +36,12 @@ Page({
this.queryExchangeDetail() this.queryExchangeDetail()
}, },
/**
* 查询订单详情
* @function
* @param
* @returns
*/
queryExchangeDetail: function () { queryExchangeDetail: function () {
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', iconType: 'loading',
...@@ -69,7 +75,7 @@ Page({ ...@@ -69,7 +75,7 @@ Page({
// 已使用 // 已使用
case 3: case 3:
funcStateTitle = '订单已使用' funcStateTitle = '订单已完成'
funcStateCss = 'background: #ECF4F8;' funcStateCss = 'background: #ECF4F8;'
break break
...@@ -93,7 +99,6 @@ Page({ ...@@ -93,7 +99,6 @@ Page({
'userName': funcData.name, 'userName': funcData.name,
'userPhone': funcData.mobilePhone, 'userPhone': funcData.mobilePhone,
} }
console.log(funcCouponInfo)
// 兑换商品数据 // 兑换商品数据
let funcGoodsInfo = [] let funcGoodsInfo = []
...@@ -109,7 +114,6 @@ Page({ ...@@ -109,7 +114,6 @@ Page({
funcGoodsInfo.push(funcItem) funcGoodsInfo.push(funcItem)
funcIntegralTotal = funcIntegralTotal + funcItem.price * funcItem.quantity funcIntegralTotal = funcIntegralTotal + funcItem.price * funcItem.quantity
} }
console.log(funcGoodsInfo)
// 寄送地址 // 寄送地址
let funcAddressInfo = { let funcAddressInfo = {
...@@ -124,10 +128,10 @@ Page({ ...@@ -124,10 +128,10 @@ Page({
let funcOtherInfo = { let funcOtherInfo = {
'timeExpire': funcData.expireTime.replace(/-/g, '.').replace(/ /g, '').replace(/~/g, '-'), 'timeExpire': funcData.expireTime.replace(/-/g, '.').replace(/ /g, '').replace(/~/g, '-'),
'timeCreate': funcData.createDate, 'timeCreate': funcData.createDate,
'timeShipment': '', 'timeExpress': funcData.sendGoodDate,
'orderNumber': funcData.orderSerialNumber, 'orderNumber': funcData.orderSerialNumber,
'expressNumber': funcData.logisticsNo
} }
console.log(funcOtherInfo)
this.setData({ this.setData({
state: funcState, state: funcState,
...@@ -144,15 +148,30 @@ Page({ ...@@ -144,15 +148,30 @@ Page({
isViewDataReady: true, isViewDataReady: true,
}) })
console.log('funcState', funcState)
console.log('isExpress', this.data.isExpress)
App.ui.hideToast() App.ui.hideToast()
}).catch((response) => { }).catch((response) => {
}) })
}, },
/**
* 复制物流单号
* @function
* @param
* @returns
*/
onCopyExpressNumber: function () {
wx.setClipboardData({
data: this.data.otherInfo.expressNumber,
})
},
/**
* 查看兑换券码
* @function
* @param
* @returns
*/
onCouponCodeScan: function () { onCouponCodeScan: function () {
App.request({ App.request({
url: 'v1/order/getVolumesByOrderId', url: 'v1/order/getVolumesByOrderId',
...@@ -176,18 +195,36 @@ Page({ ...@@ -176,18 +195,36 @@ Page({
}) })
}, },
/**
* 复制兑换券码
* @function
* @param
* @returns
*/
onCouponCodeCopy: function () { onCouponCodeCopy: function () {
wx.setClipboardData({ wx.setClipboardData({
data: this.data.couponInfo.codeNumber, data: this.data.couponInfo.codeNumber,
}) })
}, },
/**
* 关闭兑换券码弹窗
* @function
* @param
* @returns
*/
onCouponCodeClose: function () { onCouponCodeClose: function () {
this.setData({ this.setData({
winCouponCode: false winCouponCode: false
}) })
}, },
/**
* 查看使用须知
* @function
* @param
* @returns
*/
onGoodsNotes: function () { onGoodsNotes: function () {
this.setData({ this.setData({
winPopup: true winPopup: true
......
pages/mall/exchange-state/exchange-state.wxml
...@@ -4,15 +4,21 @@ ...@@ -4,15 +4,21 @@
<view class="container" wx:if="{{isViewDataReady}}"> <view class="container" wx:if="{{isViewDataReady}}">
<!-- 订单状态 --> <!-- 订单状态 -->
<view class="state column cc" style="{{stateCss}}" wx:if="{{isExpress && state !== 2}}"> <view class="state column cc" style="{{stateCss}}" wx:if="{{(isExpress && state !== 2) || state === 3 || state === 4}}">
<text class="font_bold_54 color_regular">{{stateTitle}}</text> <text class="font_bold_54 color_regular">{{stateTitle}}</text>
<text class="font_normal_26 color_regular" wx:if="{{state === 4}}">{{'有效期' + otherInfo.timeExpire}}</text> <view class="state_tip row ac" wx:if="{{state === 4}}">
<text class="font_normal_26 color_regular">{{'有效期：' + otherInfo.timeExpire}}</text>
</view>
<view class="state_tip row ac" wx:if="{{state === 5}}">
<text class="font_normal_26 color_regular">{{'物流单号：' + otherInfo.expressNumber}}</text>
<text class="font_bolder_26 color_regular" space="nbsp" bindtap="onCopyExpressNumber"> 复制</text>
</view>
</view> </view>
<!-- 邮寄订单内容 --> <!-- 邮寄订单内容 -->
<block wx:if="{{isExpress}}"> <block wx:if="{{isExpress}}">
<!-- 快递提示 --> <!-- 快递提示 -->
<view class="express_tip row ac"> <view class="express_tip row ac" wx:if="{{state !== 3}}">
<image class="icon_32" src="{{imageBase + 'icon/warning-4.png'}}"></image> <image class="icon_32" src="{{imageBase + 'icon/warning-4.png'}}"></image>
<text class="font_normal_22 color_tip">快递运费自理，顺丰到付，12-23元不等</text> <text class="font_normal_22 color_tip">快递运费自理，顺丰到付，12-23元不等</text>
</view> </view>
...@@ -95,7 +101,7 @@ ...@@ -95,7 +101,7 @@
<text class="font_normal_26 color_regular">{{couponInfo.userPhone}}</text> <text class="font_normal_26 color_regular">{{couponInfo.userPhone}}</text>
</view> </view>
</view> </view>
<view class="coupon_code"> <view class="coupon_code" wx:if="{{state !== 3 && state !== 4}}">
<view class="coupon_code_point_left"></view> <view class="coupon_code_point_left"></view>
<view class="coupon_code_point_right"></view> <view class="coupon_code_point_right"></view>
<view class="coupon_code_name row cc ac"> <view class="coupon_code_name row cc ac">
...@@ -108,7 +114,7 @@ ...@@ -108,7 +114,7 @@
<text class="font_normal_26 color_secondary">{{'有效期' + otherInfo.timeExpire}}</text> <text class="font_normal_26 color_secondary">{{'有效期' + otherInfo.timeExpire}}</text>
</view> </view>
</view> </view>
<view class="notice row ce ac" bindtap="onGoodsNotes"> <view class="notice row ce ac" wx:if="{{state !== 3 && state !== 4}}" bindtap="onGoodsNotes">
<text class="font_normal_30 color_secondary">使用须知</text> <text class="font_normal_30 color_secondary">使用须知</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
...@@ -154,11 +160,15 @@ ...@@ -154,11 +160,15 @@
<view class="other column"> <view class="other column">
<text class="font_normal_22 color_secondary">{{'订单编号: ' + otherInfo.orderNumber}}</text> <text class="font_normal_22 color_secondary">{{'订单编号: ' + otherInfo.orderNumber}}</text>
<text class="font_normal_22 color_secondary">{{'下单时间: ' + otherInfo.timeCreate}}</text> <text class="font_normal_22 color_secondary">{{'下单时间: ' + otherInfo.timeCreate}}</text>
<block wx:if="{{isExpress && (state === 2 || state === 3 || state === 5)}}">
<text class="font_normal_22 color_secondary">{{'发货时间：' + otherInfo.timeExpress}}</text>
<text class="font_normal_22 color_secondary">{{'物流单号：' + otherInfo.expressNumber}}</text>
</block>
</view> </view>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<view class="operation row ce ac" wx:if="{{state !== 1 && state !== 2}}"> <view class="operation row ce ac" wx:if="{{state !== 1 && state !== 2}}">
<button class="operation_cancel row cc ac font_normal_30 color_cancel" wx:if="{{state === 3}}" bindtap="onDelete">删除订单</button> <button class="operation_cancel row cc ac font_normal_30 color_cancel" wx:if="{{state === 3 || state === 4}}" bindtap="onDelete">删除订单</button>
<button class="operation_submit row cc ac font_normal_30 color_submit" wx:if="{{state === 5}}" bindtap="onConfirm">确认收货</button> <button class="operation_submit row cc ac font_normal_30 color_submit" wx:if="{{state === 5}}" bindtap="onConfirm">确认收货</button>
</view> </view>
</view> </view>
......
pages/mall/exchange-state/exchange-state.wxss
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
background: #ECF4F8; background: #ECF4F8;
} }
.state > text:nth-child(2) { .state_tip {
margin: 30rpx 0 0 0; margin: 30rpx 0 0 0;
} }
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.coupon_info { .coupon_info {
height: 342rpx; height: 342rpx;
padding: 48rpx 48rpx 0 48rpx; padding: 48rpx 32rpx 0 32rpx;
border-radius: 2px; border-radius: 2px;
background: #F3F4F6; background: #F3F4F6;
} }
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
.coupon_info_phone > text:nth-child(1) { .coupon_info_phone > text:nth-child(1) {
width: 104rpx; width: 104rpx;
height: 36rpx; height: 36rpx;
margin: 0 40rpx 0 0; margin: 0 48rpx 0 0;
} }
.coupon_code { .coupon_code {
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
} }
.address_info_detail_address { .address_info_detail_address {
height: 36rpx; max-width: 472rpx;
margin: 16rpx 0 0 0; margin: 16rpx 0 0 0;
font-size: 26rpx; font-size: 26rpx;
font-weight: 400; font-weight: 400;
...@@ -219,8 +219,8 @@ ...@@ -219,8 +219,8 @@
margin: 32rpx 0 0 0; margin: 32rpx 0 0 0;
} }
.other > text:nth-child(2) { .other > text {
margin: 10rpx 0 0 0; margin: 0 0 10rpx 0;
} }
/* 相关操作 */ /* 相关操作 */
...@@ -241,6 +241,7 @@ ...@@ -241,6 +241,7 @@
height: 80rpx; height: 80rpx;
border-radius: 2px; border-radius: 2px;
border: 1px solid #C2C7CF; border: 1px solid #C2C7CF;
background: #FFFFFF;
} }
.operation_submit { .operation_submit {
...@@ -301,8 +302,3 @@ ...@@ -301,8 +302,3 @@
margin: 40rpx 0 0 0; margin: 40rpx 0 0 0;
overflow-y: scroll; overflow-y: scroll;
} }
\ No newline at end of file
img {
max-width: 100%;
max-height: 100%;
}
\ No newline at end of file
pages/mall/exchange-submit/exchange-submit.js
...@@ -18,6 +18,10 @@ Page({ ...@@ -18,6 +18,10 @@ Page({
addressList: [], // 收货地址列表 addressList: [], // 收货地址列表
addressSelection: {}, // 选择地址 addressSelection: {}, // 选择地址
exchangeForm: {}, exchangeForm: {},
winPopup: false,
goodsNotes: '',
}, },
onLoad: function (options) { onLoad: function (options) {
...@@ -56,7 +60,7 @@ Page({ ...@@ -56,7 +60,7 @@ Page({
'cover': funcData.coverImg, 'cover': funcData.coverImg,
'price': funcData.price, 'price': funcData.price,
'banner': funcData.imgs, 'banner': funcData.imgs,
'notice': funcData.notification, // 使用须知 'notice': funcData.notification.replace(/<img /g, '<img style="max-width: 100%; max-height: 100%;" '), // 使用须知
'content': funcData.particulars, // 详情 'content': funcData.particulars, // 详情
'describe': funcData.synopsis, // 描述 'describe': funcData.synopsis, // 描述
'shopIdUse': funcData.usedOfficeId, // 使用门店 'shopIdUse': funcData.usedOfficeId, // 使用门店
...@@ -71,6 +75,9 @@ Page({ ...@@ -71,6 +75,9 @@ Page({
isSupportExpress: Boolean(Number(funcData.expressType)), isSupportExpress: Boolean(Number(funcData.expressType)),
}) })
console.log(this.data.isExpress)
console.log(this.data.isSupportExpress)
// 设置门店信息 // 设置门店信息
let funcShopInfo = App.getShopInfo(this.data.goodsInfo.shopIdUse) let funcShopInfo = App.getShopInfo(this.data.goodsInfo.shopIdUse)
if (funcShopInfo.appId === 0) { if (funcShopInfo.appId === 0) {
...@@ -181,13 +188,19 @@ Page({ ...@@ -181,13 +188,19 @@ Page({
wx.navigateTo({ url: '/pages/mine/address-list/address-list' }) wx.navigateTo({ url: '/pages/mine/address-list/address-list' })
}, },
onGoodsNotes: function () {
this.setData({
winPopup: true
})
},
/** /**
* 取货类型选择 * 取货类型选择
* @function * @function
* @returns * @returns
*/ */
onExpress: function () { onExpress: function () {
if (this.data.goodsInfo.isSupportExpress) { if (this.data.isSupportExpress) {
this.setData({ this.setData({
isExpress: !this.data.isExpress isExpress: !this.data.isExpress
}) })
......
pages/mall/exchange-submit/exchange-submit.wxml
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="goods_tip row ce ac"> <view class="goods_tip row ce ac" bindtap="onGoodsNotes">
<text>兑换须知</text> <text>兑换须知</text>
<image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image> <image class="icon_32" src="{{imageBase + 'icon/arrow-r-2.png'}}"></image>
</view> </view>
...@@ -181,3 +181,12 @@ ...@@ -181,3 +181,12 @@
</view> </view>
</view> </view>
</view> </view>
<m-popup isShow="{{winPopup}}">
<view class="popup_container column" slot="content">
<text class="popup_title font_bold_42 color_regular">兑换须知</text>
<view class="popup_content">
<rich-text nodes="{{goodsInfo.notice}}"></rich-text>
</view>
</view>
</m-popup>
\ No newline at end of file
pages/mall/exchange-submit/exchange-submit.wxss
...@@ -370,3 +370,15 @@ ...@@ -370,3 +370,15 @@
line-height: 44rpx; line-height: 44rpx;
color: #FFFFFF; color: #FFFFFF;
} }
/* 使用须知 */
.popup_container {
max-height: 1100rpx;
padding: 56rpx 40rpx;
}
.popup_content {
min-height: 200rpx;
margin: 40rpx 0 0 0;
overflow-y: scroll;
}
\ No newline at end of file
pages/mall/home/home.wxml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="container"> <view class="container">
<view class="integral_operation"> <view class="integral_operation">
<image src="{{resourcesBase + 'mall/home-bgi.png'}}"></image> <image src="{{resourcesBase + 'bgi/bgi-00.png'}}"></image>
<view class="row ae"> <view class="row ae">
<view class="integral_quantity column"> <view class="integral_quantity column">
<text>{{integral}}</text> <text>{{integral}}</text>
......
pages/mine/accumulate/accumulate.js
let App = getApp() let App = getApp()
Page({ Page({
data: { data: {
imageResourcesBase: App.globalData.appResourcesBase,
showMenu: false, showMenu: false,
menu: '全 部', menu: '全 部',
menuList: [{ menuList: [
id: '', { id: '', name: '全 部' },
name: '全 部' { id: 0, name: '获 取' },
}, { id: 1, name: '已使用' }
{
id: 0,
name: '获 取'
},
{
id: 1,
name: '已使用'
}
], ],
pageNo: '1', pageNo: '1',
pageSize: '-1', pageSize: '-1',
...@@ -34,13 +25,13 @@ Page({ ...@@ -34,13 +25,13 @@ Page({
this.queryIntegral() this.queryIntegral()
}, },
setAccumulateListHeight: function () { setAccumulateListHeight: function () {
let funcWindowHeight = wx.getSystemInfoSync().windowHeight let funcWindowHeight = wx.getSystemInfoSync().windowHeight
let funcAccumulateListHeight = funcWindowHeight - 410 * wx.getStorageSync('unitProportion') let funcAccumulateListHeight = funcWindowHeight - 410 * wx.getStorageSync('unitProportion')
this.setData({ this.setData({
accumulateListHeight: funcAccumulateListHeight accumulateListHeight: funcAccumulateListHeight
}) })
console.log(funcAccumulateListHeight)
}, },
/** /**
......
pages/mine/accumulate/accumulate.wxml
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<view class="container con-s" bindtap="onHideMenu"> <view class="container con-s" bindtap="onHideMenu">
<!-- 积分背景图 --> <!-- 积分背景图 -->
<image class="banner" src="{{imageResourcesBase + 'mine/home/integral-bg.png'}}"></image> <image class="banner" src="{{resourcesBase + 'bgi/bgi-00.png'}}"></image>
<view class="opacity-cover"></view>
<view class="my-accumulate"> <view class="my-accumulate">
<text>{{integral}}</text> <text>{{integral}}</text>
</view> </view>
...@@ -30,7 +28,8 @@ ...@@ -30,7 +28,8 @@
</view> </view>
<!-- 有积分 --> <!-- 有积分 -->
<view class="accumulate-wrapper col align-c" wx:else style="{{'max-height:' + accumulateListHeight + 'px;'}}"> <!-- <view class="accumulate-wrapper col align-c" wx:else style="{{'max-height:' + accumulateListHeight + 'px;'}}"> -->
<view class="accumulate-wrapper col align-c" wx:else>
<block wx:for="{{accumulateList}}" wx:key="index"> <block wx:for="{{accumulateList}}" wx:key="index">
<view class="accumulate row con-b align-c"> <view class="accumulate row con-b align-c">
<view class="accumulate-left col con-b"> <view class="accumulate-left col con-b">
......
pages/mine/accumulate/accumulate.wxss
...@@ -16,17 +16,6 @@ page { ...@@ -16,17 +16,6 @@ page {
height: 480rpx; height: 480rpx;
} }
.opacity-cover {
position: fixed;
z-index: -1;
top: 0;
left: 0;
width: 750rpx;
height: 480rpx;
background: linear-gradient(218deg, rgba(63, 67, 87, 0.8) 0%, #252532 100%);
opacity: 0.84;
}
.my-accumulate { .my-accumulate {
width: 670rpx; width: 670rpx;
margin-top: 232rpx; margin-top: 232rpx;
......
pages/mine/appointment/appointment.js
...@@ -30,8 +30,6 @@ Page({ ...@@ -30,8 +30,6 @@ Page({
onLoad: function (options) { onLoad: function (options) {
console.log('options', options) console.log('options', options)
switch (options.tab) { switch (options.tab) {
case 'active': case 'active':
options.tab = 0 options.tab = 0
...@@ -84,10 +82,11 @@ Page({ ...@@ -84,10 +82,11 @@ Page({
* @param * @param
* @returns * @returns
*/ */
onOrderEvaluate: function (event) { onOrderEvaluate: function (funcEvent) {
let item = JSON.stringify(event.currentTarget.dataset.item) let funcItem = funcEvent.currentTarget.dataset.item
console.log(funcItem)
wx.navigateTo({ wx.navigateTo({
url: `/pages/pay/order-comment/order-comment?orderItem=${item}&pageFrom=activityList`, url: '/pages/pay/order-comment/order-comment?id=' + funcItem.orderId,
}) })
}, },
......
pages/mine/appointment/appointment.wxml
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<text>{{activity.amount}}</text> <text>{{activity.amount}}</text>
</view> </view>
<view class="appointment-activity-btn row"> <view class="appointment-activity-btn row">
<view data-item="{{activity}}" catchtap="onOrderEvaluate" class="confirm-btn">去评价</view> <view class="confirm-btn" data-item="{{activity}}" catchtap="onOrderEvaluate">去评价</view>
</view> </view>
</view> </view>
</view> </view>
......
pages/mine/club/club.js
...@@ -12,7 +12,10 @@ Page({ ...@@ -12,7 +12,10 @@ Page({
adminInfo: {}, adminInfo: {},
winAdminInfo: false, winAdminInfo: false,
winExamineTip: false, winExamineTip: false,
examineTipContent: '',
}, },
onLoad: function (options) { onLoad: function (options) {
...@@ -70,7 +73,6 @@ Page({ ...@@ -70,7 +73,6 @@ Page({
'pageSize': this.data.pageSize, 'pageSize': this.data.pageSize,
} }
}).then((response) => { }).then((response) => {
console.log(response)
let funcData = response.data.list let funcData = response.data.list
let funcList = [] let funcList = []
for (let i = 0, l = funcData.length; i < l; i++) { for (let i = 0, l = funcData.length; i < l; i++) {
...@@ -95,14 +97,26 @@ Page({ ...@@ -95,14 +97,26 @@ Page({
}, },
/** /**
* 取消，删除我加入的 * 取消俱乐部加入申请
* @function * @function
* @param * @param {object} - funcEvent
* @returns * @returns
*/ */
cancelEnter: function (funcEvent, funcType) { onCancelEnterClubAudit: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item let funcItem = funcEvent.currentTarget.dataset.item
console.log(funcEvent) App.ui.showDialog({
type: 'confirm',
title: '是否确认取消申请加入俱乐部？',
content: '取消后无法恢复',
cancel: '取消',
confirm: '确定',
success: () => {
App.ui.showToast({
iconType: 'loading',
title: '正在处理',
duration: 30000
})
App.request({ App.request({
url: 'v3/club/deleteMyJoin', url: 'v3/club/deleteMyJoin',
params: { params: {
...@@ -111,7 +125,7 @@ Page({ ...@@ -111,7 +125,7 @@ Page({
}).then((response) => { }).then((response) => {
App.ui.showToast({ App.ui.showToast({
'iconType': 'success', 'iconType': 'success',
'title': funcType 'title': '取消成功'
}) })
this.setData({ this.setData({
clubList: [], clubList: [],
...@@ -120,45 +134,63 @@ Page({ ...@@ -120,45 +134,63 @@ Page({
this.queryClubEnter() this.queryClubEnter()
}).catch((response) => {}) }).catch((response) => {})
}, },
fail: () => {},
})
},
/** /**
* 取消，删除我管理的 * 删除俱乐部加入申请
* @function * @function
* @param * @param {object} - funcEvent
* @returns * @returns
*/ */
cancelEstablish: function (funcEvent, funcType) { onDeleteEnterClubAudit: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item let funcItem = funcEvent.currentTarget.dataset.item
App.ui.showDialog({
type: 'confirm',
title: '是否确认删除申请加入俱乐部？',
content: '删除后无法恢复',
cancel: '取消',
confirm: '确定',
success: () => {
App.ui.showToast({
iconType: 'loading',
title: '正在处理',
duration: 30000
})
App.request({ App.request({
url: 'v3/club/deleteMyCreateClub', url: 'v3/club/deleteMyJoin',
params: { params: {
'clubId': funcItem.id, 'memberId': funcItem.memberId,
} }
}).then((response) => { }).then((response) => {
App.ui.showToast({ App.ui.showToast({
'iconType': 'success', 'iconType': 'success',
'title': funcType 'title': '删除成功'
}) })
this.setData({ this.setData({
clubList: [], clubList: [],
pageIndex: 1, pageIndex: 1,
}) })
this.queryClubEstablish() this.queryClubEnter()
}).catch((response) => {}) }).catch((response) => {})
}, },
fail: () => {},
})
},
/** /**
* 取消申请 * 取消俱乐部创建申请
* @function * @function
* @param {object} - funcEvent * @param {object} - funcEvent
* @returns * @returns
*/ */
onCancel: function (funcEvent) { onCancelEstablishClubAudit: function (funcEvent) {
switch (this.data.tabIndex) { let funcItem = funcEvent.currentTarget.dataset.item
case 0:
App.ui.showDialog({ App.ui.showDialog({
type: 'confirm', type: 'confirm',
title: '是否确认取消申请加入俱乐部？', title: '是否确认取消申请创建俱乐部？',
content: '取消后无法恢复', content: '取消后无法恢复',
cancel: '取消', cancel: '取消',
confirm: '确定', confirm: '确定',
...@@ -168,45 +200,39 @@ Page({ ...@@ -168,45 +200,39 @@ Page({
title: '正在处理', title: '正在处理',
duration: 30000 duration: 30000
}) })
this.cancelEnter(funcEvent, '取消成功')
},
fail: () => {},
})
break
case 1: App.request({
App.ui.showDialog({ url: 'v3/club/deleteMyCreateClub',
type: 'confirm', params: {
title: '是否确认取消申请创建俱乐部？', 'clubId': funcItem.id,
content: '取消后无法恢复', }
cancel: '取消', }).then((response) => {
confirm: '确定',
success: () => {
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', 'iconType': 'success',
title: '正在处理', 'title': '取消成功'
duration: 30000
}) })
this.cancelEstablish(funcEvent, '取消成功') this.setData({
clubList: [],
pageIndex: 1,
})
this.queryClubEstablish()
}).catch((response) => {})
}, },
fail: () => {}, fail: () => {},
}) })
break
}
}, },
/** /**
* 删除申请 * 删除俱乐部创建申请
* @function * @function
* @param {object} - funcEvent * @param {object} - funcEvent
* @returns * @returns
*/ */
onDelete: function (funcEvent) { onDeleteEstablishClubAudit: function (funcEvent) {
switch (this.data.tabIndex) { let funcItem = funcEvent.currentTarget.dataset.item
case 0:
App.ui.showDialog({ App.ui.showDialog({
type: 'confirm', type: 'confirm',
title: '是否确认删除申请加入俱乐部？', title: '是否确认删除申请创建俱乐部？',
content: '删除后无法恢复', content: '删除后无法恢复',
cancel: '取消', cancel: '取消',
confirm: '确定', confirm: '确定',
...@@ -216,41 +242,35 @@ Page({ ...@@ -216,41 +242,35 @@ Page({
title: '正在处理', title: '正在处理',
duration: 30000 duration: 30000
}) })
this.cancelEnter(funcEvent, '删除成功')
},
fail: () => {},
})
break
case 1: App.request({
App.ui.showDialog({ url: 'v3/club/deleteMyCreateClub',
type: 'confirm', params: {
title: '是否确认删除申请创建俱乐部？', 'clubId': funcItem.id,
content: '删除后无法恢复', }
cancel: '取消', }).then((response) => {
confirm: '确定',
success: () => {
App.ui.showToast({ App.ui.showToast({
iconType: 'loading', 'iconType': 'success',
title: '正在处理', 'title': '删除成功'
duration: 30000
}) })
this.cancelEstablish(funcEvent, '删除成功') this.setData({
clubList: [],
pageIndex: 1,
})
this.queryClubEstablish()
}).catch((response) => {})
}, },
fail: () => {}, fail: () => {},
}) })
break
}
}, },
/** /**
* 查看俱乐部管理员微信 * 查看俱乐部管理员信息
* 仅在审核待通过的情况下
* @function * @function
* @param {object} - funcEvent * @param {object} - funcEvent
* @returns * @returns
*/ */
onAdminInfo: function (funcEvent) { onGetClubAdminInfo: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item let funcItem = funcEvent.currentTarget.dataset.item
console.log(funcItem) console.log(funcItem)
this.setData({ this.setData({
...@@ -262,7 +282,7 @@ Page({ ...@@ -262,7 +282,7 @@ Page({
}, },
/** /**
* 保存管理员微信 * 保存俱乐部管理员信息
* @function * @function
* @param * @param
* @returns * @returns
...@@ -320,52 +340,70 @@ Page({ ...@@ -320,52 +340,70 @@ Page({
switch (funcExamineState) { switch (funcExamineState) {
case 0: case 0:
this.setData({ this.setData({
winExamineTip: true winExamineTip: true,
examineTipContent: '申请提交后，审核人员将主动与您联系（预计5个工作日），并协助后续资料整理，请耐心等待。'
}) })
break break
case 2: case 2:
wx.navigateTo({ url: '/pages/club/information/information?id=' + funcItem.id + '&remark=' + funcItem.remark }) this.setData({
winExamineTip: true,
examineTipContent: '失败原因：' + funcItem.remark
})
break break
} }
}, },
/** /**
* 跳转俱乐部详情 * 跳转俱乐部详情
* 仅在审核为通过的情况下
* @function * @function
* @param {object} - funcEvent * @param {object} - funcEvent
* @returns * @returns
*/ */
onClubInfo: function (funcEvent) { onClubInfo: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item let funcItem = funcEvent.currentTarget.dataset.item
let funcExamineState = funcItem.state
// 审核不通过时需要传入备注信息
if (funcExamineState === 2) {
wx.navigateTo({ url: '/pages/club/information/information?id=' + funcItem.id + '&remark=' + funcItem.remark })
} else {
wx.navigateTo({ url: '/pages/club/information/information?id=' + funcItem.id }) wx.navigateTo({ url: '/pages/club/information/information?id=' + funcItem.id })
}
}, },
onExamine: function (funcEvent) { /**
* 我管理的俱乐部加入审核列表
* @function
* @param
* @returns
*/
onEnterClubAuditList: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item let funcItem = funcEvent.currentTarget.dataset.item
wx.navigateTo({ url: '/pages/mine/club-manage/club-manage?id=' + funcItem.id }) wx.navigateTo({ url: '/pages/mine/club-manage/club-manage?id=' + funcItem.id })
}, },
onClubMore: function () { /**
* 俱乐部主页
* @function
* @param
* @returns
*/
onClubHome: function () {
wx.redirectTo({ url: '/pages/club/home/home' }) wx.redirectTo({ url: '/pages/club/home/home' })
}, },
onClubEstablish: function () { /**
wx.redirectTo({ url: '/pages/club/home/home' }) * 审核失败原因弹窗
* @function
* @param
* @returns
*/
onFailedAuditTip: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item
this.setData({
winExamineTip: true,
examineTipContent: '失败原因：' + funcItem.remark,
})
}, },
/** /**
* 页面触底事件 * 页面触底事件
* @function * @function
* @param {object} - funcEvent * @param
* @returns * @returns
*/ */
onReachBottom: function () { onReachBottom: function () {
......
pages/mine/club/club.wxml
...@@ -21,13 +21,26 @@ ...@@ -21,13 +21,26 @@
<text>{{item.name}}</text> <text>{{item.name}}</text>
<text class="owner-mark" wx:if="{{item.isOwner}}">业主专享</text> <text class="owner-mark" wx:if="{{item.isOwner}}">业主专享</text>
</view> </view>
<view class="club-info-other row cb ae" data-item="{{item}}" bindtap="{{tabIndex === 0 ? 'onAdminInfo' : 'onEstablishClubExamineTip'}}">
<!-- 我加入的 -->
<view class="club-info-other row cb ae" hidden="{{!(tabIndex === 0)}}" data-item="{{item}}" bindtap="onGetClubAdminInfo">
<view class="club-info-examine column"> <view class="club-info-examine column">
<text>{{item.date + ' 提交申请'}}</text> <text>{{item.date + ' 提交申请'}}</text>
<text>{{'审核待通过'}}</text> <text>{{'审核待通过'}}</text>
</view> </view>
<view class="club_operation row cb ae"> <view class="club_operation row cb ae">
<button class="row cc ac" data-item="{{item}}" catchtap="onCancel">取消申请</button> <button class="row cc ac" data-item="{{item}}" catchtap="onCancelEnterClubAudit">取消申请</button>
</view>
</view>
<!-- 我管理的 -->
<view class="club-info-other row cb ae" hidden="{{!(tabIndex === 1)}}" data-item="{{item}}" bindtap="onEstablishClubExamineTip">
<view class="club-info-examine column">
<text>{{item.date + ' 提交申请'}}</text>
<text>{{'审核待通过'}}</text>
</view>
<view class="club_operation row cb ae">
<button class="row cc ac" data-item="{{item}}" catchtap="onCancelEstablishClubAudit">取消申请</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -41,18 +54,28 @@ ...@@ -41,18 +54,28 @@
<text>{{item.name}}</text> <text>{{item.name}}</text>
<text class="owner-mark" wx:if="{{item.isOwner}}">业主专享</text> <text class="owner-mark" wx:if="{{item.isOwner}}">业主专享</text>
</view> </view>
<view class="club-info-other row cb ae" data-item="{{item}}" bindtap="onClubInfo">
<!-- 我加入的 -->
<view class="club-info-other row cb ae" hidden="{{!(tabIndex === 0)}}" data-item="{{item}}" bindtap="onClubInfo">
<view class="club_info_member column"> <view class="club_info_member column">
<text>{{item.member + ' 成员'}}</text> <text>{{item.member + ' 成员'}}</text>
<text wx:if="{{tabIndex === 0}}">{{item.date + ' 加入'}}</text> <text>{{item.date + ' 加入'}}</text>
<text wx:if="{{tabIndex === 1}}">{{item.date + ' 创建'}}</text> </view>
<view class="club_operation row cb ae"></view>
</view>
<!-- 我管理的 -->
<view class="club-info-other row cb ae" hidden="{{!(tabIndex === 1)}}" data-item="{{item}}" bindtap="onClubInfo">
<view class="club_info_member column">
<text>{{item.member + ' 成员'}}</text>
<text>{{item.date + ' 创建'}}</text>
</view> </view>
<view class="club_operation row cb ae"> <view class="club_operation row cb ae">
<block wx:if="{{item.examine > 0}}" > <block wx:if="{{item.examine > 0}}" >
<view class="club_operation_examine row cc ac"> <view class="club_operation_examine row cc ac">
<text>{{item.examine}}</text> <text>{{item.examine}}</text>
</view> </view>
<button class="row cc ac"data-item="{{item}}" catchtap="onExamine">入会审核</button> <button class="row cc ac"data-item="{{item}}" catchtap="onEnterClubAuditList">入会审核</button>
</block> </block>
</view> </view>
</view> </view>
...@@ -67,13 +90,26 @@ ...@@ -67,13 +90,26 @@
<text>{{item.name}}</text> <text>{{item.name}}</text>
<text class="owner-mark" wx:if="{{item.isOwner}}">业主专享</text> <text class="owner-mark" wx:if="{{item.isOwner}}">业主专享</text>
</view> </view>
<view class="club-info-other row cb ae" data-item="{{item}}" bindtap="onClubInfo">
<!-- 我加入的 -->
<view class="club-info-other row cb ae" hidden="{{!(tabIndex === 0)}}" data-item="{{item}}" bindtap="onFailedAuditTip">
<view class="club-info-examine column">
<text>{{item.date + ' 提交申请'}}</text>
<text>{{'审核未通过'}}</text>
</view>
<view class="club_operation row cb ae">
<button class="row cc ac" data-item="{{item}}" catchtap="onDeleteEnterClubAudit">删除</button>
</view>
</view>
<!-- 我管理的 -->
<view class="club-info-other row cb ae" hidden="{{!(tabIndex === 1)}}" data-item="{{item}}" bindtap="onFailedAuditTip">
<view class="club-info-examine column"> <view class="club-info-examine column">
<text>{{item.date + ' 提交申请'}}</text> <text>{{item.date + ' 提交申请'}}</text>
<text>{{'审核未通过'}}</text> <text>{{'审核未通过'}}</text>
</view> </view>
<view class="club_operation row cb ae"> <view class="club_operation row cb ae">
<button class="row cc ac" data-item="{{item}}" catchtap="onDelete">删除</button> <button class="row cc ac" data-item="{{item}}" catchtap="onDeleteEstablishClubAudit">删除</button>
</view> </view>
</view> </view>
</view> </view>
...@@ -84,11 +120,11 @@ ...@@ -84,11 +120,11 @@
<view class="club_list_nothing_tip"> <view class="club_list_nothing_tip">
<block wx:if="{{tabIndex === 0}}"> <block wx:if="{{tabIndex === 0}}">
<text>暂无已加入俱乐部</text> <text>暂无已加入俱乐部</text>
<button class="row cc ac" bindtap="onClubMore">发现更多</button> <button class="row cc ac" bindtap="onClubHome">发现更多</button>
</block> </block>
<block wx:if="{{tabIndex === 1}}"> <block wx:if="{{tabIndex === 1}}">
<text>暂无管理的俱乐部</text> <text>暂无管理的俱乐部</text>
<button class="row cc ac" bindtap="onClubEstablish">创建俱乐部</button> <button class="row cc ac" bindtap="onClubHome">创建俱乐部</button>
</block> </block>
</view> </view>
</block> </block>
...@@ -106,9 +142,11 @@ ...@@ -106,9 +142,11 @@
</view> </view>
<view class="dialog_container row cc ac" hidden="{{!winExamineTip}}"> <view class="dialog_container row cc ac" hidden="{{!winExamineTip}}">
<view class="dialog_examine_tip column cb ac"> <view class="dialog_examine_tip column ac">
<text class="font_bold_50 color_regular">审核说明</text> <text class="font_bold_50 color_regular">审核说明</text>
<text class="font_normal_30 color_cancel">申请提交后，审核人员将主动与您联系（预计5个工作日），并协助后续资料整理，请耐心等待。</text> <view class="dialog_examine_tip_content row">
<text class="font_normal_30 color_cancel">{{examineTipContent}}</text>
</view>
<button class="dialog_examine_operation row cc ac font_bold_30 color_regular" bindtap="onDialogClose">我知道了</button> <button class="dialog_examine_operation row cc ac font_bold_30 color_regular" bindtap="onDialogClose">我知道了</button>
</view> </view>
</view> </view>
\ No newline at end of file
pages/mine/club/club.wxss
...@@ -226,14 +226,17 @@ ...@@ -226,14 +226,17 @@
background: #FFFFFF; background: #FFFFFF;
} }
.dialog_examine_tip > text:nth-child(2) { .dialog_examine_tip_content {
width: 526rpx;
height: 162rpx;
margin: 48rpx 0 0 0; margin: 48rpx 0 0 0;
overflow-y: scroll;
} }
.dialog_examine_operation { .dialog_examine_operation {
width: 526rpx; width: 526rpx;
height: 80rpx; height: 80rpx;
margin: 96rpx 0 0 0; margin: 72rpx 0 0 0;
border-radius: 4px; border-radius: 4px;
border: 1px solid #15191F; border: 1px solid #15191F;
} }
\ No newline at end of file
pages/pay/coupon-input/coupon-input.js
...@@ -70,6 +70,7 @@ Page({ ...@@ -70,6 +70,7 @@ Page({
}) })
}).catch((response) => { }).catch((response) => {
switch (response.code) { switch (response.code) {
case 405:
case 500: case 500:
App.ui.hideToast() App.ui.hideToast()
App.ui.showDialog({ App.ui.showDialog({
......
pages/play/service-detail/service-detail.js
...@@ -364,7 +364,7 @@ Page({ ...@@ -364,7 +364,7 @@ Page({
data: { data: {
'listType': 1, 'listType': 1,
'pageSize': 10, 'pageSize': 10,
'pageNo': '1', 'pageNo': 1,
'tagId': '', 'tagId': '',
'officeId': this.data.shopInfo.id, 'officeId': this.data.shopInfo.id,
}, },
......
read.js
...@@ -78,3 +78,7 @@ let funcItem = { ...@@ -78,3 +78,7 @@ let funcItem = {
'type': '', // 类型 'type': '', // 类型
'quantity': '', // 数量 'quantity': '', // 数量
} }
// 审核失败 - FailedAudit
// 审核成功 - SuccessAudits
// 数据检查 - inspection
\ No newline at end of file
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