Skip to content

严立 / mini-shimao

Go to a project
Commit b44f534b by 严立
Options

LL - 二期 ui 遗留问题调整

parent acf196ae
Inline Side-by-side
Showing with 245 additions and 194 deletions
app.wxss
......@@ -88,4 +88,12 @@
font-weight: 500;
line-height: 24rpx;
color: #86C5E1;
}
/* 弹窗样式 */
.popup_content {
min-height: 200rpx;
max-height: 860rpx;
margin: 40rpx 0 90rpx 0;
overflow-y: scroll;
}
\ No newline at end of file
component/m-popup/m-popup.js
......@@ -66,7 +66,7 @@ Component({
switch (this.data.align) {
case 'top':
this.setData({
cssPopup: 'border-radius: 0 0 24px 24px; top: 0; left: 0; width: 100vw;',
cssPopup: 'border-radius: 0 0 12px 12px; top: 0; left: 0; width: 100vw;',
vector: -1,
deviationX: 0,
})
......@@ -75,7 +75,7 @@ Component({
case 'right':
this.setData({
cssPopup: 'border-radius: 24px 0 0 24px; top: 0; right: 0; height: 100vh;',
cssPopup: 'border-radius: 12px 0 0 12px; top: 0; right: 0; height: 100vh;',
deviationY: 0,
})
console.log(this.data.cssPopup)
......@@ -83,7 +83,7 @@ Component({
case 'bottom':
this.setData({
cssPopup: 'border-radius: 24px 24px 0 0; bottom: 0; left: 0; width: 100vw;',
cssPopup: 'border-radius: 12px 12px 0 0; bottom: 0; left: 0; width: 100vw;',
deviationX: 0,
})
console.log(this.data.cssPopup)
......@@ -91,7 +91,7 @@ Component({
case 'left':
this.setData({
cssPopup: 'border-radius: 0 24px 24px 0; top: 0; left: 0; height: 100vh;',
cssPopup: 'border-radius: 0 12px 12px 0; top: 0; left: 0; height: 100vh;',
vector: -1,
deviationY: 0,
})
......
component/m-popup/m-popup.wxss
......@@ -10,7 +10,8 @@
.m-popup-content {
position: absolute;
max-height: 1110rpx;
padding: 56rpx 40rpx;
opacity: 0;
background: #FFFFFF;
overflow: hidden;
}
\ No newline at end of file
pages/club/member/member.wxml
......@@ -22,7 +22,7 @@
<view class="club-member-item row cb ac">
<view class="club-member-item-info row ac">
<image src="{{item.avatar}}"></image>
<text>{{item.name}}</text>
<text class="overflow_point_1">{{item.name}}</text>
</view>
<view class="club-member-operation row ce ac">
<button class="row cc ac" data-item="{{item}}" bindtap="onAdminWx">添加微信</button>
......
pages/club/member/member.wxss
......@@ -183,6 +183,7 @@
}
.club-member-item-info > text {
width: 400rpx;
height: 42rpx;
margin-left: 32rpx;
font-size: 30rpx;
......
pages/commodity/home/home.js
......@@ -72,8 +72,6 @@ Page({
}
},
/**
* 问候消息
* @function
......
pages/mall/exchange-state/exchange-state.js
......@@ -58,7 +58,6 @@ Page({
'orderId': this.data.exchangeInfo.id
}
}).then((response) => {
debugger
let funcData = response.data
// 设置订单状态
let funcState = Number(funcData.status)
......@@ -102,6 +101,15 @@ Page({
'shopTime': funcData.useOffice ? funcData.useOffice.businessTime : '',
'userName': funcData.name,
'userPhone': funcData.mobilePhone,
'shopSeal': '',
}
let funcShopInfo = App.globalData.shopId
for (let i = 0, l = funcShopInfo.length; i < l; i++) {
if (funcCouponInfo.shopName.toUpperCase() === funcShopInfo[i].name) {
funcCouponInfo.shopSeal = funcShopInfo[i].printUse
break
}
}
// 兑换商品数据
......@@ -214,8 +222,6 @@ Page({
*/
onCouponCodeScan: function (funcEvent) {
this.setData({ winCouponCode: true })
console.log(funcEvent)
let funcItem = funcEvent.currentTarget.dataset.item
if (!funcItem) return
let funcCouponCodeList = this.data.couponCodeList
......
pages/mall/exchange-state/exchange-state.wxml
......@@ -83,6 +83,7 @@
<block wx:if="{{!isExpress}}">
<!-- 券码信息 -->
<view class="coupon">
<image class="coupon_seal" src="{{resourcesBase + couponInfo.shopSeal}}"></image>
<view class="coupon_info column">
<view class="coupon_info_shop row ac">
<text class="font_normal_26 color_secondary">使用门店</text>
......
pages/mall/exchange-state/exchange-state.wxss
......@@ -32,13 +32,23 @@
/* 券码信息 */
.coupon {
position: relative;
width: 670rpx;
margin: 60rpx 0 0 0;
}
.coupon_seal {
z-index: 4;
position: absolute;
top: 180rpx;
right: 0;
width: 166rpx;
height: 200rpx;
}
.coupon_info {
height: 342rpx;
padding: 48rpx 32rpx 0 32rpx;
padding: 48rpx 48rpx 0 48rpx;
border-radius: 2px;
background: #F3F4F6;
}
......@@ -48,7 +58,7 @@
}
.coupon_info_name {
margin: 56rpx 0 0 0;
margin: 50rpx 0 0 0;
}
.coupon_info_phone {
......@@ -160,7 +170,7 @@
/* 商品信息 */
.goods {
margin: 62rpx 0 0 0;
margin: 70rpx 0 0 0;
}
.goods_list {
......@@ -327,15 +337,4 @@
border-radius: 50%;
margin: 32rpx 0 0 0;
background: rgba(254, 252, 249, 0.5);
}
.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/exchange-submit/exchange-submit.js
......@@ -25,7 +25,8 @@ Page({
},
onLoad: function (options) {
console.log(options)
wx.removeStorageSync('tempOptions')
wx.removeStorageSync('newAddressInfo')
this.setData({
goodsInfo: {
id: options.id
......@@ -43,7 +44,7 @@ Page({
this.setData({
addressSelection: funcTempOptions
})
wx.removeStorageSync('tempOptions')
// wx.removeStorageSync('tempOptions')
this.queryUserAddress()
}
},
......
pages/mall/exchange-submit/exchange-submit.wxss
......@@ -369,16 +369,4 @@
font-weight: 800;
line-height: 44rpx;
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/mine/address-list/address-list.js
......@@ -33,7 +33,11 @@ Page({
onAddressEdit: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item
wx.navigateTo({ url: '/pages/mine/address-operate/address-operate?id=' + funcItem.id })
if (this.data.options.fromPage === 'exchange') {
wx.navigateTo({ url: '/pages/mine/address-operate/address-operate?id=' + funcItem.id + '&fromPage=' + this.data.options.fromPage })
} else {
wx.navigateTo({ url: '/pages/mine/address-operate/address-operate?id=' + funcItem.id })
}
},
onAddressAdd: function () {
......@@ -64,8 +68,6 @@ Page({
}
funcList.push(funcItem)
}
console.log(funcList)
console.log(wx.getStorageSync('newAddressInfo'))
// 在积分商城下单时，通过比对新增地址的信息，来获取新增地址的 id。
if (wx.getStorageSync('tempOptions') === 'address') {
......
pages/mine/address-operate/address-operate.js
......@@ -166,8 +166,6 @@ Page({
iconType: 'success',
title: '提交成功',
ending: () => {
// 需要后台返回新增的地址 id 。
console.log(this.data.addressInfo)
if (this.data.options.fromPage === 'exchange') {
let funcAddressInfo = {
'id': '',
......@@ -218,6 +216,10 @@ Page({
iconType: 'success',
title: '删除成功',
ending: () => {
console.log(this.data.options)
if (this.data.options.fromPage === 'exchange') {
wx.setStorageSync('tempOptions', {})
}
wx.navigateBack()
}
})
......
pages/mine/appointment-detail/appointment-detail.wxml
......@@ -354,7 +354,7 @@
<view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='0' wx:if="{{orderInfo.state===0}}">取消订单</view>
<view class="order-btn" bindtap="onOrderPay" wx:if="{{orderInfo.state===0}}">去支付</view>
<view class="order-btn" bindtap="onOrderEvaluate" wx:if="{{orderInfo.state===3}}">去评价</view>
<view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='1' wx:if="{{orderInfo.state===4||orderInfo.state===-1||orderInfo.state===6}}">删除订单</view>
<view class="delete-btn" bindtap="onDelOrCancelOrder" data-type='1' wx:if="{{orderInfo.state===4 || orderInfo.state===-1 || orderInfo.state===6 || orderInfo.state===7}}">删除订单</view>
<view class="order-btn" bindtap="onOrderAgain" wx:if="{{orderInfo.state===-1}}">再次下单</view>
</view>
......
pages/mine/club/club.js
......@@ -61,7 +61,7 @@ Page({
'memberId': funcData[i].memberId,
'state': Number(funcData[i].state),
'date': funcData[i].date,
'adminWx': funcData[i].creatorImg ? funcData[i].creatorImg : this.data.resourcesBase + 'other/default-1.png',
'adminWx': funcData[i].creatorImg,
'remark': funcData[i].remarks,
'isOwner': Number(funcData[i].owner) === 0 ? false : true
}
......@@ -309,13 +309,16 @@ Page({
*/
onGetClubAdminInfo: function (funcEvent) {
let funcItem = funcEvent.currentTarget.dataset.item
console.log(funcItem)
this.setData({
adminInfo: {
wx: funcItem.adminWx
},
winAdminInfo: true
})
if (funcItem.adminWx) {
this.setData({
adminInfo: {
wx: funcItem.adminWx
},
winAdminInfo: true
})
} else {
App.ui.showToast({ iconType: 'error', title: '暂无二维码', })
}
},
/**
......
pages/pay/order-detail/order-detail.js
......@@ -4,7 +4,7 @@ Page({
isDoing: false,
showNotice: false,
swiperCurrent: 0,
showCodePopup: false,
winCouponCode: false,
imageBase: App.globalData.appImageBase,
resourcesBase: App.globalData.appResourcesBase,
shopInfo: {},
......@@ -18,7 +18,8 @@ Page({
winCode: false,
residuePayTime: "", //剩余支付时间
codeList: [],
couponCodeList: [],
couponCodeSelectionIndex: 0,
sealSrc: '',
shopConfig: App.globalData.shopId,
......@@ -37,7 +38,6 @@ Page({
isFromUse: options.showCode === 'true' ? true : false,
marginTop: wx.getStorageSync('navStatusHeight') + wx.getStorageSync('navTitleHeight')
})
console.log('1111')
console.log(this.data.orderInfo)
this.queryOrderDetail()
},
......@@ -179,21 +179,33 @@ Page({
App.ui.showToast({
iconType: 'loading',
title: '加载中',
duration: 60000,
})
App.wxRequest({
App.request({
url: 'v1/order/getVolumesByOrderId',
data: {
params: {
'orderId': this.data.orderInfo.id
},
success: (response) => {
App.ui.hideToast()
let list = response.data
this.setData({
showCodePopup: true,
codeList: list
})
}
}).then((response) => {
App.ui.hideToast()
let funcData = response.data
let funcList = []
for (let i = 0, l = funcData.length; i < l; i++) {
let funcItem = {
'name': funcData[i].name,
'codeBase64': funcData[i].qrcode,
'codeNumber': funcData[i].serialNumber,
'state': Number(funcData[i].status),
// 'couponCodeId': funcData[i].volumeId,
}
funcList.push(funcItem)
}
this.setData({
winCouponCode: true,
couponCodeList: funcList
})
}).catch(() => {
})
},
swiperChange(e) {
......@@ -203,9 +215,9 @@ Page({
})
},
closeQRcode() {
let showCodePopup = false
let winCouponCode = false
this.setData({
showCodePopup,
winCouponCode,
// swiperCurrent:0
})
},
......@@ -216,7 +228,6 @@ Page({
* @returns
*/
queryOrderDetail: function () {
console.log('queryOrderDetail')
App.wxRequest({
url: 'v1/order/getOrderDetail',
data: {
......@@ -224,8 +235,6 @@ Page({
},
success: (response) => {
let funcResponse = response.data
console.log('queryOrderDetail', this.data.orderInfo.id)
let funcOrderInfo = {
'id': this.data.orderInfo.id,
'score': funcResponse.integral, // 积分
......@@ -307,18 +316,30 @@ Page({
this.setData({
orderInfo: funcOrderInfo
})
console.log('2222')
console.log(this.data.orderInfo)
// 判断是否自动展示二维码
// 订单列表 去使用 按钮
if (this.data.isFromUse) {
}
}
})
},
/**
* 查看兑换券码
* @function
* @param
* @returns
*/
onCouponCodeScan: function (funcEvent) {
this.setData({ winCouponCode: true })
let funcItem = funcEvent.currentTarget.dataset.item
if (!funcItem) return
let funcCouponCodeList = this.data.couponCodeList
for (let i = 0, l = funcCouponCodeList.length; i < l; i++ ) {
if (funcItem.couponCodeId === funcCouponCodeList[i].couponCodeId) {
this.setData({ couponCodeSelectionIndex: i })
break
}
}
},
// 弹出单张二维码
onCouponCode: function (event) {
let funcOrderInfo = event.currentTarget.dataset.item
......@@ -347,23 +368,22 @@ Page({
}
})
},
// 多二维码 复制券码
setClipboard: function (event) {
const code = event.currentTarget.dataset.code
wx.setClipboardData({
data: code,
})
},
// 单个二维码 复制券码
onCodeCopy: function () {
/**
* 复制兑换券码
* @function
* @param
* @returns
*/
onCouponCodeCopy: function () {
wx.setClipboardData({
data: this.data.codeInfo.codeNo,
data: this.data.couponCodeList[this.data.couponCodeSelectionIndex].codeNumber,
})
},
onCodeClose: function () {
onCouponCodeClose: function () {
this.setData({
winCode: false,
winCouponCode: false,
})
},
......
pages/pay/order-detail/order-detail.wxml
......@@ -279,68 +279,6 @@
<text wx:if="{{orderInfo.state !== 0 && orderInfo.state !== -1&&orderInfo.tipIntegral}}">{{'获得积分：' + (orderInfo.tipIntegral?orderInfo.tipIntegral:'') + '分'}}</text>
</view>
</view>
</view>
<!-- 多张 扫码弹窗 -->
<l-popup show="{{showCodePopup}}" l-class="l-popup-bg" animation="{{false}}">
<view class="scan-code-wrapper col align-c">
<view class="code-header" wx:if="{{orderInfo.commodityType === 5}}">{{codeList.length}}件餐品可用</view>
<view class="code-header" wx:if="{{orderInfo.commodityType === 4}}">{{codeList.length}}件商品可用</view>
<view class="code-header" wx:if="{{orderInfo.commodityType === 3}}">{{codeList.length}}张门票可用</view>
<view class="code-tips">请将券码出示给门店核销人员</view>
<swiper class="code-main" next-margin="64rpx" bindchange="swiperChange">
<swiper-item wx:for="{{codeList}}" wx:key="id">
<view class="code-item col con-c align-c {{index === swiperCurrent ? 'item-center' : ''}}">
<view class="code-item-title cord-title">{{item.name}}</view>
<view class="code-img">
<image mode="widthFix" src="{{'data:image/jpg;base64,'+item.qrcode}}"></image>
</view>
<view class="code-num-wrapper row align-c con-a">
<view class="code-num-title {{item.status==2 ? 'code-used' : ''}}">券码{{index+1}}:</view>
<view class="code-num {{item.status==2 ? 'code-used' : ''}}">{{item.serialNumber}}</view>
<view class="num-copy" wx:if="{{item.status!=2}}" bindtap="setClipboard" data-code="{{item.serialNumber}}" data-index="{{index}}">复制</view>
</view>
<view class="code-used-seal" wx:if="{{item.status==2}}">
<image mode="widthFix" src="{{resourcesBase+'mine/server/codeUsed.png'}}"></image>
</view>
</view>
</swiper-item>
</swiper>
<view class="img-num row align-c">
<text class="current-img-num">{{swiperCurrent+1}}</text>
<text class="symbol-img-num"> / </text>
<text class="total-img-num">{{codeList.length}}</text>
</view>
<view class="code-close-btn row con-c align-c" bindtap="closeQRcode">
<image mode="widthFix" src="/image/icon_close.png"></image>
</view>
</view>
</l-popup>
<!--单个 二维码弹窗 -->
<view class="code-mask row con-c align-c" wx:if="{{winCode}}">
<view class="code col con-c align-c">
<view class="code-tip row con-c align-c">
<text>{{'请将券码出示给门店核销人员'}}</text>
</view>
<view class="code-info col con-c align-c">
<view class="code-info-title">
<text>{{codeInfo.codeName}}</text>
</view>
<view class="code-info-qrcode">
<image src="{{'data:image/png;base64,' + codeInfo.codeBase64}}"></image>
</view>
<view class="code-info-copy row con-b align-c">
<text>券码</text>
<text>{{codeInfo.codeNo}}</text>
<text bindtap="onCodeCopy">复制</text>
</view>
</view>
<view class="code-close row con-c align-c" bindtap="onCodeClose">
<image src="{{imageBase + 'icon/close-1.png'}}"></image>
</view>
</view>
</view>
<!-- 底部按钮 -->
......@@ -353,14 +291,45 @@
<view class="order-btn" bindtap="onOrderAgain" wx:if="{{orderInfo.state===-1}}">再次下单</view>
</view>
<!-- 使用须知 -->
<l-popup show="{{showNotice}}" content-align="bottom">
<view class="notice-popup-wrapper">
<view class="notice-popup-title">使用须知</view>
<scroll-view scroll-y class="notice-popup-content">
<view>
<rich-text nodes="{{orderInfo.particulars}}"></rich-text>
</view>
</scroll-view>
<!-- 二维码弹窗 -->
<view class="dialog_coupon_code row cc ac" wx:if="{{winCouponCode}}">
<view class="dialog_coupon_code_wrap col cc ac">
<text class="font_normal_26 color_submit">{{'请将券码出示给门店核销人员'}}</text>
<swiper class="dialog_coupon_code_swiper" current="{{couponCodeSelectionIndex}}">
<swiper-item class="dialog_coupon_code_item row cc" wx:for="{{couponCodeList}}" wx:for-index="index" wx:for-item="item" wx:key="index">
<view class="dialog_coupon_code_info col cc ac">
<!-- 无效券码蒙尘样式 -->
<view class="dialog_coupon_code_mask" wx:if="{{item.state === 2}}"></view>
<image mode="aspectFill" class="dialog_coupon_code_seal" wx:if="{{item.state === 2}}" src="{{resourcesBase + 'mine/server/codeUsed.png'}}"></image>
<text class="font_normal_30 color_regular">{{item.name}}</text>
<image class="dialog_coupon_code_content" src="{{'data:image/png;base64,' + item.codeBase64}}"></image>
<view class="dialog_coupon_code_operation row con-b ac">
<block wx:if="{{item.state === 1}}">
<text class="font_bold_26 color_secondary">券码</text>
<text class="font_bold_30 color_regular">{{item.codeNumber}}</text>
<text class="font_bold_26 color_primary" bindtap="onCouponCodeCopy">复制</text>
</block>
<block wx:if="{{item.state === 2}}">
<text class="font_bold_26 color_secondary">券码</text>
<text class="font_bold_30 color_secondary text_decoration_delete" wx:if="{{item.state === 2}}">{{item.codeNumber}}</text>
<text class="font_bold_26 color_primary" space="nbsp">　　</text>
</block>
</view>
</view>
</swiper-item>
</swiper>
<view class="dialog_coupon_code_close row cc ac" bindtap="onCouponCodeClose">
<image class="icon_48" src="{{imageBase + 'icon/close-1.png'}}"></image>
</view>
</view>
</view>
<m-popup isShow="{{showNotice}}">
<view class="popup_container column" slot="content">
<text class="popup_title font_bold_42 color_regular">使用须知</text>
<view class="popup_content">
<rich-text nodes="{{orderInfo.particulars}}"></rich-text>
</view>
</view>
</l-popup>
\ No newline at end of file
</m-popup>
\ No newline at end of file
pages/pay/order-detail/order-detail.wxss
......@@ -581,10 +581,6 @@
margin-left: 112rpx;
}
.notice-popup-content {
max-height: 896rpx;
}
.code-item-title {
color: #15191f;
font-size: 30rpx;
......@@ -686,17 +682,6 @@
font-size: 26rpx;
}
.notice-popup-wrapper {
padding: 56rpx 40rpx 68rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 0 0;
}
.notice-popup-title {
width: 100%;
height: 90rpx;
}
.notice-content {
max-height: 896rpx;
}
......@@ -903,4 +888,75 @@ image {
width: 28rpx;
height: 28rpx;
margin-right: 14rpx;
}
/* 券码弹窗 */
.dialog_coupon_code {
z-index: 7;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, .65);
}
.dialog_coupon_code_swiper {
width: 750rpx;
height: 730rpx;
}
.dialog_coupon_code_item {
left: 88rpx;
width: 574rpx !important;
height: 666rpx;
}
.dialog_coupon_code_info {
position: relative;
width: 526rpx;
height: 666rpx;
margin: 56rpx 0 48rpx 0;
border-radius: 2px;
background: #FFFFFF;
}
.dialog_coupon_code_mask {
position: absolute;
top: 154rpx;
left: 116rpx;
width: 296rpx;
height: 296rpx;
background: rgba(255, 255, 255, .8);
}
.dialog_coupon_code_seal {
position: absolute;
top: 252rpx;
right: -68rpx;
width: 254rpx;
height: 254rpx;
}
.dialog_coupon_code_content {
width: 296rpx;
height: 296rpx;
margin: 56rpx 0 0 0;
}
.dialog_coupon_code_operation {
width: 446rpx;
height: 96rpx;
margin: 56rpx 0 0 0;
padding: 0 24rpx;
border-radius: 2px;
background: #F2F3F5;
}
.dialog_coupon_code_close {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
margin: 32rpx 0 0 0;
background: rgba(254, 252, 249, 0.5);
}
\ No newline at end of file
pages/pay/order-input/order-input.js
......@@ -406,6 +406,12 @@ Page({
}).then((response) => {
let funcResponse = response.data
let funcTimetable = funcResponse.activityTimes
if (funcTimetable.length === 0) {
App.ui.showToast({
iconType: 'error',
title: '当前报名已结束',
})
}
let funcDate = []
let funcDateList = []
......
pages/pay/order-input/order-input.wxml
......@@ -376,7 +376,7 @@
<!-- 购买须知详情 -->
<m-popup isShow="{{winNoticeDetail}}">
<view class="popup_container column" slot="content">
<text class="popup_title font_bold_42 color_regular">兑换须知</text>
<text class="popup_title font_bold_42 color_regular">购买须知</text>
<view class="popup_content">
<rich-text nodes="{{noticeDetail}}"></rich-text>
</view>
......
pages/pay/order-input/order-input.wxss
......@@ -419,15 +419,7 @@
}
/* 使用须知弹窗 */
.popup_container {
max-height: 1100rpx;
padding: 56rpx 40rpx;
}
.popup_content {
min-height: 200rpx;
margin: 40rpx 0 0 0;
}
/* 报名组件 */
.entry-title {
......
utils/request/option.js
const output = {
// 二期测试环境
// baseUrl: 'https://sm-web2.meiqicloud.com/api/',
baseUrl: 'https://sm-web2.meiqicloud.com/api/',
// 三期测试环境
baseUrl: 'https://sm-web.meiqicloud.com/api/',
// baseUrl: 'http://shaoguang.free.idcfengye.com/api/'
// baseUrl: 'https://sm-web.meiqicloud.com/api/',
// 正式环境
......
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