From 9fe091e4ee0eb4428c3ed8ea99fe59e3c23c1d21 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 09 八月 2024 18:16:38 +0800
Subject: [PATCH] lll
---
wechat_staff/pages/sets/protocol.wxss | 8 +++++++-
wechat_staff/utils/config.js | 8 +++-----
wechat_jiaxuan/pages/auth/auth.wxml | 4 ++--
wechat_staff/pages/sets/protocol.wxml | 6 +++---
wechat_staff/pages/login/index.wxml | 4 ++--
wechat_staff/pages/store/staff.wxml | 2 +-
wechat_jiaxuan/pages/sets/protocol.wxml | 6 +++---
wechat_jiaxuan/utils/config.js | 3 +++
8 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/wechat_jiaxuan/pages/auth/auth.wxml b/wechat_jiaxuan/pages/auth/auth.wxml
index e1b98e0..feed215 100644
--- a/wechat_jiaxuan/pages/auth/auth.wxml
+++ b/wechat_jiaxuan/pages/auth/auth.wxml
@@ -23,8 +23,8 @@
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
<view class="content">
- <!-- <mp-html content="{{activeHtml}}"></mp-html> -->
- <rich-text nodes="{{activeHtml}}"></rich-text>
+ <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
</view>
<view style="bottom: {{ bottomLift }}px" class="btns">
<view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
diff --git a/wechat_jiaxuan/pages/sets/protocol.wxml b/wechat_jiaxuan/pages/sets/protocol.wxml
index 39e322d..92e148e 100644
--- a/wechat_jiaxuan/pages/sets/protocol.wxml
+++ b/wechat_jiaxuan/pages/sets/protocol.wxml
@@ -1,4 +1,4 @@
-<view style="width: 100%;height: auto;padding: 0px 40rpx;">
-<!-- <mp-html content="{{activeHtml}}"> </mp-html> -->
-<rich-text nodes="{{activeHtml}}"></rich-text>
+<view style="height: auto;padding: 0px 40rpx;">
+<mp-html content="{{activeHtml}}"> </mp-html>
+<!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/utils/config.js b/wechat_jiaxuan/utils/config.js
index ef1c60f..5d41d92 100644
--- a/wechat_jiaxuan/utils/config.js
+++ b/wechat_jiaxuan/utils/config.js
@@ -4,7 +4,10 @@
// export const baseUrl = 'http://192.168.0.135:10027' // 鏈湴
// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' //娴嬭瘯鏈嶅姟鍣�
+// 娴嬭瘯鏈嶅姟鍣�
export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
+// 鐢熶骇鏈嶅姟鍣�
+// export const baseUrl = 'https://zbyj.zbom.com/web_interface'
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
diff --git a/wechat_staff/pages/login/index.wxml b/wechat_staff/pages/login/index.wxml
index 70c204b..78c244f 100644
--- a/wechat_staff/pages/login/index.wxml
+++ b/wechat_staff/pages/login/index.wxml
@@ -36,8 +36,8 @@
<van-popup position="bottom" show="{{ showModal }}" round bind:close="onClose">
<view class="modal">
<view class="content">
- <!-- <mp-html content="{{activeHtml}}"></mp-html> -->
- <rich-text nodes="{{activeHtml}}"></rich-text>
+ <mp-html content="{{activeHtml}}"></mp-html>
+ <!-- <rich-text nodes="{{activeHtml}}"></rich-text> -->
</view>
<view style="bottom: {{ bottomLift }}px" class="btns">
<view data-flag="{{true}}" bindtap="handleJudge" class="agree">鍚屾剰</view>
diff --git a/wechat_staff/pages/sets/protocol.wxml b/wechat_staff/pages/sets/protocol.wxml
index 5c1edf4..b3d6d71 100644
--- a/wechat_staff/pages/sets/protocol.wxml
+++ b/wechat_staff/pages/sets/protocol.wxml
@@ -1,5 +1,5 @@
<!--pages/sets/protocol.wxml-->
-<view style="width: 100%;height: auto;padding: 0px 40rpx;">
-<!-- <mp-html content="{{content}}"> </mp-html> -->
-<rich-text nodes="{{content}}"></rich-text>
+<view class="content">
+ <!-- <rich-text nodes="{{content}}"></rich-text> -->
+ <mp-html content="{{content}}"></mp-html>
</view>
diff --git a/wechat_staff/pages/sets/protocol.wxss b/wechat_staff/pages/sets/protocol.wxss
index 30e4241..c0c8100 100644
--- a/wechat_staff/pages/sets/protocol.wxss
+++ b/wechat_staff/pages/sets/protocol.wxss
@@ -1 +1,7 @@
-/* pages/sets/protocol.wxss */
\ No newline at end of file
+.content{
+ width: 750rpx;
+ box-sizing: border-box;
+ padding: 12rpx 40rpx;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/wechat_staff/pages/store/staff.wxml b/wechat_staff/pages/store/staff.wxml
index 59d9532..8f9344a 100644
--- a/wechat_staff/pages/store/staff.wxml
+++ b/wechat_staff/pages/store/staff.wxml
@@ -3,7 +3,7 @@
<view class="bg_wrap">
<image src="../../static/images/design_banner@2x.png" mode="widthFix" ></image>
</view>
- <view bindtap="jumpUser" class="editBtn">缂栬緫璧勬枡</view>
+ <view wx:if="{{ !isShow }}" bindtap="jumpUser" class="editBtn">缂栬緫璧勬枡</view>
<view class="container">
<image class="avatar" src="{{userInfo.imgurlFull ? userInfo.imgurlFull : '../../static/images/default_avatar.png'}}"></image>
<view class="name_wrap">
diff --git a/wechat_staff/utils/config.js b/wechat_staff/utils/config.js
index b0dea33..81b3727 100644
--- a/wechat_staff/utils/config.js
+++ b/wechat_staff/utils/config.js
@@ -1,10 +1,8 @@
// export const baseUrl = 'http://192.168.0.135:10027'
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface' // 鏈湴
+// 娴嬭瘯鏈嶅姟鍣�
export const baseUrl = 'https://dmdev.zhibang.com:8443/web_interface'
-
-// export const imageUrl = 'https://osswebcdn.zbom.com/jiaxuan/images/'
-
-// export const baseUrl = 'https://dmtest.ahapp.net/web_interface/' // 娴嬭瘯鏈�
+// 鐢熶骇鏈嶅姟鍣�
+// export const baseUrl = 'https://zbyj.zbom.com/web_interface'
// 鑵捐鍦板浘寮�鍙戣�� key
export const qqMapKey = 'HIDBZ-2QXL4-TAWUD-XET6Q-EKTJE-CCBSQ'
--
Gitblit v1.9.3