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 @@
恭喜下单成功
- 预计 送达,请注意查收!
+ 预计送达,请注意查收!
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 @@
-
+
- 小区服务商
-
-
-
-
-
-
-
-
- 城市运营商
+ 成为合伙人
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 @@
用户协议
+
+ 配送服务协议
+
+