From 7fb54bd61ee5f80d5ecaa7b0012453649ae47dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=87?= <hbycchenxiao@163.com>
Date: Mon, 17 Mar 2025 19:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=83=A8h5=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/help/success/index.wxml     |  2 +-
 pages/help/success/index.wxss     |  1 +
 pages/login/login.js              |  4 ++--
 pages/my/index/index.js           |  5 ++---
 pages/my/index/index.wxml         | 13 ++-----------
 pages/my/setting/index/index.js   |  9 +++++++--
 pages/my/setting/index/index.wxml |  4 ++++
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pages/help/success/index.wxml b/pages/help/success/index.wxml
index 6826d71..63c4ff3 100644
--- a/pages/help/success/index.wxml
+++ b/pages/help/success/index.wxml
@@ -4,7 +4,7 @@
       <image class="icon" src="/assets/icon/help/success@2x.png"/>
       <view class="title">恭喜下单成功</view>
       <view class="sub-title">
-        预计 <label class="red">{{successText}}</label> 送达，请注意查收！
+        预计<label class="red">{{successText}}</label>送达，请注意查收！
       </view>
       <button class="button" plain bind:tap="navToOrderDetail">查看订单</button>
     </view>
diff --git a/pages/help/success/index.wxss b/pages/help/success/index.wxss
index 3327dc1..d1cab5f 100644
--- a/pages/help/success/index.wxss
+++ b/pages/help/success/index.wxss
@@ -35,6 +35,7 @@ page{
 .sub-title .red{
   color:#ff0000;
   font-weight: 500;
+  margin:0 16rpx;
 }
 .button{
   border: 1.2rpx solid #999999!important;
diff --git a/pages/login/login.js b/pages/login/login.js
index ead4371..92e4957 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -72,12 +72,12 @@ Page({
   },
   navToPrivacy(){
     wx.navigateTo({
-      url: `/pages/browser/index?url=${this.data.appConfig.url_user_privacy}`,
+      url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_user_privacy)}`,
     })
   },
   navToAgreement(){
     wx.navigateTo({
-      url: `/pages/browser/index?url=${this.data.appConfig.url_user_agreement}`,
+      url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_user_agreement)}`,
     })
   },
   shake(){
diff --git a/pages/my/index/index.js b/pages/my/index/index.js
index 50d63e8..8c4a0ae 100644
--- a/pages/my/index/index.js
+++ b/pages/my/index/index.js
@@ -38,12 +38,11 @@ Page({
     // });
   },
   applyPartnert(event){
-    let type = event.currentTarget.dataset.type;
     let url = this.data.appConfig.url_partner_apply;
     if(url.indexOf('?')>-1){
-      url = `${url}&userid=${this.data.userInfo.userid}&type=${type}`
+      url = `${url}&userid=${this.data.userInfo.userid}`
     }else{
-      url = `${url}?userid=${this.data.userInfo.userid}&type=${type}`
+      url = `${url}?userid=${this.data.userInfo.userid}`
     }
     wx.navigateTo({
       url: `/pages/browser/index?url=${encodeURIComponent(url)}`,
diff --git a/pages/my/index/index.wxml b/pages/my/index/index.wxml
index 64e4fa8..74a8402 100644
--- a/pages/my/index/index.wxml
+++ b/pages/my/index/index.wxml
@@ -69,21 +69,12 @@
   </view>
 
   <view class="cells cells-access">
-    <view class="cell" bind:tap="applyPartnert" data-type="community">
+    <view class="cell" bind:tap="applyPartnert">
       <view class="cell-hd">
         <image class="icon" src="/assets/icon/my/partner-community.png"></image>
       </view>
       <view class="cell-bd">
-        <view>小区服务商</view>
-      </view>
-      <view class="cell-ft"></view>
-    </view>
-    <view class="cell" bind:tap="applyPartnert" data-type="city">
-      <view class="cell-hd">
-        <image class="icon" src="/assets/icon/my/partner-city.png"></image>
-      </view>
-      <view class="cell-bd">
-        <view>城市运营商</view>
+        <view>成为合伙人</view>
       </view>
       <view class="cell-ft"></view>
     </view>
diff --git a/pages/my/setting/index/index.js b/pages/my/setting/index/index.js
index 3240e8e..819541c 100644
--- a/pages/my/setting/index/index.js
+++ b/pages/my/setting/index/index.js
@@ -97,12 +97,17 @@ Page({
 
   navToPrivacy(){
     wx.navigateTo({
-      url: `/pages/browser/index?url=${this.data.appConfig.url_user_privacy}`,
+      url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_user_privacy)}`,
     })
   },
   navToAgreement(){
     wx.navigateTo({
-      url: `/pages/browser/index?url=${this.data.appConfig.url_user_agreement}`,
+      url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_user_agreement)}`,
+    })
+  },
+  navToDeliveryContract(){
+    wx.navigateTo({
+      url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_delivery_contract)}`,
     })
   },
   /**
diff --git a/pages/my/setting/index/index.wxml b/pages/my/setting/index/index.wxml
index fdfceee..94ddef7 100644
--- a/pages/my/setting/index/index.wxml
+++ b/pages/my/setting/index/index.wxml
@@ -23,6 +23,10 @@
     <view class="cell-bd">用户协议</view>
     <view class="cell-ft"></view>
   </view>
+  <view class="cell" bind:tap="navToDeliveryContract">
+    <view class="cell-bd">配送服务协议</view>
+    <view class="cell-ft"></view>
+  </view>
 </view>
 <button type="default" class="logout-btn" bind:tap="logout">退出登录</button>