diff --git a/common/env.js b/common/env.js
index 05e93ea..67ac71e 100644
--- a/common/env.js
+++ b/common/env.js
@@ -44,7 +44,7 @@ if (process.env.NODE_ENV === 'production') {
// #endif
// #ifdef MP-WEIXIN
-currentEnv = production; // 小程序默认使用生产环境配置
+currentEnv =testing;// production; // 小程序默认使用生产环境配置
// #endif
// 衍生配置
diff --git a/components/detail-toolbar/detail-toolbar.vue b/components/detail-toolbar/detail-toolbar.vue
index c081774..764908c 100644
--- a/components/detail-toolbar/detail-toolbar.vue
+++ b/components/detail-toolbar/detail-toolbar.vue
@@ -1,10 +1,9 @@
-
+
+ :src="$img1('common/gzsm.png')">
@@ -19,7 +18,7 @@
-
+
@@ -40,6 +39,10 @@ export default {
customStyle: {
type: String,
default: ''
+ },
+ isWuxian: {
+ type: Boolean,
+ default: false
}
},
computed: {
@@ -66,24 +69,28 @@ export default {
}
-
\ No newline at end of file
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 98bc21d..cc183a3 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -60,6 +60,7 @@
+
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index 90ac42d..8abd20f 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -47,48 +47,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ bossCardData.king_user.nickname }}
-
- 第
- {{ bossCardData.king_user.count }}
- 发晋升领主
- 已占领
- {{ bossCardData.king_user.z_nums }}
- 发
-
-
-
- 查看更多 >
-
-
-
+
+
+
@@ -104,10 +66,8 @@
-
-
-
+
@@ -192,10 +152,9 @@
-
+
-
@@ -382,7 +341,7 @@
-
+
image:nth-child(1) {
- width: 75rpx;
- height: 76rpx;
- position: absolute;
- bottom: 4rpx;
- left: 50%;
- transform: translateX(-50%);
- z-index: 1;
- border-radius: 50rpx;
- }
-
- >image:nth-child(2) {
- width: 122rpx;
- height: 120rpx;
- position: absolute;
- top: 5rpx;
- left: 0;
- z-index: 3;
- }
- }
-
- &-content {
- >view:nth-child(1) {
- font-weight: normal;
- font-size: 28rpx;
- color: #333333;
- }
-
- >view:nth-child(2) {
- margin-top: 6rpx;
- font-weight: normal;
- font-size: 24rpx;
- color: #999999;
-
- >text {
- color: #333333;
- }
- }
- }
-
- &-lingzhu {
- height: 46rpx;
- }
-}
+
.content {
padding: 0 0 0rpx;