miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 625f68317f617738d120bd34bdb76b040f6f18aa 2 个父辈 3ac1bf7a 86a6a94b

Merge remote-tracking branch 'origin/wumengyu' 

# Conflicts:
#	pages/index/confirm-appointment-info/confirm-appointment-info.js
#	pages/index/confirm-appointment-info/confirm-appointment-info.wxml
内嵌 并排对比
正在显示 7 个修改的文件 包含 404 行增加 和 242 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="commit" />
<list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="modal 模板">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FUSProjectUsageTrigger">
<session id="-381596063">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.open.time.1" value="1" />
<entry key="project.opened" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="1" />
<entry key="json" value="1" />
<entry key="wxml" value="3" />
<entry key="wxss" value="3" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="3" />
<entry key="HTML" value="3" />
<entry key="JSON" value="1" />
<entry key="JavaScript" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="56" />
<entry key="txt" value="18" />
<entry key="wxml" value="108" />
<entry key="wxss" value="21" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="21" />
<entry key="HTML" value="108" />
<entry key="JavaScript" value="56" />
<entry key="PLAIN_TEXT" value="18" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="app.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.json">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="19" column="36" lean-forward="true" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
<state relative-caret-position="608">
<caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="myProfile.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor" />
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" selection-start-line="1" selection-end-line="2" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="all-appointment.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">
<provider selected="true" editor-type-id="text-editor" />
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/project.config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="all-appointment.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor" />
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="718">
<caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="protocol.wxml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<provider selected="true" editor-type-id="text-editor" />
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="protocol.js" pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="myCard.wxml" pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>chooseYes</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/templates/templates.wxml" />
<option value="$PROJECT_DIR$/templates/templates.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
<option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="339" />
<option name="y" value="30" />
<option name="y" value="22" />
<option name="width" value="1936" />
<option name="height" value="1047" />
</component>
... ... @@ -78,7 +177,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -91,17 +189,37 @@
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="confirm-appointment-info" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
<item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="D:/git_folder" />
<property name="last_opened_file_path" value="D:/公众号/福牌" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="project.propDebugger" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -126,32 +244,42 @@
<option name="presentableId" value="Default" />
<updated>1542334789245</updated>
<workItem from="1542334792985" duration="236000" />
<workItem from="1542249556873" duration="5520000" />
</task>
<task id="LOCAL-00001" summary="modal 模板">
<created>1542274356914</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1542274356914</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="236000" />
<option name="totallyTimeSpent" value="5756000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24973656" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Version Control" visible="true" weight="0.3293348" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.329718" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.3275488" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
... ... @@ -186,42 +314,92 @@
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="modal 模板" />
<option name="LAST_COMMIT_MESSAGE" value="modal 模板" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json" />
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml" />
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss" />
<entry file="file://$PROJECT_DIR$/app.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json">
<entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml">
<entry file="file://$PROJECT_DIR$/project.config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="43" />
<state relative-caret-position="352">
<caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608">
<caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.json">
<entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" selection-start-line="1" selection-end-line="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
<caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="718">
<caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="19" column="36" lean-forward="true" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
<state relative-caret-position="370">
<caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" />
</state>
</provider>
</entry>
... ...
... ... @@ -6,22 +6,16 @@ Page({
*/
data: {
show: false,
modal_data: {
is_showModal: false,
currentBtn: null,
},
state_data: {
is_showSuccessModal: false,
pay_success: false,
children: [{
name: '张三',
is_choose: true
},
{
name: '李思思',
is_choose: false
},
{
name: '迪丽热巴-迪力木拉提',
is_choose: false
}
],
},
children: [{name:'张三',is_choose: true},
{name:'李思思', is_choose: false},
{name:'迪丽热巴-迪力木拉提',is_choose: false}],
is_choose: false,
},
chooseChildren(e) {
... ... @@ -31,64 +25,34 @@ Page({
[`children[${current}].is_choose`]: !this.data.children[current].is_choose
})
},
refreshModal() {
this.setData({
pay_success: true
});
},
submit() {
if(this.data.pay_success) {
this.setData({
is_showModal: false,
is_showSuccessModal: true,
});
}else {
this.setData({
is_showModal: true
});
}
this.setData({'modal_data.is_showModal': true})
},
chooseNo(e) {
this.setData({
currentBtn: e.currentTarget.dataset.index,
is_showModal: false
})
wx.navigateBack({
delta: 1
})
'modal_data.currentBtn': e.currentTarget.dataset.index,
'modal_data.is_showModal': false
});
wx.switchTab({url: '/pages/index/index'})
},
//弹窗确认事件
chooseYes(e) {
this.setData({
currentBtn: e.currentTarget.dataset.index,
is_showModal: false,
// is_showSuccessModal: true
})
wx.navigateTo({
url: '../../my/buyCard/buyCard',
'modal_data.currentBtn': e.currentTarget.dataset.index,
'modal_data.is_showModal': false,
'state_data.is_showSuccessModal': true
})
},
modalConfirm() {
this.setData({
is_showSuccessModal: false
})
wx.redirectTo({
url: '../../my/all-appointment/all-appointment?currentTab=' + 2,
})
this.setData({'state_data.is_showSuccessModal': false})
},
disableScroll() {},
addStudent() {
wx.navigateTo({
url: './add-student/add-student'
})
wx.navigateTo({url: './add-student/add-student'})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
onLoad: function (options) {
},
... ...
... ... @@ -47,31 +47,9 @@
<text>确认预约</text>
</view>
</view>
<!--是否购买畅玩卡弹窗-->
<view class="modal_box" wx:if="{{is_showModal}}" catchtouchmove="disableScroll">
<view class="background" bindtap="handleBackground" wx:if="{{is_showModal}}" catchtouchmove="disableScroll">
</view>
<view class="modalBackground Augly-bouncein">
<view class="modal">
<view class="tips-word">当前学员还没有购买/兑换畅玩卡，暂不能预约实验活动，是否马上购买/兑换？</view>
<view class="yes-no-btn">
<text bindtap="chooseNo" class="{{currentBtn == 0?'change-color':''}}" data-index="{{0}}">否</text>
<text bindtap="chooseYes" class="{{currentBtn == 1?'change-color':''}}" data-index="{{1}}">是</text>
</view>
</view>
</view>
</view>
<!--预约成功弹窗-->
<view class="modal_box" wx:if="{{is_showSuccessModal}}" catchtouchmove="disableScroll">
<view class="background" bindtap="handleBackground" wx:if="{{is_showSuccessModal}}" catchtouchmove="disableScroll">
</view>
<view class="modalBackground Augly-bouncein">
<view class="success-modal">
<image src="../../../images/success.jpg"></image>
<view class="congratulations">恭喜您</view>
<view class="appointment-success">您已经预约成功!</view>
<view class="confirm-btn" bindtap="modalConfirm">确定</view>
</view>
</view>
</view>
<import src="/templates/templates.wxml" />
<template is="modal" data="{{...modal_data}}"></template>
<template is="state-modal" data="{{...state_data}}"></template>
</view>
\ No newline at end of file
... ...
/* pages/index/confirm-appointment-info/confirm-appointment-info.wxss */
@import "../../../templates/templates.wxss";
page {
background-color: #f2f2f2;
}
... ... @@ -136,106 +137,4 @@ page {
color: #ffffff;
line-height: 98rpx;
font-size: 36rpx;
}.modal_box {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.background {
width: 100%;
height: 100%;
background: rgba(0,0,0,0.3);
position: absolute;
top: 0;
left: 0;
z-index: 999;
}
.modalBackground {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
z-index: 999;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
align-items: center;
justify-content: center;
color: #666666;
}
.modal {
width: 500rpx;
height: 260rpx;
/* height: 1100rpx; */
background: #ffffff;
border-radius: 10rpx;
box-sizing: border-box;
/*padding: 70rpx 0 0 0;*/
overflow: hidden;
position: relative;
}
.success-modal {
width: 400rpx;
height: 450rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background: #ffffff;
border-radius: 22rpx;
}
.success-modal image {
width: 236rpx;
height: 170rpx;
}
.congratulations {
font-size: 28rpx;
color: #3FA9F5;
margin-bottom: 14rpx;
}
.appointment-success {
font-size: 24rpx;
margin-bottom: 60rpx;
}
.confirm-btn {
width: 80%;
height: 54rpx;
line-height: 54rpx;
border-radius: 30rpx;
text-align: center;
color: #ffffff;
font-size: 30rpx;
background-color: #3FA9F5;
}
.tips-word {
font-size: 26rpx;
width: 100%;
padding: 30rpx 40rpx 30rpx 50rpx;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border-bottom: 1rpx solid #d3d3d3;
line-height: 38rpx;
}
.yes-no-btn {
width: 100%;
height: 84rpx;
display: flex;
align-items: center;
font-size: 30rpx;
}
.yes-no-btn text {
width: 50%;
text-align: center;
line-height: 68rpx;
}
.yes-no-btn text:nth-child(1) {
border-right: 1rpx solid #d3d3d3;
}
.change-color {
color: #3FA9F5;
}
\ No newline at end of file
... ...
... ... @@ -13,7 +13,7 @@
"compileType": "miniprogram",
"libVersion": "2.4.0",
"appid": "wx48319d952ea4e37f",
"projectname": "%E7%A7%91%E5%AD%A6%E9%98%9F%E9%95%BF",
"projectname": "science",
"debugOptions": {
"hidedInDevtools": []
},
... ...
... ... @@ -21,3 +21,42 @@
</view>
</view>
</template>
<template name="modal">
<!--是否购买畅玩卡弹窗-->
<view class="modal_box" wx:if="{{is_showModal}}" catchtouchmove="disableScroll">
<view class="background"
bindtap="handleBackground"
wx:if="{{is_showModal}}"
catchtouchmove="disableScroll">
</view>
<view class="modalBackground Augly-bouncein">
<view class="modal">
<view class="tips-word">当前学员还没有购买/兑换畅玩卡，暂不能预约实验活动，是否马上购买/兑换？</view>
<view class="yes-no-btn">
<text bindtap="chooseNo" class="{{currentBtn == 0?'change-color':''}}" data-index="{{0}}">否</text>
<text bindtap="chooseYes" class="{{currentBtn == 1?'change-color':''}}" data-index="{{1}}">是</text>
</view>
</view>
</view>
</view>
</template>
<template name="state-modal">
<!--预约成功弹窗-->
<view class="modal_box" wx:if="{{is_showSuccessModal}}" catchtouchmove="disableScroll">
<view class="background"
bindtap="handleBackground"
wx:if="{{is_showSuccessModal}}"
catchtouchmove="disableScroll">
</view>
<view class="modalBackground Augly-bouncein">
<view class="success-modal">
<image src="../../../images/success.jpg"></image>
<view class="congratulations">恭喜您</view>
<view class="appointment-success">您已经预约成功!</view>
<view class="confirm-btn" bindtap="modalConfirm">确定</view>
</view>
</view>
</view>
</template>
\ No newline at end of file
... ...
... ... @@ -67,3 +67,107 @@
text-align: center;
border-radius: 10rpx;
}
/*下面是modal样式*/
.modal_box {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.background {
width: 100%;
height: 100%;
background: rgba(0,0,0,0.3);
position: absolute;
top: 0;
left: 0;
z-index: 999;
}
.modalBackground {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
z-index: 999;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
align-items: center;
justify-content: center;
color: #666666;
}
.modal {
width: 500rpx;
height: 260rpx;
/* height: 1100rpx; */
background: #ffffff;
border-radius: 10rpx;
box-sizing: border-box;
/*padding: 70rpx 0 0 0;*/
overflow: hidden;
position: relative;
}
.success-modal {
width: 400rpx;
height: 450rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background: #ffffff;
border-radius: 22rpx;
}
.success-modal image {
width: 236rpx;
height: 170rpx;
}
.congratulations {
font-size: 28rpx;
color: #3FA9F5;
margin-bottom: 14rpx;
}
.appointment-success {
font-size: 24rpx;
margin-bottom: 60rpx;
}
.confirm-btn {
width: 80%;
height: 54rpx;
line-height: 54rpx;
border-radius: 30rpx;
text-align: center;
color: #ffffff;
font-size: 30rpx;
background-color: #3FA9F5;
}
.tips-word {
font-size: 26rpx;
width: 100%;
padding: 30rpx 40rpx 30rpx 50rpx;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border-bottom: 1rpx solid #d3d3d3;
line-height: 38rpx;
}
.yes-no-btn {
width: 100%;
height: 84rpx;
display: flex;
align-items: center;
font-size: 30rpx;
}
.yes-no-btn text {
width: 50%;
text-align: center;
line-height: 68rpx;
}
.yes-no-btn text:nth-child(1) {
border-right: 1rpx solid #d3d3d3;
}
.change-color {
color: #3FA9F5;
}
\ No newline at end of file
... ...