Commit 46398b80 authored by 罗超's avatar 罗超

修改样式

parent 9a4179f5
...@@ -111,6 +111,11 @@ export default { ...@@ -111,6 +111,11 @@ export default {
url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/uBscuKyX34mb.woff") format("woff"); url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/uBscuKyX34mb.woff") format("woff");
font-display: swap; font-display: swap;
} }
@font-face {
font-family: "logo-font";src: url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/kznKMVuxE1tP.woff2") format("woff2"),
url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/ViySHjFRkPg9.woff") format("woff");
font-display: swap;
}
// @font-face { // @font-face {
// font-family: "oswald"; // font-family: "oswald";
// src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf"); // src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");
......
...@@ -697,6 +697,7 @@ export default { ...@@ -697,6 +697,7 @@ export default {
}, },
//去支付 //去支付
goPay() { goPay() {
let b2b_user_info = uni.getStorageSync("b2b_user")
for (var i = 0; i < this.GuestList.length; i++) { for (var i = 0; i < this.GuestList.length; i++) {
if (this.GuestList[i].SurName == "") { if (this.GuestList[i].SurName == "") {
uni.showToast({ uni.showToast({
...@@ -723,7 +724,7 @@ export default { ...@@ -723,7 +724,7 @@ export default {
this.submit = true; this.submit = true;
this.userInfo = uni.getStorageSync("mall_UserInfo"); this.userInfo = uni.getStorageSync("mall_UserInfo");
this.basedataObj = uni.getStorageSync("basedata").mall; this.basedataObj = uni.getStorageSync("basedata").mall;
var CustomerId = this.basedataObj.virtualB2BCustomerId; var CustomerId = b2b_user_info.customerId //this.basedataObj.virtualB2BCustomerId;
let newobj = JSON.parse(JSON.stringify(this.GuestList)); let newobj = JSON.parse(JSON.stringify(this.GuestList));
newobj.forEach((x) => { newobj.forEach((x) => {
if (x.IsHightSchool) { if (x.IsHightSchool) {
...@@ -732,9 +733,9 @@ export default { ...@@ -732,9 +733,9 @@ export default {
x.IsHightSchool = 2; x.IsHightSchool = 2;
} }
}); });
var ContactName = this.contactName; var ContactName = b2b_user_info.name //this.contactName;
var ContactMobile = this.contactMobile; var ContactMobile = b2b_user_info.contactNumber //this.contactMobile;
var CustomerType = 4; var CustomerType = b2b_user_info.isMember//4;
var price = this.currentPriceInfo.b2CPrice; var price = this.currentPriceInfo.b2CPrice;
let msg = { let msg = {
OrderId: 0, OrderId: 0,
...@@ -792,7 +793,7 @@ export default { ...@@ -792,7 +793,7 @@ export default {
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
OrderSource: 6, OrderSource: 6,
// #endif // #endif
MiniAppUserId: this.userInfo.UserId, //MiniAppUserId: this.userInfo.UserId,
Remarks: this.Remarks, //备注 Remarks: this.Remarks, //备注
GuestList: newobj, GuestList: newobj,
}; };
......
...@@ -161,11 +161,7 @@ ...@@ -161,11 +161,7 @@
<style> <style>
/* 在线链接服务仅供平台体验和调试使用,平台不承诺服务的稳定性,企业客户需下载字体包自行发布使用并做好备份。 */ /* 在线链接服务仅供平台体验和调试使用,平台不承诺服务的稳定性,企业客户需下载字体包自行发布使用并做好备份。 */
@font-face {
font-family: "logo-font";src: url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/nFCWoGSkRkLY.woff2") format("woff2"),
url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/3uO28oanLQDx.woff") format("woff");
font-display: swap;
}
.login-page{ .login-page{
padding:20px; padding:20px;
} }
......
...@@ -91,6 +91,9 @@ ...@@ -91,6 +91,9 @@
customer_info ? customer_info.customerName : "立即登录" customer_info ? customer_info.customerName : "立即登录"
}}</Text }}</Text
> >
<view style="font-size:12px; margin-top:5px;">
{{b2b_user_info ? b2b_user_info.name : ""}}
</view>
<!-- 判断是甲鹤小程序 --> <!-- 判断是甲鹤小程序 -->
<view v-if="AppletID == 5 && isAttestationEdu == 1"> <view v-if="AppletID == 5 && isAttestationEdu == 1">
<u-tag <u-tag
...@@ -567,6 +570,7 @@ ...@@ -567,6 +570,7 @@
</view> </view>
</view> </view>
</template> </template>
<view class="login-btn" style="margin:30px 0">退出登录</view>
</view> </view>
<auth <auth
v-if="showAuth" v-if="showAuth"
...@@ -599,6 +603,7 @@ ...@@ -599,6 +603,7 @@
></auth> ></auth>
<tabbars></tabbars> <tabbars></tabbars>
</view> </view>
</scroll-view> </scroll-view>
</template> </template>
...@@ -1325,4 +1330,19 @@ export default { ...@@ -1325,4 +1330,19 @@ export default {
color: #888888; color: #888888;
/* background-color: #F6F6F6FF */ /* background-color: #F6F6F6FF */
} }
.userBox .login-btn {
height: 80rpx;
background-color: #111111;
text-align: center;
line-height: 80rpx;
color: #fff;
/* font-weight: 600; */
font-size: 28rpx;
border-radius: 16rpx;
font-family: logo-font;
font-size: 16px;
width: calc(100vw - 40px);
margin: 30px 0;
box-sizing: border-box;
}
</style> </style>
\ No newline at end of file
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 to comment