Skip to content

严立 / mini-shimao

Go to a project
Commit e262f568 by 严立
Options

1.ui 组件路径整理 

2.增加退款逻辑
parent 0776c7ac
Inline Side-by-side
Showing with 138 additions and 87 deletions
app.js
import iMui from './component/m-init.js'
import iMui from './component/m-ui/m-init.js'
import iBase64 from './npm/base64.js'
import iMiment from './npm/miment.js'
import pageExtend from './utils/extend/page.js'
......
app.json
......@@ -65,17 +65,17 @@
"usingComponents": {
"coupon-code": "/component/coupon-code/coupon-code",
"swiper-point": "./component/swiper-point/swiper-point",
"m-button-bottom": "./component/m-button-bottom/m-button-bottom",
"m-checkbox": "./component/m-checkbox/m-checkbox",
"m-dialog": "./component/m-dialog/m-dialog",
"m-image-picker": "./component/m-image-picker/m-image-picker",
"m-input": "./component/m-input/m-input",
"m-nav": "./component/m-nav/m-nav",
"m-popup": "./component/m-popup/m-popup",
"m-textarea": "./component/m-textarea/m-textarea",
"m-tab": "./component/m-tab/m-tab",
"m-segment": "./component/m-segment/m-segment",
"m-toast": "./component/m-toast/m-toast"
"m-button-bottom": "./component/m-ui/m-button-bottom/m-button-bottom",
"m-checkbox": "./component/m-ui/m-checkbox/m-checkbox",
"m-dialog": "./component/m-ui/m-dialog/m-dialog",
"m-image-picker": "./component/m-ui/m-image-picker/m-image-picker",
"m-input": "./component/m-ui/m-input/m-input",
"m-nav": "./component/m-ui/m-nav/m-nav",
"m-popup": "./component/m-ui/m-popup/m-popup",
"m-textarea": "./component/m-ui/m-textarea/m-textarea",
"m-tab": "./component/m-ui/m-tab/m-tab",
"m-segment": "./component/m-ui/m-segment/m-segment",
"m-toast": "./component/m-ui/m-toast/m-toast"
},
"window": {
"navigationStyle": "custom",
......
component/coupon-code/coupon-code.wxss
@import '../m-main.wxss';
@import '../m-ui/m-main.wxss';
/* 券码弹窗 */
.coupon_code_container {
......
component/m-main.wxss deleted 100644 → 0
@import './theme/layout.wxss';
@import './theme/theme.wxss';
\ No newline at end of file
component/m-dialog/m-dialog.wxml → component/m-ui/m-dialog/m-dialog.wxml
......@@ -18,7 +18,7 @@
<text class="regular">{{title}}</text>
</view>
<view class="dialog-content row cc">
<text class="secondary">{{content}}</text>
<text class="fs30 c31">{{content}}</text>
</view>
<view class="dialog-operation row cc ac border-base">
<button class="dialog-operation-confirm row cc ac" bindtap="onConfirm">{{confirm}}</button>
......@@ -33,10 +33,10 @@
<text class="regular">{{title}}</text>
</view>
<view class="dialog-content row cc">
<text class="secondary">{{content}}</text>
<text class="fs30 c31">{{content}}</text>
</view>
<view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
<button class="dialog-operation-cancel row cc ac fs30 c31" bindtap="onCancel">{{cancel}}</button>
<view class="dialog-operation-line row cc ac border-base"></view>
<button class="dialog-operation-confirm row cc ac" bindtap="onConfirm">{{confirm}}</button>
</view>
......@@ -50,13 +50,13 @@
<text class="regular">{{title}}</text>
</view>
<view class="dialog-content row cc">
<text class="secondary">{{content}}</text>
<text class="fs30 c31">{{content}}</text>
</view>
<view class="dialog-input row cc">
<input class="dialog-input-element" auto-focus placeholder="{{placeholder}}" placeholder-class="dialog-input-placeholder" value="{{inputContent}}" bindinput="onInput"></input>
</view>
<view class="dialog-operation row cb ac border-base">
<button class="dialog-operation-cancel row cc ac secondary" bindtap="onCancel">{{cancel}}</button>
<button class="dialog-operation-cancel row cc ac fs30 c31" bindtap="onCancel">{{cancel}}</button>
<view class="dialog-operation-line row cc ac border-base"></view>
<button class="dialog-operation-confirm row cc ac" bindtap="onConfirm">{{confirm}}</button>
</view>
......
component/m-init.js → component/m-ui/m-init.js
......@@ -24,9 +24,6 @@ function showToast (funcOption) {
funcOption = Object.assign(App.ui.toast.data, funcOption)
funcOption.winToast = true
console.log('App.ui.toast', App.ui.toast)
console.log('funcOption', funcOption)
App.ui.toast.setData(funcOption)
// 设置 toast 关闭时间
......
component/m-input/m-input.js → component/m-ui/m-input/m-input.js
Component({
externalClasses: ['external-input'],
properties: {
// 组件独立标识，此参数会在 event 中返回
inputId: {
......@@ -6,20 +7,19 @@ Component({
value: ''
},
// input 样式类名
className: {
placeholder: {
type: String,
value: ''
},
placeholder: {
value: {
type: String,
value: ''
},
value: {
textAlign: {
type: String,
value: ''
value: 'left'
},
type: {
......@@ -78,6 +78,7 @@ Component({
setInputShow: function() {
this.setData({
value: this.data.value,
winText: false,
winInput: true,
})
......
component/m-input/m-input.wxml → component/m-ui/m-input/m-input.wxml
<view class="m-input">
<view class="row ac" hidden="{{!winText}}" bindtap="setInputShow">
<view class="m-input-boundary row ac {{className}}">
<view class="m-input-boundary row ac external-input">
<text class="m-input-text-content fs30" hidden="{{value === '' ? true : false}}">{{value}}</text>
<text class="m-input-text-placeholder fs30" hidden="{{value === '' ? false : true}}">{{placeholder}}</text>
</view>
</view>
<view class="row ac" hidden="{{!winInput}}">
<view class="m-input-boundary row ac {{className}}">
<view class="m-input-boundary row ac external-input">
<input
class="m-input-input-content row ac fs30"
style="{{'text-align: ' + textAlign + ';'}}"
value="{{value}}"
type="{{type}}"
maxlength="{{maxlength}}"
placeholder="{{placeholder}}"
placeholder-style="{{'width: ' + inputWidth + 'px;'}}"
placeholder-style="{{'text-align: ' + textAlign + ';'}}"
placeholder-class="m-input-input-placeholder"
focus="{{inputFocus}}"
bindinput="onInput"
......
component/m-input/m-input.wxss → component/m-ui/m-input/m-input.wxss
......@@ -2,13 +2,7 @@
.m-input-boundary {
position: relative;
width: 100%;
height: 80rpx;
margin: 16rpx 0 0 0;
padding: 0 24rpx;
border-radius: 4px;
overflow-x: scroll;
border: 1px #DBDFE5 solid;
}
/* 显示文本样式 */
......@@ -18,17 +12,16 @@
}
.m-input-text-placeholder {
width: 100% !important;
white-space: nowrap;
color: #C2C7CF;
}
/* 输入控件样式 */
.m-input-input-content {
width: 100%;
height: 100%;
}
.m-input-input-placeholder {
width: 100% !important;
color: #C2C7CF;
}
\ No newline at end of file
component/m-ui/m-main.wxss 0 → 100644
@import '../theme/layout.wxss';
@import '../theme/theme.wxss';
\ No newline at end of file
component/m-textarea/m-textarea.js → component/m-ui/m-textarea/m-textarea.js
Component({
externalClasses: ['external-input'],
properties: {
inputId: { type: String, value: '' },
className: { type: String, value: '' },
placeholder: { type: String, value: '' },
value: { type: String, value: '' },
inputMax: { type: Number, value: 140 },
......
component/m-textarea/m-textarea.wxml → component/m-ui/m-textarea/m-textarea.wxml
<view class="m_textarea_container">
<view class="m_textarea_content {{className}}" hidden="{{!winText}}" bindtap="setInputShow">
<view class="m_textarea_content external-input" hidden="{{!winText}}" bindtap="setInputShow">
<view class="m_textarea_content_boundary">
<text class="m_textarea_content_color" wx:if="{{value === '' ? false : true}}">{{value}}</text>
<text class="m_textarea_placeholder_color" wx:if="{{value === '' ? true : false}}">{{placeholder}}</text>
</view>
</view>
<view class="m_textarea_content {{className}}" hidden="{{!winInput}}">
<view class="m_textarea_content external-input" hidden="{{!winInput}}">
<view class="m_textarea_content_boundary">
<textarea
class="m_textarea m_textarea_content_color"
......
component/swiper-point/swiper-point.wxss
@import '../m-ui/m-main.wxss';
.swiper-point {
z-index: 4;
position: absolute;
......
pages/club/create/create.wxml
......@@ -6,9 +6,9 @@
<view class="form-item column">
<text>俱乐部名称</text>
<m-input
external-input="form-item-input"
inputId="clubName"
maxlength="{{12}}"
className="form-item-input row ac"
placeholder="请输入俱乐部名称"
bindblur="onInputBlur">
</m-input>
......@@ -18,7 +18,7 @@
<text>俱乐部简要说明</text>
<m-textarea
inputId="clubDescribe"
className="form-item-textarea"
external-input="form-item-textarea"
placeholder="请输入俱乐部简要说明，如创建俱乐部的宗旨、意义及简要规划等"
inputMax="{{200}}"
bindblur="onInputBlur">
......@@ -28,9 +28,9 @@
<view class="form-item column">
<text>姓名</text>
<m-input
external-input="form-item-input"
inputId="userName"
maxlength="{{12}}"
className="form-item-input row ac"
placeholder="请输入姓名"
bindblur="onInputBlur">
</m-input>
......@@ -39,8 +39,8 @@
<view class="form-item column">
<text>手机号</text>
<m-input
external-input="form-item-input"
inputId="userPhone"
className="form-item-input row ac"
type="number"
maxlength="{{11}}"
placeholder="请输入手机号"
......
pages/club/enter/enter.wxml
......@@ -13,8 +13,8 @@
<view class="form-item column">
<text>姓名</text>
<m-input
external-input="form-item-input"
inputId="name"
className="form-item-input row ac"
placeholder="请输入姓名"
bindblur="onInputBlur">
</m-input>
......@@ -23,8 +23,8 @@
<view class="form-item column">
<text>手机号</text>
<m-input
external-input="form-item-input"
inputId="phone"
className="form-item-input row ac"
type="number"
maxlength="{{11}}"
placeholder="请输入手机号"
......@@ -35,8 +35,8 @@
<view class="form-item column">
<text>备注</text>
<m-input
external-input="form-item-input"
inputId="remark"
className="form-item-input row ac"
placeholder="请输入备注信息"
bindblur="onInputBlur">
</m-input>
......@@ -47,8 +47,8 @@
<view class="form-item column">
<text>{{item.label}}</text>
<m-input
external-input="form-item-input"
inputId="other"
className="form-item-input row ac"
placeholder="{{'请输入' + item.label}}"
data-item="{{item}}"
bindblur="onInputBlur">
......
pages/commodity/home/home.js
......@@ -222,6 +222,7 @@ Page({
'sideBarId': funcResponse[i].classifyId, // 商品所属标签
}
funcList.push(funcItem)
if (funcList.length === 4) break
}
this.setData({
shopRecommendA: funcList
......@@ -251,6 +252,7 @@ Page({
'sideBarId': funcResponse[i].classifyId, // 商品所属标签
}
funcList.push(funcItem)
if (funcList.length === 4) break
}
this.setData({
shopRecommendB: funcList
......@@ -280,6 +282,7 @@ Page({
'sideBarId': funcResponse[i].classifyId, // 商品所属标签
}
funcList.push(funcItem)
if (funcList.length === 4) break
}
this.setData({
shopRecommendC: funcList
......@@ -309,6 +312,7 @@ Page({
'sideBarId': funcResponse[i].classifyId, // 商品所属标签
}
funcList.push(funcItem)
if (funcList.length === 4) break
}
this.setData({
shopRecommendD: funcList
......@@ -342,6 +346,7 @@ Page({
'exchangeQuantity': funcData[i].sellNumber,
}
funcList.push(funcItem)
if (funcList.length === 4) break
}
this.setData({
integralMallGoods: funcList
......
pages/commodity/menu-food/menu-food.js
......@@ -149,6 +149,8 @@ Page({
* @returns
*/
querySideBar: function () {
console.log('querySideBar', this.data.shopInfo.id)
console.log('querySideBar', this.data.shopInfo.shopType)
App.request({
url: 'v1/commodity/getClassifys',
params: {
......
pages/commodity/room-appointment/room-appointment.js
......@@ -211,7 +211,7 @@ Page({
if (response.data && response.data.code === 500) {
App.ui.showToast({
iconType: 'error',
title: response.data.msg,
title: response.data.message,
})
return
}
......@@ -224,7 +224,7 @@ Page({
.catch((response) => {
App.ui.showToast({
iconType: 'error',
title: response.msg,
title: response.message,
})
})
},
......
pages/mall/exchange-submit/exchange-submit.wxml
......@@ -141,8 +141,8 @@
<view class="contact_input column">
<text class="contact_input_mark">姓名</text>
<m-input
external-input="input"
inputId="name"
className="input row ac"
maxlength="50"
placeholder="请填写姓名"
bindblur="onInputBlur"
......@@ -152,8 +152,8 @@
<view class="contact_input column">
<text>手机号</text>
<m-input
external-input="input"
inputId="phone"
className="input row ac"
maxlength="11"
type="number"
placeholder="请填写手机号"
......
pages/mine/address-operate/address-operate.wxml
......@@ -8,8 +8,8 @@
<view class="row ac">
<text class="title">收货人</text>
<m-input
external-input="address_item_input"
inputId="name"
className="address_item_input row ac"
value="{{addressInfo.name}}"
placeholder="请输入"
maxlength="20"
......@@ -24,8 +24,8 @@
<view class="row ac">
<text class="title">手机号</text>
<m-input
external-input="address_item_input"
inputId="phone"
className="address_item_input row ac"
value="{{addressInfo.phone}}"
placeholder="请输入"
maxlength="11"
......@@ -51,8 +51,8 @@
<view class="row ac">
<text class="title">详细地址</text>
<m-input
external-input="address_item_input"
inputId="address"
className="address_item_input"
value="{{addressInfo.address}}"
placeholder="如街道、门牌号、小区、楼栋号等"
maxlength="30"
......
pages/mine/appointment-ticket/appointment-ticket.js
......@@ -77,7 +77,7 @@ Page({
if (response.data && response.data.code == 500) {
App.ui.showToast({
'iconType': 'error',
'title': response.data.msg,
'title': response.data.message,
})
} else {
App.ui.showToast({
......
pages/mine/appointment/appointment.js
......@@ -264,7 +264,7 @@ Page({
if (response.data && response.data.code == 500) {
App.ui.showToast({
'iconType': 'error',
'title': response.data.msg,
'title': response.data.message,
})
} else {
App.ui.showToast({
......
pages/mine/authentication-input/authentication-input.js
......@@ -172,7 +172,7 @@ Page({
.catch((response) => {
App.ui.showToast({
iconType: 'error',
title: response.msg,
title: response.message,
})
})
},
......
pages/mine/info/info.wxml
......@@ -10,8 +10,9 @@
<view class="info_item row cb ac">
<text>姓名</text>
<m-input
external-input="info_item_input"
textAlign="right"
inputId="name"
className="info_item_input row ac"
value="{{userInfo.name}}"
placeholder="请填写姓名"
maxlength="10"
......@@ -35,8 +36,9 @@
<view class="info_item row cb ac">
<text>地址</text>
<m-input
external-input="info_item_input"
textAlign="right"
inputId="address"
className="info_item_input row ac"
value="{{userInfo.address}}"
placeholder="请填写地址"
maxlength="30"
......
pages/mine/info/info.wxss
......@@ -57,7 +57,6 @@
.info_item_input {
height: 42rpx;
text-align: right;
font-size: 30rpx;
font-weight: 400;
......
pages/mine/order/order.js
......@@ -110,8 +110,8 @@ Page({
'commoditySlice3': [],
'commodityType': Number(funcResponse[i].goodType),
'wxRequest': funcResponse[i].wxRequest,
'total': funcResponse[i].smOrderDetails.length
'total': funcResponse[i].smOrderDetails.length,
'isRefund': Boolean(Number(funcResponse[i].enableRefund))
}
// 添加订单商品列表
......@@ -395,6 +395,45 @@ Page({
fail: () => {},
})
},
onOrderRefund: function (event) {
App.ui.showDialog({
type: 'confirm',
title: '是否确认申请退款？',
content: '申请后无法撤销',
cancel: '取消',
confirm: '确定',
success: () => {
App.ui.showToast({
'iconType': 'loading',
'title': '处理中',
})
this.setData({
isDoing: true
})
let funcItem = event.target.dataset.item
App.request({
url: 'v1/order/orderRefund/' + funcItem.id,
method: 'get',
params: {},
})
.then((response) => {
App.ui.showToast({
'iconType': 'success',
'title': '退款成功'
})
this.setData({
'isDoing': false,
'orderList': [],
'orderPages': 1,
})
this.queryOrder()
})
},
fail: () => {},
})
},
/**
* 检验数据是否都通过
* @function
......
pages/mine/order/order.wxml
......@@ -63,6 +63,7 @@
<text class="message" wx:if="{{item.status === -1}}">已取消</text>
<text class="message" wx:if="{{item.status === 4}}">已过期</text>
<text class="message" wx:if="{{item.status === 6}}">已评价</text>
<text class="warning" wx:if="{{item.status === 7}}">退款审核中</text>
</view>
</view>
......@@ -95,6 +96,7 @@
<text class="amount">¥{{item.amount}}</text>
</view>
<view class="row ac">
<button wx:if="{{item.isRefund && item.status !== 7}}" class="delete row cc ac" data-item="{{item}}" catchtap="onOrderRefund">申请退款</button>
<button wx:if="{{item.status === 0}}" class="delete row cc ac" data-index="{{index}}" data-item="{{item}}" catchtap="onOrderCancel" disabled="{{isDoing}}">取消订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === -1 || item.status === 4 || item.status === 6}}" class="delete row cc ac" data-item="{{item}}" catchtap="onOrderRemove">删除订单</button>
<button disabled="{{isDoing}}" wx:if="{{item.status === 0}}" class="again row cc ac" data-item="{{item}}" catchtap="onOrderPay">去支付</button>
......
pages/mine/question/question.js
......@@ -103,7 +103,7 @@ Page({
.catch((response) => {
App.ui.showToast({
'iconType': 'error',
'title': response.msg,
'title': response.message,
})
})
},
......
pages/mine/question/question.wxml
......@@ -48,7 +48,7 @@
<view class="feedback_input_wrap" style="{{'margin-top: ' + feedbackCssMarginTop + 'px; opacity: ' + feedbackOpacity + ';'}}">
<m-textarea
inputId="feedback"
className="feedback_input"
external-input="feedback_input"
placeholder="请留下您的宝贵意见"
inputMax="{{200}}"
focus="{{true}}"
......
pages/pay/coupon-detail/coupon-detail.js
......@@ -13,7 +13,6 @@ Page({
couponDetail: null,
},
onLoad: function (options) {
console.log(this)
if (options.couponDetail) {
let data = JSON.parse(options.couponDetail)
let tmpGoodsList = [];
......@@ -90,7 +89,7 @@ Page({
if (response.data && response.data.code * 1 == 500) {
App.ui.showToast({
iconType: 'error',
title: response.data.msg,
title: response.data.message,
})
} else {
App.ui.showToast({
......@@ -105,7 +104,7 @@ Page({
.catch((response) => {
App.ui.showToast({
iconType: 'error',
title: response.msg,
title: response.message,
})
})
}
......
pages/pay/order-comment/order-comment.wxml
......@@ -81,7 +81,7 @@
<view class="order-comment">
<m-textarea
inputId="evaluate"
className="evaluate-content"
external-input="evaluate-content"
placeholder="您的评价与建议，会让园区做的更好"
inputMax="{{200}}"
bindblur="doInputContent">
......
pages/pay/order-detail/order-detail.wxml
......@@ -38,7 +38,15 @@
<text>订单已评价</text>
</view>
</view>
<view class="state-content state-content-invalid column cc" wx:if="{{orderInfo.state === 7}}">
<view class="state-content state-content column cc" wx:if="{{orderInfo.state === 7}}">
<view class="state-content-title row">
<text>退款审核中</text>
</view>
<view class="state-content-tip row">
<text>退款申请正在审核中，请您耐心等待</text>
</view>
</view>
<view class="state-content state-content-invalid column cc" wx:if="{{orderInfo.state === 9}}">
<view class="state-content-title row">
<text>订单已完成</text>
</view>
......
pages/pay/order-input/order-input.js
......@@ -953,7 +953,7 @@ Page({
},
})
.then((response) => {
if (/ 商品不存在/.test(response.data.msg)) {
if (/ 商品不存在/.test(response.data.message)) {
wx.setStorageSync('shoppingCartBuffer', [])
App.ui.showToast({
iconType: 'error',
......@@ -967,7 +967,7 @@ Page({
return
}
if (/价格不一致/.test(response.data.msg)) {
if (/价格不一致/.test(response.data.message)) {
wx.setStorageSync('shoppingCartBuffer', [])
App.ui.showToast({
iconType: 'error',
......@@ -981,10 +981,10 @@ Page({
return
}
if (/订单未支付/.test(response.data.msg)) {
if (/订单未支付/.test(response.data.message)) {
App.ui.showToast({
iconType: 'error',
title: response.data.msg,
title: response.data.message,
})
this.setData({
isPaySubmit: false,
......@@ -992,7 +992,7 @@ Page({
return
}
if (/库存不足/.test(response.data.msg)) {
if (/库存不足/.test(response.data.message)) {
let funcList = []
for (let i = 0, l = response.data.data.list.length; i < l; i++) {
let funcItem = {
......
pages/pay/order-input/order-input.wxml
......@@ -250,8 +250,8 @@
<view class="contact-input column">
<text class="contact-input-mark">姓名</text>
<m-input
external-input="input"
inputId="input"
className="input row ac"
maxlength="50"
placeholder="请填写姓名"
data-type="name"
......@@ -263,8 +263,8 @@
<view class="contact-input column">
<text>手机号</text>
<m-input
external-input="input"
inputId="input"
className="input row ac"
maxlength="11"
type="number"
placeholder="请填写手机号"
......@@ -277,8 +277,8 @@
<view class="contact-input column">
<text>备注</text>
<m-input
external-input="input"
inputId="input"
className="input row ac"
maxlength="50"
placeholder="请填写备注"
data-type="remarks"
......@@ -306,8 +306,8 @@
<view class="contact-input column">
<text class="contact-input-mark">姓名</text>
<m-input
external-input="input"
inputId="input"
className="input row ac"
maxlength="50"
placeholder="请填写姓名"
data-type="name"
......@@ -319,8 +319,8 @@
<view class="contact-input column">
<text>手机号</text>
<m-input
external-input="input"
inputId="input"
className="input row ac"
maxlength="11"
type="number"
placeholder="请填写手机号"
......@@ -333,8 +333,8 @@
<view class="contact-input column">
<text>身份证号</text>
<m-input
external-input="input"
inputId="input"
className="input row ac"
placeholder="请填写身份证号"
data-type="identity"
data-index="{{index}}"
......
utils/request/interceptor.js
......@@ -63,7 +63,7 @@ let Output = {
response: {
code: funcResponse.data.code,
data: funcResponse.data.list,
message: funcResponse.data.msg
message: funcResponse.data.message
}
}
}
......@@ -73,7 +73,7 @@ let Output = {
response: {
code: funcResponse.data.code,
data: funcResponse.data.data ? funcResponse.data.data : {},
message: funcResponse.data.msg
message: funcResponse.data.message
}
}
break
......@@ -88,7 +88,7 @@ let Output = {
response: {
code: funcResponse.data.code,
data: '',
message: funcResponse.data.msg
message: funcResponse.data.message
}
}
break
......
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