@@ -447,6 +447,9 @@ export default {
background-color: #fff;
padding-bottom: 50px;
}
+.no-warp{
+ flex-wrap: nowrap !important;
+}
::v-deep .el-card__body{
padding: 40px;
}
@@ -456,6 +459,7 @@ export default {
.iframe-col {
width: 375px;
+ min-width: 375px;
height: 650px;
margin-right: 30px;
position: relative;
diff --git a/template/admin/src/pages/system/codeGeneration/list.vue b/template/admin/src/pages/system/codeGeneration/list.vue
index 66892b4d1..5126fd740 100644
--- a/template/admin/src/pages/system/codeGeneration/list.vue
+++ b/template/admin/src/pages/system/codeGeneration/list.vue
@@ -618,7 +618,7 @@ export default {
.save {
position: absolute;
left: 50%;
- bottom: -30px;
+ bottom: -10px;
z-index: 99;
}
}
diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue
index 5b4f6b55e..7e998b404 100644
--- a/template/uni-app/App.vue
+++ b/template/uni-app/App.vue
@@ -258,18 +258,18 @@ export default {
uni.setStorageSync('copyRight', res.data);
});
// #ifdef MP
- getSystemVersion().then((res) => {
- if (res.data.version_code != SYSTEM_VERSION) {
- uni.showModal({
- title: '警告',
- content: '前后端版本不一致！',
- success: function (res) {
- if (res.confirm) {
- }
- }
- });
- }
- });
+ // getSystemVersion().then((res) => {
+ // if (res.data.version_code != SYSTEM_VERSION) {
+ // uni.showModal({
+ // title: '警告',
+ // content: '前后端版本不一致！',
+ // success: function (res) {
+ // if (res.confirm) {
+ // }
+ // }
+ // });
+ // }
+ // });
// #endif
},
// #ifdef H5
diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index 28c367fef..8b3e5db5d 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -2,8 +2,8 @@
"name" : "CRMEB标准版",
"appid" : "__UNI__A3F1ED4",
"description" : "CRMEB标准版",
- "versionName" : "5.3.0",
- "versionCode" : 530,
+ "versionName" : "5.4.0",
+ "versionCode" : 540,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/template/uni-app/pages/activity/goods_combination_details/index.vue b/template/uni-app/pages/activity/goods_combination_details/index.vue
index bad49d3b2..8d237bd64 100644
--- a/template/uni-app/pages/activity/goods_combination_details/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_details/index.vue
@@ -484,7 +484,6 @@
// #endif
if (options.hasOwnProperty('id')) {
this.id = options.id
- // app.globalData.openPages = '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' + this.userInfo.uid;
if (this.isLogin) {
this.combinationDetail();
} else {
@@ -858,9 +857,6 @@
// 授权后回调
onLoadFun: function(e) {
this.userInfo = e
- app.globalData.openPages = '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' +
- e.uid;
- // this.downloadFilePromotionCode();
this.combinationDetail();
},
selecAttr: function() {
@@ -1261,7 +1257,7 @@
onShareAppMessage() {
return {
title: this.storeInfo.title,
- path: app.globalData.openPages,
+ path: '/pages/activity/goods_combination_details/index?id=' + this.id + '&spid=' + this.$store.state.app.uid,
imageUrl: this.storeInfo.image
};
}
diff --git a/template/uni-app/pages/activity/goods_combination_status/index.vue b/template/uni-app/pages/activity/goods_combination_status/index.vue
index 929a45336..2526ca390 100644
--- a/template/uni-app/pages/activity/goods_combination_status/index.vue
+++ b/template/uni-app/pages/activity/goods_combination_status/index.vue
@@ -235,7 +235,6 @@
handler: function(newV, oldV) {
if (newV) {
this.userInfo = newV;
- app.globalData.openPages = '/pages/activity/goods_combination_status/index?id=' + this.pinkId;
}
},
deep: true
@@ -269,7 +268,7 @@
let that = this;
return {
title: that.$t(`您的好友`) + that.userInfo.nickname + this.$t(`邀请您参团`) + that.storeCombination.title,
- path: app.globalData.openPages,
+ path: '/pages/activity/goods_combination_status/index?id=' + that.pinkId,
imageUrl: that.storeCombination.image
};
},
@@ -319,7 +318,6 @@
// 授权后回调
onLoadFun: function(e) {
this.userInfo = e;
- app.globalData.openPages = '/pages/activity/goods_combination_status/index?id=' + this.pinkId;
this.getCombinationPink();
},
/**
diff --git a/template/uni-app/pages/activity/goods_seckill_details/index.vue b/template/uni-app/pages/activity/goods_seckill_details/index.vue
index 993a3c091..5d01ef544 100644
--- a/template/uni-app/pages/activity/goods_seckill_details/index.vue
+++ b/template/uni-app/pages/activity/goods_seckill_details/index.vue
@@ -605,11 +605,6 @@
setTimeout(() => {
that.infoScroll();
}, 500);
-
- app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
- '&spid=' + that.storeInfo.uid;
- // wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
- // wxh.time(that.data.time, that);
}).catch(err => {
that.$util.Tips({
title: err
@@ -1141,7 +1136,7 @@
onShareAppMessage() {
return {
title: this.storeInfo.title,
- path: app.globalData.openPages,
+ path: '/pages/activity/goods_seckill_details/index?id=' + this.id + '&spid=' + this.$store.state.app.uid,
imageUrl: this.storeInfo.image
};
}
diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue
index 8336e05ae..42a238454 100644
--- a/template/uni-app/pages/annex/vip_paid/index.vue
+++ b/template/uni-app/pages/annex/vip_paid/index.vue
@@ -178,7 +178,6 @@
title: this.$t(`微信支付`),
payStatus: true
},
- // #ifdef H5 ||APP-PLUS
{
name: this.$t(`支付宝支付`),
icon: 'icon-zhifubao',
@@ -186,7 +185,6 @@
title: this.$t(`支付宝支付`),
payStatus: true
},
- // #endif
{
name: this.$t(`余额支付`),
icon: 'icon-qiandai',
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index 7351c8868..ddfd2239f 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -1136,7 +1136,7 @@ export default {
confirmOrder(orderId) {
let that = this;
// #ifdef MP
- if (wx.openBusinessView && this.orderInfo.order_shipping_open && this.orderInfo.trade_no) {
+ if (wx.openBusinessView && this.orderInfo.order_shipping_open && this.orderInfo.trade_no && this.orderInfo.uid == this.orderInfo.pay_uid) {
uni.showLoading({
title: this.$t(`加载中`)
});
diff --git a/template/uni-app/pages/index/diy/components/menus.vue b/template/uni-app/pages/index/diy/components/menus.vue
index 8b69b2bf3..52d61b4e5 100644
--- a/template/uni-app/pages/index/diy/components/menus.vue
+++ b/template/uni-app/pages/index/diy/components/menus.vue
@@ -1,241 +1,250 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/template/uni-app/pages/points_mall/integral_goods_details.vue b/template/uni-app/pages/points_mall/integral_goods_details.vue
index caec7bf84..664ccb7a6 100644
--- a/template/uni-app/pages/points_mall/integral_goods_details.vue
+++ b/template/uni-app/pages/points_mall/integral_goods_details.vue
@@ -417,11 +417,6 @@
that.storeImage = that.storeInfo.image
// #endif
that.DefaultSelect();
- app.globalData.openPages = '/pages/activity/goods_seckill_details/index?id=' + that.id +
- '&time=' + that.time +
- '&status=' + that.status + '&scene=' + that.storeInfo.uid;
- // wxParse.wxParse('description', 'html', that.data.storeInfo.description || '', that, 0);
- // wxh.time(that.data.time, that);
}).catch(err => {
that.$util.Tips({
title: err
diff --git a/template/uni-app/pages/users/user_invoice_form/index.vue b/template/uni-app/pages/users/user_invoice_form/index.vue
index 987ea95a6..39efb504d 100644
--- a/template/uni-app/pages/users/user_invoice_form/index.vue
+++ b/template/uni-app/pages/users/user_invoice_form/index.vue
@@ -1,657 +1,664 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file