diff --git a/common/css/listUnit.css b/common/css/listUnit.css
index e8335ba..5524f5e 100644
--- a/common/css/listUnit.css
+++ b/common/css/listUnit.css
@@ -19,6 +19,7 @@
white-space: nowrap;
margin-left: 36rpx;
color: #333333;
+
}
.content-type-text {
@@ -26,7 +27,10 @@
padding-left: 38rpx;
font-size: 22rpx;
line-height: 1.6;
- max-width: 610rpx;
+ max-width: 306rpx;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
}
.content-index {
width: 42rpx;
diff --git a/common/utils.js b/common/utils.js
index d65655d..ad3b438 100644
--- a/common/utils.js
+++ b/common/utils.js
@@ -154,7 +154,7 @@ function addUserBehavior (obj) {
// 视频播放
const EZUIPlayer = require('./ezuikit.js');
function playVideo(opt) {
- debugger
+
return new EZUIPlayer(opt)
}
export default {
diff --git a/components/uni-popup.vue b/components/uni-popup.vue
index d7e93f8..3f07cbf 100644
--- a/components/uni-popup.vue
+++ b/components/uni-popup.vue
@@ -105,7 +105,7 @@
left: 0;
bottom: 0;
width: 100%;
- min-height: 200upx;
+ min-height: 400upx;
line-height: 100upx;
text-align: center;
}
diff --git a/pages/authorityApproval/components/businessUnit.vue b/pages/authorityApproval/components/businessUnit.vue
index be271a2..31c33bd 100644
--- a/pages/authorityApproval/components/businessUnit.vue
+++ b/pages/authorityApproval/components/businessUnit.vue
@@ -2,7 +2,7 @@
- {{item.name}}
+ {{item.serverpart}}
@@ -10,10 +10,10 @@
{{i+1}}
- {{item.serverpart}}
+ {{item.title}}
- {{item.title}}
+ {{item.name}}
diff --git a/pages/authorityApproval/components/merchartInfoView.vue b/pages/authorityApproval/components/merchartInfoView.vue
index 9c2f513..35871b9 100644
--- a/pages/authorityApproval/components/merchartInfoView.vue
+++ b/pages/authorityApproval/components/merchartInfoView.vue
@@ -275,7 +275,7 @@
},
savaShops() {
let _this = this
- debugger
+
if(!this.selectShopids.length){
uni.showToast({ title: '请选择需要授权的门店' ,icon:'none'})
return
diff --git a/pages/authorityApproval/index.vue b/pages/authorityApproval/index.vue
index 8683f2e..46b251e 100644
--- a/pages/authorityApproval/index.vue
+++ b/pages/authorityApproval/index.vue
@@ -24,7 +24,7 @@
{{!pageData.isEnd ? '正在加载,请稍后...':'——— 我是有底线的 ———'}}
-
+
{{item.SORTNUM==0 ? '待我处理': proStatus[item.HIGHWAYPROINST_NEXTID]}}
{{i+1}}
-
- {{item.SERVERPART_NAME}}
+
+ {{item.PROINST_NAME}}
- {{item.PROINST_NAME}}
+ {{item.PRODEF_NAME }}
diff --git a/pages/businessApproval/productDetail.vue b/pages/businessApproval/productDetail.vue
index 87e242a..9f2b3ac 100644
--- a/pages/businessApproval/productDetail.vue
+++ b/pages/businessApproval/productDetail.vue
@@ -414,6 +414,7 @@
box-shadow: 0 2upx 6upx rgba(0, 0, 0, 0.1);
margin-left: 24upx;
margin-right: 24upx;
+ margin-top: 2rpx;
}
.main-card+.main-card {
@@ -422,6 +423,7 @@
.uni-collapse-content .main-card:nth-last-child(1) {
margin-bottom: 40upx;
+
}
.card-title {
diff --git a/pages/everdayRenven/components/CarAnalysis.vue b/pages/everdayRenven/components/CarAnalysis.vue
index 63056df..6121342 100644
--- a/pages/everdayRenven/components/CarAnalysis.vue
+++ b/pages/everdayRenven/components/CarAnalysis.vue
@@ -36,7 +36,7 @@