Commit aa5ad5cd authored by 罗超's avatar 罗超

修改样式与文字识别

parent befbd26e
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<view class="Alipay-text3">发送“支付”获取支付宝付款链接</view> <view class="Alipay-text3">发送“支付”获取支付宝付款链接</view>
</view> </view>
<view class="Alipay-box33"> <view class="Alipay-box33">
<image class="Alipay-image" src="../../static/images/zhifu.png"></image> <!-- <image class="Alipay-image" src="../../static/images/zhifu.png"></image> -->
</view> </view>
<view class="Alipay-text4" @click="send()" style="margin-bottom: 86rpx;"> <view class="Alipay-text4" @click="send()" style="margin-bottom: 86rpx;">
去发送 去发送
......
<template> <template>
<view <view
class="ad-box" class="ad-box"
:class="{'ad-full-height':ad.list[0].link[0].PageName == 'full'}" :class="{'ad-box-full':ad.list[0].link[0].PageName == 'full'}"
:style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }" :style="{ height: ad.height == 'auto' ? 'auto' : ad.height + 'rpx',padding:marginStyle,backgroundColor:ad.background }"
> >
<view <view
...@@ -112,7 +112,14 @@ export default { ...@@ -112,7 +112,14 @@ export default {
opacity: 0; opacity: 0;
z-index: 2; z-index: 2;
} }
.ad-full-height{ .ad-box-full{
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
.ad-full-height,.ad-full-height image{
height: 100% !important; height: 100% !important;
} }
</style> </style>
{ {
"name" : "mallapp", "name" : "mallapp",
"appid" : "", "appid" : "__UNI__EE0B83C",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
......
...@@ -1568,5 +1568,6 @@ ...@@ -1568,5 +1568,6 @@
.content .flex-column .full-col{ .content .flex-column .full-col{
flex: 1; flex: 1;
height: 1px; height: 1px;
position: relative;
} }
</style> </style>
...@@ -638,13 +638,13 @@ ...@@ -638,13 +638,13 @@
getAccess_token() { getAccess_token() {
let that = this; let that = this;
uni.request({ uni.request({
url: "https://aip.baidubce.com/oauth/2.0/token", // 百度获取token接口地址 url: "https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id=uHc6N5qsYBfZs3jrM0DOLXCc&client_secret=8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J", // 百度获取token接口地址
data: { data: {
grant_type: "client_credentials", // 固定写死 grant_type: "client_credentials", // 固定写死
client_id: "wWtW3xQju14uH0ToPpxlk4aq", client_id: "uHc6N5qsYBfZs3jrM0DOLXCc",
client_secret: "lEYPHN0CgFbX5e849ViK9Q7WdnUhkwEx", client_secret: "8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J",
}, },
method: "GET", method: "POST",
success(res) { success(res) {
that.access_token = res.data.access_token; that.access_token = res.data.access_token;
}, },
......
...@@ -511,13 +511,13 @@ export default { ...@@ -511,13 +511,13 @@ export default {
getAccess_token() { getAccess_token() {
let that = this; let that = this;
uni.request({ uni.request({
url: "https://aip.baidubce.com/oauth/2.0/token", // 百度获取token接口地址 url: "https://aip.baidubce.com/oauth/2.0/token?grant_type=client_credentials&client_id=uHc6N5qsYBfZs3jrM0DOLXCc&client_secret=8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J", // 百度获取token接口地址
data: { data: {
grant_type: "client_credentials", // 固定写死 grant_type: "client_credentials", // 固定写死
client_id: "wWtW3xQju14uH0ToPpxlk4aq", client_id: "uHc6N5qsYBfZs3jrM0DOLXCc",
client_secret: "lEYPHN0CgFbX5e849ViK9Q7WdnUhkwEx", client_secret: "8LrTrMzUmBQGPTEu1Nm0UxaVGucXdg6J",
}, },
method: "GET", method: "POST",
success(res) { success(res) {
that.access_token = res.data.access_token; that.access_token = res.data.access_token;
}, },
......
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
margin-bottom: 30rpx; margin-bottom: 30rpx;
padding: 0px 15px; padding: 0px 15px;
" "
v-if="tenantId==18"
> >
<image <image
@click="goNewFirstShop" @click="goNewFirstShop"
...@@ -110,6 +111,7 @@ ...@@ -110,6 +111,7 @@
style="height: calc(100vh - 189px)" style="height: calc(100vh - 189px)"
> >
<view <view
v-if="tenantId==18"
style="font-size: 30rpx; font-weight: 700; color: #111; padding: 0 15px" style="font-size: 30rpx; font-weight: 700; color: #111; padding: 0 15px"
>资讯信息</view >资讯信息</view
> >
...@@ -146,7 +148,7 @@ ...@@ -146,7 +148,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="height: 30px;"></view>
<u-loadmore <u-loadmore
:status="status" :status="status"
:load-text="loadText" :load-text="loadText"
...@@ -191,6 +193,7 @@ export default { ...@@ -191,6 +193,7 @@ export default {
status: "", status: "",
CommpanyStatus: 0, //公司认证状态 CommpanyStatus: 0, //公司认证状态
FirstShopType: 0, //1:品牌,2:载体 FirstShopType: 0, //1:品牌,2:载体
tenantId:0
}; };
}, },
onShareTimeline() { onShareTimeline() {
...@@ -252,9 +255,6 @@ export default { ...@@ -252,9 +255,6 @@ export default {
}; };
}, },
mounted() { mounted() {
uni.setNavigationBarTitle({
title: this.pageTitle,
});
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -263,11 +263,15 @@ export default { ...@@ -263,11 +263,15 @@ export default {
}; };
this.showAuth = true; this.showAuth = true;
} else { } else {
this.tenantId = this.u.TenantId
this.getList(1); this.getList(1);
this.getCommpanyStatus(); this.getCommpanyStatus();
this.isauth = true this.isauth = true
this.pageTitle = this.tenantId==18?this.pageTitle:'商业资讯'
} }
uni.setNavigationBarTitle({
title: this.pageTitle,
});
}, },
methods: { methods: {
reloadUserinfo() { reloadUserinfo() {
......
...@@ -2,8 +2,8 @@ export default { ...@@ -2,8 +2,8 @@ export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
//Vue.prototype.host2 = "https://mallApi.oytour.com" //电商接口 Vue.prototype.host2 = "https://mallApi.oytour.com" //电商接口
Vue.prototype.host2 = "http://192.168.5.46:8200" //Vue.prototype.host2 = "http://192.168.5.46:8200"
Vue.prototype.host3 = "https://jjeduapi.oytour.com" //进阶小课堂以前接口 Vue.prototype.host3 = "https://jjeduapi.oytour.com" //进阶小课堂以前接口
Vue.prototype.UploadConfig = function() { //本地上传配置 Vue.prototype.UploadConfig = function() { //本地上传配置
......
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