From 8ba1fa2ca00e5cd340194bf8aabc8f8516615eb7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 11 五月 2024 18:55:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/App.vue | 367 +++++++++++++++++++++++++++------------------------
1 files changed, 194 insertions(+), 173 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 170b6c4..71871fd 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -1,199 +1,220 @@
<script>
- export default {
- onLaunch: function() {
- var that = this
- if (!that.$store.state.openid) {
- let url = window.location.href
- let code = ''
- if (url.indexOf('code=') !== -1) {
- const query = url.split('?')
+export default {
+ onLaunch: function () {
+ var that = this
+ if (!that.$store.state.openid) {
+ let url = window.location.href
+ let code = ''
+ if (url.indexOf('code=') !== -1) {
+ const query = url.split('?')
- for (const q of query) {
- if (q.indexOf('code=') !== -1) {
- code = q.substring(q.indexOf('code=') + 5, q.length)
+ for (const q of query) {
+ if (q.indexOf('code=') !== -1) {
+ code = q.substring(q.indexOf('code=') + 5, q.length)
+ }
+ }
+ that.$u.api.wxAuthorize({
+ code: code
+ }).then(res => {
+ if (res.code === 200) {
+ that.$store.commit('setOpenId', res.data.openid)
+ if (res.data.member) {
+ that.$store.commit('setMember', res.data.member)
}
}
- that.$u.api.wxAuthorize({
- code: code
- }).then(res => {
- if (res.code === 200) {
- that.$store.commit('setOpenId', res.data.openid)
- if (res.data.member) {
- that.$store.commit('setMember', res.data.member)
- }
- }
- })
- }
+ })
}
- },
- onShow: function() {
- console.log('App Show')
- },
- onHide: function() {
- console.log('App Hide')
}
+ },
+ onShow: function () {
+ console.log('App Show')
+ },
+ onHide: function () {
+ console.log('App Hide')
}
+}
</script>
<style lang="scss">
- /*姣忎釜椤甸潰鍏叡css */
- @import "uview-ui/index.scss";
+/*姣忎釜椤甸潰鍏叡css */
+@import "uview-ui/index.scss";
- .flex-cb {
- display: flex;
- justify-content: space-between;
- align-items: center;
- }
+.flex-cb {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
- .container {
- height: 100%;
- width: 100%;
- max-width: 800rpx;
- overflow-y: auto;
- }
+.container {
+ height: 100%;
+ width: 100%;
+ max-width: 800rpx;
+ overflow-y: auto;
+}
- .doumee-container .ivu-tabs-nav {
- width: 100%;
- }
+.doumee-container .ivu-tabs-nav {
+ width: 100%;
+}
- .doumee-container .ivu-tabs-nav .ivu-tabs-tab {
- width: calc(100% / 3);
- }
+.doumee-container .ivu-tabs-nav .ivu-tabs-tab {
+ width: calc(100% / 3);
+}
- .doumee-container .ivu-tabs-nav .ivu-tabs-tab {
- margin-right: 0;
- text-align: center;
- }
+.doumee-container .ivu-tabs-nav .ivu-tabs-tab {
+ margin-right: 0;
+ text-align: center;
+}
- .cell {
- background-color: #fff;
- display: flex;
- justify-content: space-between;
- align-items: center;
- min-height: 100rpx;
- padding: 24rpx 30rpx;
- box-sizing: border-box;
- border-bottom: 1rpx solid #eee;
- font-size: 15rpx;
- position: relative;
- }
+.cell {
+ background-color: #fff;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ min-height: 100rpx;
+ padding: 24rpx 30rpx;
+ box-sizing: border-box;
+ border-bottom: 1rpx solid #eee;
+ font-size: 15rpx;
+ position: relative;
+}
- .cell .title {
- flex-shrink: 0;
- color: #222;
- line-height: 20rpx;
- height: 20rpx;
- width: 28%;
- margin-right: 5%;
- }
+.cell .title {
+ flex-shrink: 0;
+ color: #222;
+ line-height: 20rpx;
+ height: 20rpx;
+ width: 28%;
+ margin-right: 5%;
+}
- .cell .content {
- flex: 1;
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- display: flex;
- align-items: center;
- justify-content: flex-end;
- }
+.cell .content {
+ flex: 1;
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #999999;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+}
- .cell .content .input {
- width: 100%;
- height: 100%;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- text-align: right;
- }
+.cell .content .input {
+ width: 100%;
+ height: 100%;
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
+ text-align: right;
+}
- .cell.is-link::after {
- content: '';
- display: block;
- width: 8rpx;
- height: 8rpx;
- transform: rotate(-45deg);
- border-right: 1rpx solid #999999;
- border-bottom: 1rpx solid #999999;
- margin-left: 5rpx;
- }
+.cell.is-link::after {
+ content: '';
+ display: block;
+ width: 8rpx;
+ height: 8rpx;
+ transform: rotate(-45deg);
+ border-right: 1rpx solid #999999;
+ border-bottom: 1rpx solid #999999;
+ margin-left: 5rpx;
+}
- .card {
- background-color: #fff;
- padding: 16rpx;
- position: relative;
- }
+.card {
+ background-color: #fff;
+ padding: 16rpx;
+ position: relative;
+}
- .card::after {
- content: '';
- display: block;
- position: absolute;
- width: calc(100% - 32rpx);
- height: 0;
- bottom: 0;
- left: 16rpx;
- border-bottom: 1rpx solid #f7f7f7;
- }
+.card::after {
+ content: '';
+ display: block;
+ position: absolute;
+ width: calc(100% - 32rpx);
+ height: 0;
+ bottom: 0;
+ left: 16rpx;
+ border-bottom: 1rpx solid #f7f7f7;
+}
- .card .title {
- color: #777777;
- margin-bottom: 12rpx;
- }
+.card .title {
+ color: #777777;
+ margin-bottom: 12rpx;
+}
- .card .content {
- color: #222;
- }
- .placeholder9{
- color: #999999;
- font-size: 28rpx;
- }
- //璁剧疆鍦嗚
- checkbox .uni-checkbox-input{
- border-radius: 50%;
- }
- checkbox .uni-checkbox-input.uni-checkbox-input-checked{
- color: #fff !important;
- border: 1px solid #4d99a8 !important;
- background-color: #4d99a8 !important;
- }
- checkbox .uni-checkbox-input.uni-checkbox-input-checked:before{
- /* color: #4d99a8 !important; */
- /* border: 1px solid #4d99a8 !important; */
- /* font-size: 58rpx; */
- /* border-radius: 50%; */
- }
-
- //
-
- view{
- box-sizing: border-box;
- }
- image{
- box-sizing: border-box;
- margin: 0;
- display: flex;
- }
- .df_ac{
- display: flex;
- align-items: center;
- }
- .main_app{
- padding:0 30rpx 30rpx;
- font-size: 28rpx;
- color: #333333;
- }
- .placeholder9{
- color: #999999;
- }
- .mr24{
- margin-right: 24rpx;
- }
- .mr12{
- margin-right: 12rpx;
- }
- .mr6{
- margin-right: 6rpx;
- }
-
-
+.card .content {
+ color: #222;
+}
+.placeholder9 {
+ color: #999999;
+ font-size: 28rpx;
+}
+
+//璁剧疆鍦嗚
+checkbox .uni-checkbox-input {
+ border-radius: 50%;
+}
+
+checkbox .uni-checkbox-input.uni-checkbox-input-checked {
+ color: #fff !important;
+ border: 1px solid #4d99a8 !important;
+ background-color: #4d99a8 !important;
+}
+
+checkbox .uni-checkbox-input.uni-checkbox-input-checked:before {
+ /* color: #4d99a8 !important; */
+ /* border: 1px solid #4d99a8 !important; */
+ /* font-size: 58rpx; */
+ /* border-radius: 50%; */
+}
+
+//
+
+view {
+ box-sizing: border-box;
+}
+
+image {
+ box-sizing: border-box;
+ margin: 0;
+ display: flex;
+}
+
+textarea {
+ box-sizing: border-box;
+ background-color: #f7f7f7;
+ font-size: 28rpx;
+ color: #333333;
+ padding: 24rpx;
+ border-radius: 8rpx;
+}
+
+.df_ac {
+ display: flex;
+ align-items: center;
+}
+
+.main_app {
+ padding: 0 30rpx 30rpx;
+ font-size: 28rpx;
+ color: #333333;
+}
+
+.placeholder9 {
+ color: #999999;
+ font-size: 28rpx;
+}
+
+.mr24 {
+ margin-right: 24rpx;
+}
+
+.mr12 {
+ margin-right: 12rpx;
+}
+.ml12 {
+ margin-left: 12rpx;
+}
+
+.mr6 {
+ margin-right: 6rpx;
+}
</style>
--
Gitblit v1.9.3