{{ props.content.showName }}
-
+
+ />
@@ -67,10 +75,7 @@
-
+
@@ -376,96 +402,96 @@ function openReadUserPanel() {
margin-top: 5px;
border-top: 1px solid #e5c7c7;
padding-top: 5px;
- }
- }
-
- .content-in {
- background: #fbfbfb;
- border-radius: 0 10px 10px;
- }
-
- .content-out {
- background: #dceafd;
- border-radius: 10px 0 10px 10px;
- }
-
- .content-no-padding {
- padding: 0;
- background: transparent;
- border-radius: 10px;
- overflow: hidden;
- }
-
- .content-no-padding.content-has-risk {
- padding: 12px;
- }
-
- .content-has-risk {
- background: rgba(250, 81, 81, 0.16);
- }
-
- .blink-shadow {
- @keyframes shadow-blink {
- 50% {
- box-shadow: rgba(255, 156, 25, 1) 0 0 10px 0;
}
}
- box-shadow: rgba(255, 156, 25, 0) 0 0 10px 0;
- animation: shadow-blink 1s linear 3;
- }
+ .content-in {
+ background: #fbfbfb;
+ border-radius: 0 10px 10px;
+ }
- .blink-content {
- @keyframes reference-blink {
- 50% {
- background-color: #ff9c19;
+ .content-out {
+ background: #dceafd;
+ border-radius: 10px 0 10px 10px;
+ }
+
+ .content-no-padding {
+ padding: 0;
+ background: transparent;
+ border-radius: 10px;
+ overflow: hidden;
+ }
+
+ .content-no-padding.content-has-risk {
+ padding: 12px;
+ }
+
+ .content-has-risk {
+ background: rgba(250, 81, 81, 0.16);
+ }
+
+ .blink-shadow {
+ @keyframes shadow-blink {
+ 50% {
+ box-shadow: rgba(255, 156, 25, 1) 0 0 10px 0;
+ }
+ }
+
+ box-shadow: rgba(255, 156, 25, 0) 0 0 10px 0;
+ animation: shadow-blink 1s linear 3;
+ }
+
+ .blink-content {
+ @keyframes reference-blink {
+ 50% {
+ background-color: #ff9c19;
+ }
+ }
+
+ animation: reference-blink 1s linear 3;
+ }
+
+ .message-label {
+ align-self: flex-end;
+ font-family: PingFangSC-Regular;
+ font-size: 12px;
+ color: #b6b8ba;
+ word-break: keep-all;
+ flex: 0 0 auto;
+ margin: 0 8px;
+
+ &.fail {
+ width: 15px;
+ height: 15px;
+ border-radius: 15px;
+ background: red;
+ color: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ }
+
+ &.loading-circle {
+ opacity: 0;
+ animation: circle-loading 2s linear 1s infinite;
+ }
+
+ @keyframes circle-loading {
+ 0% {
+ transform: rotate(0);
+ opacity: 1;
+ }
+
+ 100% {
+ opacity: 1;
+ transform: rotate(360deg);
+ }
}
}
- animation: reference-blink 1s linear 3;
- }
-
- .message-label {
- align-self: flex-end;
- font-family: PingFangSC-Regular;
- font-size: 12px;
- color: #b6b8ba;
- word-break: keep-all;
- flex: 0 0 auto;
- margin: 0 8px;
-
- &.fail {
- width: 15px;
- height: 15px;
- border-radius: 15px;
- background: red;
- color: #fff;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- }
-
- &.loading-circle {
- opacity: 0;
- animation: circle-loading 2s linear 1s infinite;
- }
-
- @keyframes circle-loading {
- 0% {
- transform: rotate(0);
- opacity: 1;
- }
-
- 100% {
- opacity: 1;
- transform: rotate(360deg);
- }
- }
- }
-
- .align-self-bottom {
- align-self: flex-end;
+ .align-self-bottom {
+ align-self: flex-end;
}
}
}
diff --git a/TUIKit/components/TUIGroup/create-group/index.vue b/TUIKit/components/TUIGroup/create-group/index.vue
index 75777596..c5c7deaa 100644
--- a/TUIKit/components/TUIGroup/create-group/index.vue
+++ b/TUIKit/components/TUIGroup/create-group/index.vue
@@ -48,7 +48,7 @@
@@ -133,7 +133,7 @@ import TUIChatEngine, {
TUIStore,
StoreName,
} from '@tencentcloud/chat-uikit-engine';
-import { computed, reactive, watchEffect } from '../../../adapter-vue';
+import { computed, reactive, watchEffect ,ref} from '../../../adapter-vue';
import documentLink from '../../../utils/documentLink';
import { isPC } from '../../../utils/env';
import Icon from '../../common/Icon.vue';
@@ -149,7 +149,7 @@ import Server from '../server';
import { IUserProfile } from '../../../interface';
const TUIGroupServer = Server.getInstance();
const TUIConstants = TUIGroupServer.constants;
-
+const sta=ref(1)
const groupInfo = reactive({
profile: {
groupID: '',
@@ -212,8 +212,6 @@ const submitDisabledStatus = computed(() => {
const selected = (type: any) => {
if (groupInfo.profile.type !== type) {
- console.log(type,'====');
-
groupInfo.profile.type = type;
groupInfo.profile.avatar = findGroupIntroConfig(type).icon;
if (groupInfo.isEdit) {
@@ -260,18 +258,26 @@ const submit = () => {
} else {
createGroup(profile);
}
+ sta.value=1
emit('con',1)
};
const closeCreated = () => {
- emit('con',1)
- if (groupInfo.isEdit) {
+ if(sta.value===1){
+ emit('con',1)
+ }else{
+ sta.value=1
+ if (groupInfo.isEdit) {
return groupInfo.isEdit = !groupInfo.isEdit;
}
handleCompleteCreate(null);
+ }
+
+
};
const edit = (label: string) => {
+ sta.value=0
groupInfo.isEdit = !groupInfo.isEdit;
groupInfo.groupConfig.key = label;
groupInfo.groupConfig.value = (groupInfo.profile as any)[label];
diff --git a/pages.json b/pages.json
index cdfafdc4..9579945c 100644
--- a/pages.json
+++ b/pages.json
@@ -733,7 +733,7 @@
{
"path": "set/securityCenter/editPassword",
"style": {
- "navigationBarTitleText": "修改密码",
+ "navigationBarTitleText": "修改手机号",
"app-plus": {
}
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index f18e87c4..7eeed0c1 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -209,6 +209,7 @@ export default {
this.walletValue = res.data.result.walletValue;
this.autoCancel =
(res.data.result.autoCancel - new Date().getTime()) / 1000;
+ console.log(this.autoCancel,'倒计时分钟');
} else if (res.data.code == 32000) {
setTimeout(() => {
uni.redirectTo({
diff --git a/pages/mine/myCollect.vue b/pages/mine/myCollect.vue
index 18ee619e..aa3a9368 100644
--- a/pages/mine/myCollect.vue
+++ b/pages/mine/myCollect.vue
@@ -14,7 +14,7 @@
:options="LeftOptions" v-else v-for="(item, index) in goodList"
@click="clickGoodsSwiperAction(item, index)" :index="index" :key="index">
-
+
@@ -39,7 +39,7 @@
-
diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue
index 8322a33b..43ce55eb 100644
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -8,7 +8,7 @@
width="140"
height="140"
shape="circle"
- :src="userInfo.face || '/static/missing-face.png'"
+ :src="userInfo.face"
mode=""
>
@@ -229,6 +229,7 @@ export default {
},
onShow() {
this.userInfo = this.$options.filters.isLogin();
+ console.log(this.userInfo);
// #ifdef APP-PLUS
this.getCacheSize();
// #endif
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 0a6a7614..34965229 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -13,7 +13,7 @@
:style="{ display: 'flex', flexDirection: 'column' }"
v-if="orderDetail.ste == '1'"
>
-
+
快递编号:
{{ groupInfo.profile[item.key] }}