-
+
@@ -143,6 +143,19 @@ export default {
this.bus.$emit('routesListChange');
});
},
+ formatTwoStageRoutes(arr) {
+ if (arr.length <= 0) return false;
+ const newArr = [];
+ const cacheList = [];
+ arr.forEach((v) => {
+ if (v && v.meta && v.meta.keepAlive) {
+ newArr.push({ ...v });
+ cacheList.push(v.name);
+ this.$store.dispatch('keepAliveNames/setCacheKeepAlive', cacheList);
+ }
+ });
+ return newArr;
+ },
},
};
diff --git a/template/admin/src/setting.js b/template/admin/src/setting.js
index 3b51eaa25..84a509ef8 100644
--- a/template/admin/src/setting.js
+++ b/template/admin/src/setting.js
@@ -1,5 +1,5 @@
// 请求接口地址 如果没有配置自动获取当前网址路径
-const VUE_APP_API_URL = `https://v5.wuht.net/adminapi`||process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
+const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
const Setting = {
// 路由前缀
diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue
index c3e89caa2..89173b6ee 100644
--- a/template/uni-app/App.vue
+++ b/template/uni-app/App.vue
@@ -163,7 +163,6 @@
getLangVersion().then(res => {
let version = res.data.version
if (version != uni.getStorageSync('LANG_VERSION')) {
- console.log('我变了')
getLangJson().then(res => {
let value = Object.keys(res.data)[0]
Cache.set('locale', Object.keys(res.data)[0])
diff --git a/template/uni-app/components/productConSwiper/index.vue b/template/uni-app/components/productConSwiper/index.vue
index 6f408941c..aba0879b6 100644
--- a/template/uni-app/components/productConSwiper/index.vue
+++ b/template/uni-app/components/productConSwiper/index.vue
@@ -6,14 +6,14 @@
-
-
+
@@ -33,7 +33,7 @@
-
+
@@ -95,8 +95,8 @@
},
bindPause: function() {
// #ifndef APP-PLUS
- this.videoContext.play();
this.$set(this, 'controls', false)
+ this.videoContext.play();
this.autoplay = false
// #endif
// #ifdef APP-PLUS
diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue
index e2552b5df..e2dac913e 100644
--- a/template/uni-app/pages/extension/customer_list/chat.vue
+++ b/template/uni-app/pages/extension/customer_list/chat.vue
@@ -80,8 +80,7 @@
-
+
{{$t(`订单号`)}}: {{ item.orderInfo.order_id }}
@@ -639,18 +638,19 @@
.footer-box {
display: flex;
align-items: center;
- padding: 0 30rpx;
color: rgba(0, 0, 0, 0.8);
background: #f7f7f7;
/* #ifdef APP-PLUS */
+ padding: 0 30rpx;
height: 70rpx;
height: (70rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(70rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
- /* #endif */
- /* #ifndef APP-PLUS */
- height: 100rpx;
- height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
- height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+ /* #endif */
+
+ /* #ifndef APP-PLUS */
+ padding: 0 30rpx 15rpx 30rpx;
+ height: 115rpx;
+
/* #endif */
.words .icon-tupian {
font-size: 50rpx;
diff --git a/template/uni-app/pages/index/visualization/index.vue b/template/uni-app/pages/index/visualization/index.vue
index 96bf02933..b9d96666f 100644
--- a/template/uni-app/pages/index/visualization/index.vue
+++ b/template/uni-app/pages/index/visualization/index.vue
@@ -89,7 +89,8 @@
- {{site_config}}
+ {{site_config.record_No}}
+ {{site_config.network_security}}
{
- this.site_config = res.data.record_No;
+ this.site_config = res.data;
})
.catch((err) => {
return this.$util.Tips({
@@ -486,13 +487,23 @@
// #endif
goICP() {
// #ifdef H5
- window.open("http://beian.miit.gov.cn/");
+ window.open(this.site_config.icp_url);
// #endif
// #ifdef MP
uni.navigateTo({
- url: `/pages/annex/web_view/index?url=https://beian.miit.gov.cn/`,
+ url: `/pages/annex/web_view/index?url=` + this.site_config.icp_url,
});
// #endif
+ },
+ goNetwork() {
+ // #ifdef H5
+ window.open(this.site_config.network_security_url);
+ // #endif
+ // #ifdef MP
+ uni.navigateTo({
+ url: `/pages/annex/web_view/index?url=` + this.site_config.network_security_url,
+ });
+ // #endif
},
onLoadFun() {},
reconnect() {
diff --git a/template/uni-app/pages/points_mall/logistics_details.vue b/template/uni-app/pages/points_mall/logistics_details.vue
index 3c5a792c0..6a7964c35 100644
--- a/template/uni-app/pages/points_mall/logistics_details.vue
+++ b/template/uni-app/pages/points_mall/logistics_details.vue
@@ -10,7 +10,8 @@
{{orderInfo.total_price}}{{$t(`积分`)}}
x{{orderInfo.total_num}}
-
+
+ {{orderInfo.suk}}
@@ -295,5 +296,10 @@
.logistics .logisticsCon .item .text .data .time {
margin-left: 15rpx;
+ }
+ .gray-sty {
+ width: 100%;
+ font-size: 24rpx;
+ color: #999999;
}