diff --git a/components/BottomBar/BottomBar.vue b/components/BottomBar/BottomBar.vue
index 474cf4df7d418ae7eed50497ce68a9f3660d276f..d6f34242e14a6fe0750d6cc4f1e1872a84e204a9 100755
--- a/components/BottomBar/BottomBar.vue
+++ b/components/BottomBar/BottomBar.vue
@@ -51,6 +51,7 @@
background: #fff;
z-index: 100;
height: 88rpx;
+ padding-bottom: env(safe-area-inset-bottom);
view {
width: 25%;
text-align: center;
@@ -64,19 +65,19 @@
top: 16rpx;
}
.home_icon {
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAABSlBMVEUAAAAlFhQUDgkTDwpfX18SDQoSDQcwMDAWDwkZFQ0cEBAIAQQIAgMTDgkUDgoVDQ0TDwkIAQQhGQskGwsnHQuuhCESEQwTDggIAQMUDwjjryjhrCiqgiATDgr//5UTDgingR8TDwgIAQQIAQQJAQT6wC0TDwgJAgP7wSz6wC3+wjAZFQv/1Uf6wCwTDwn5wCwJAQMaEgkUDgj5wCyYdR0TDglKORAUDgkTDgkOCQf5wS0IAgQJAwT7wC77wi0QDggYEAwgICD1uyvpsisJAQP6wCz6wC0TDwnXpSf5wC0IAQTAkyOfeR4TDwkUDwkJAQS1iyGxiSH6vy0wJA07LBB0WRgIAQTfrChhSRT5vy35wC0JAgP6vy0UDgkUDwn5wC35wS0UEAn6wCwUDgnHmCP8wCz7wjAUDwpANQv/yDf/0S4TDgj6vywIAQO/pr9xAAAAa3RSTlMADGNyAnQ5BR0TEL6dyUIg7djS0M7NJvz59unnzGoB+Mu7uLSsnpWRdGYsFwb07+bl3tjVx8fBpZ+Eg31URT4tHwj57+7r6uPe3dnU0tLR0dDPzMjEwMC/v7SrpZSNiomHcG1YV1E7MxgOC7YxrVcAAAHjSURBVDjL1dRXc5tAEMDxBSMksMDESdQSSbEk1yiOa2zHLU7vvTf3uvD9X73HMVoQZ439Zv+fgPvNaWc4AVe7rKZqw1BQ10F1xYVCt60W8cwmzaQ1sVeelcBihqWcptmURR3t/ahUKreoN19oaSS5cfSAq435sseDiGUbuEXEugVd7Uf6IyJW+bFdRlyAVA8jPY34jp9uI6KZxu37En9LLM8gvmeT2vpJGXERoiweKtmBL/uKOGmAbJ3wXRU+ifDbGHARZ0BZNHSFcIGxo8affVkMm4helsVof1hLA/gl7csYHqDrDOPXQVgpBzAs8QMCGsiMF4hFnd99KcR9dLkV2p9khzrLu0jxILqweaB2hP1Ei/VD6DTCWLQUBI3wdlXgm7SoA6cnMTSn5Ijt5xEe6MIGcPlrIBu7CK4N98KWzdgg0p7tgT80sx08+nRDDHKbFh914RqEIPi+LnGuFTQAYFyJQbYcBM3l/qlMqxTkxY9shjinxlD4I99gwwSq9qoXpjRzZcW1gRJT+HdUWNXEvfPjtWe+EnuKbeUJnYv+VIzLepwdT6yO/531O6e5biQ+zbG7td80KDdX5NPMGX1DjuPMzw9S10U3RNNIuSn8D8/qP6TyUJ1XBcUUyTIy3dXgknUK0SzgDYs5mO8AAAAASUVORK5CYII=)no-repeat center center;
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAABSlBMVEUAAAAlFhQUDgkTDwpfX18SDQoSDQcwMDAWDwkZFQ0cEBAIAQQIAgMTDgkUDgoVDQ0TDwkIAQQhGQskGwsnHQuuhCESEQwTDggIAQMUDwjjryjhrCiqgiATDgr//5UTDgingR8TDwgIAQQIAQQJAQT6wC0TDwgJAgP7wSz6wC3+wjAZFQv/1Uf6wCwTDwn5wCwJAQMaEgkUDgj5wCyYdR0TDglKORAUDgkTDgkOCQf5wS0IAgQJAwT7wC77wi0QDggYEAwgICD1uyvpsisJAQP6wCz6wC0TDwnXpSf5wC0IAQTAkyOfeR4TDwkUDwkJAQS1iyGxiSH6vy0wJA07LBB0WRgIAQTfrChhSRT5vy35wC0JAgP6vy0UDgkUDwn5wC35wS0UEAn6wCwUDgnHmCP8wCz7wjAUDwpANQv/yDf/0S4TDgj6vywIAQO/pr9xAAAAa3RSTlMADGNyAnQ5BR0TEL6dyUIg7djS0M7NJvz59unnzGoB+Mu7uLSsnpWRdGYsFwb07+bl3tjVx8fBpZ+Eg31URT4tHwj57+7r6uPe3dnU0tLR0dDPzMjEwMC/v7SrpZSNiomHcG1YV1E7MxgOC7YxrVcAAAHjSURBVDjL1dRXc5tAEMDxBSMksMDESdQSSbEk1yiOa2zHLU7vvTf3uvD9X73HMVoQZ439Zv+fgPvNaWc4AVe7rKZqw1BQ10F1xYVCt60W8cwmzaQ1sVeelcBihqWcptmURR3t/ahUKreoN19oaSS5cfSAq435sseDiGUbuEXEugVd7Uf6IyJW+bFdRlyAVA8jPY34jp9uI6KZxu37En9LLM8gvmeT2vpJGXERoiweKtmBL/uKOGmAbJ3wXRU+ifDbGHARZ0BZNHSFcIGxo8affVkMm4helsVof1hLA/gl7csYHqDrDOPXQVgpBzAs8QMCGsiMF4hFnd99KcR9dLkV2p9khzrLu0jxILqweaB2hP1Ei/VD6DTCWLQUBI3wdlXgm7SoA6cnMTSn5Ijt5xEe6MIGcPlrIBu7CK4N98KWzdgg0p7tgT80sx08+nRDDHKbFh914RqEIPi+LnGuFTQAYFyJQbYcBM3l/qlMqxTkxY9shjinxlD4I99gwwSq9qoXpjRzZcW1gRJT+HdUWNXEvfPjtWe+EnuKbeUJnYv+VIzLepwdT6yO/531O6e5biQ+zbG7td80KDdX5NPMGX1DjuPMzw9S10U3RNNIuSn8D8/qP6TyUJ1XBcUUyTIy3dXgknUK0SzgDYs5mO8AAAAASUVORK5CYII=)no-repeat center center;
background-size: 100%;
}
.cate_icon {
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAABF1BMVEUAAAAcHBwUDwgUDgkTDgkTDggTDggUDggTDwkTDwk+Pj4cFAkUDggUDgkTDgkUDgkUDwkUDgkWEQsbFQ07LQ49Lw8TDwgUDwkTDwoWEgkUDwoTDggTDwgTDggTDwgTDgkUDggTDgoUDwoVDgslGwsdFgkUDggTDggTDwkUDwgUEQo0KQ0UEAocGA0aEgkVFRUTDwkTDgg/MA9AMQ9AMg8VDwgTDwkVEAoVEAsUEAkVFQojEREtIQsUDwguIw04Kw4UDwlCMhBBMQ8UDwkUDghAMBBAMRE+Lg4VDgk4KxAXDw8TDgj5vyx4WxdvVRYXEQgqHwwgGQryuivmsCiCYxlNOxHRoCbGmCS2jCKpgR9sUxY6LA4tIg3/BqV7AAAAS3RSTlMACJnD5fzYtKnwBBv36a+Pc1ctEtfOnZSEODL58vG6oX5pZ0b+/tzU0V1LPz8nHQvuyMG3kXp3YmBQFw709PPfwaOdjIB/eG9tTiLqLyxHAAAB5ElEQVQ4y+WU13KbQBhGkQUqCIiMbHXJ6sVWcY0dO70nRwmRS/r7P0eIWLOLx+YumczkXAD/t2fZZfhB+19IjEsZn2I+F0a5w/1Nn4M3iRtuJYWg3hHRqz6CxztR1/itZbNZAyivomcAy+WyD3iqnUhhlFfrz9dtjKp/sePR+3a+8Lm49Hio7OQYysoijn/agC8LwSW8lnIRCmGRxPaPPa4W11zAvpQd7MhM/wjfFyE9NuR4Gl0Wa0L+KOVPf0fOYJkx8rnHppRbsB0jf4XnUp5a6O6d8uefeFNNch9qzdK9FUMh//gQcOXBoaZglpAIWeHA1CJMmo/ukPtP3t3W0iHR4o+Qc2fmLXEh7zxNXiPMkg7sFqc33W0dhVU0tggw8lG3C9RSAdlA7gCptXxpBLxU3TMd660ZeYNVAyu443EDuorchmBAymk4kcuOFHkLzqLyqUFTHXbj+vkBtEUtihi5DZUwmUE5Tj5RO7wKR3HyBFph0oF19QGNhDKz4ffsLnZB+V8V1N6XU3MNksGX5gQ3MIuwpklmdeyJcJMw9s/zIQy7Cc2s7EHjVFPoAKOMT9KC9Cp6PwCMQQ2AF5rKkR8KHLG/QoaAvXqwS4m7Ncj66E0ldltOMl2ualU7Ksczd7V/iV/8C5Mn329uRwAAAABJRU5ErkJggg==)no-repeat center center;
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAABF1BMVEUAAAAcHBwUDwgUDgkTDgkTDggTDggUDggTDwkTDwk+Pj4cFAkUDggUDgkTDgkUDgkUDwkUDgkWEQsbFQ07LQ49Lw8TDwgUDwkTDwoWEgkUDwoTDggTDwgTDggTDwgTDgkUDggTDgoUDwoVDgslGwsdFgkUDggTDggTDwkUDwgUEQo0KQ0UEAocGA0aEgkVFRUTDwkTDgg/MA9AMQ9AMg8VDwgTDwkVEAoVEAsUEAkVFQojEREtIQsUDwguIw04Kw4UDwlCMhBBMQ8UDwkUDghAMBBAMRE+Lg4VDgk4KxAXDw8TDgj5vyx4WxdvVRYXEQgqHwwgGQryuivmsCiCYxlNOxHRoCbGmCS2jCKpgR9sUxY6LA4tIg3/BqV7AAAAS3RSTlMACJnD5fzYtKnwBBv36a+Pc1ctEtfOnZSEODL58vG6oX5pZ0b+/tzU0V1LPz8nHQvuyMG3kXp3YmBQFw709PPfwaOdjIB/eG9tTiLqLyxHAAAB5ElEQVQ4y+WU13KbQBhGkQUqCIiMbHXJ6sVWcY0dO70nRwmRS/r7P0eIWLOLx+YumczkXAD/t2fZZfhB+19IjEsZn2I+F0a5w/1Nn4M3iRtuJYWg3hHRqz6CxztR1/itZbNZAyivomcAy+WyD3iqnUhhlFfrz9dtjKp/sePR+3a+8Lm49Hio7OQYysoijn/agC8LwSW8lnIRCmGRxPaPPa4W11zAvpQd7MhM/wjfFyE9NuR4Gl0Wa0L+KOVPf0fOYJkx8rnHppRbsB0jf4XnUp5a6O6d8uefeFNNch9qzdK9FUMh//gQcOXBoaZglpAIWeHA1CJMmo/ukPtP3t3W0iHR4o+Qc2fmLXEh7zxNXiPMkg7sFqc33W0dhVU0tggw8lG3C9RSAdlA7gCptXxpBLxU3TMd660ZeYNVAyu443EDuorchmBAymk4kcuOFHkLzqLyqUFTHXbj+vkBtEUtihi5DZUwmUE5Tj5RO7wKR3HyBFph0oF19QGNhDKz4ffsLnZB+V8V1N6XU3MNksGX5gQ3MIuwpklmdeyJcJMw9s/zIQy7Cc2s7EHjVFPoAKOMT9KC9Cp6PwCMQQ2AF5rKkR8KHLG/QoaAvXqwS4m7Ncj66E0ldltOMl2ualU7Ksczd7V/iV/8C5Mn329uRwAAAABJRU5ErkJggg==)no-repeat center center;
background-size: 100%;
}
.cart_icon {
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAA9lBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD6wi0AAAAAAAAAAAAAAAAAAAAAAAAAAAAKCAEAAAAAAAAAAAAAAAADAwAAAAAAAAAAAAD/xTAAAAD/1DoAAAAAAAAAAAAAAAD7wyz8xC77xC8uIwgWEQNTPw5GNgz7wiwmHgcAAAAAAAD7wS0AAAD7wSwAAAAAAAAAAAD6wS38wy37wS0AAAD/xjD//0AAAAD6wSxQPg54XRUuIwg4KwlaRQ9pURLyuirstinqtCnVpCXDliKyiR+NbBhyWBQzKAkyJggBVTZuAAAAQHRSTlMAQwziMyEYFvf9B6Sj5sQD25plKc+Ubkck/vbwuK6pXFEvJxAL7Na/sX9NPP7+/fzt5+HGtZqQi4mDa1U+OB0ECOMiggAAAVhJREFUOMvN1OdOwzAUhmG3lKQ2DQltuvde7L35ApQ97/9mCJGKTl278h8Er5QfR+dRZCmK2Z8nXGOa9rljGdoqwhqG7wVQ7seNbLsLXjc9ch44YKblgBibya1Xe0tyXoSyQGHGFnyoGrCwFcCm1nKUltdVuAZ0c5m4nGAKnAfUH4hgOjaYKfZQco1xGT6LEglam0WlZnESqyyqApq3GFdB83+wpcLuMk1osarfxK3xaFyT8c7ad4fD07Pz1mWnc8VYpzUa7m8HYXcyngRRb7fT1sPnPQgW4U/QikpcmuKXG9qrEjvYCPRNAEFwH3jW2scidqVfckuL74EsxcIDNp+U9CG0ZZvRYgD4x/V8kyKAtHw3cGg7YnKJiprzvbzySkvE5ruw52Eh3WRS2mWzBN7Q2UQSnB4lC6AiI7ockPkEQE2HjwGkyGz34GR02PKkpZsRTJsIl/+qL/pUf+OcGQ4QAAAAAElFTkSuQmCC)no-repeat center center;
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAA9lBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD6wi0AAAAAAAAAAAAAAAAAAAAAAAAAAAAKCAEAAAAAAAAAAAAAAAADAwAAAAAAAAAAAAD/xTAAAAD/1DoAAAAAAAAAAAAAAAD7wyz8xC77xC8uIwgWEQNTPw5GNgz7wiwmHgcAAAAAAAD7wS0AAAD7wSwAAAAAAAAAAAD6wS38wy37wS0AAAD/xjD//0AAAAD6wSxQPg54XRUuIwg4KwlaRQ9pURLyuirstinqtCnVpCXDliKyiR+NbBhyWBQzKAkyJggBVTZuAAAAQHRSTlMAQwziMyEYFvf9B6Sj5sQD25plKc+Ubkck/vbwuK6pXFEvJxAL7Na/sX9NPP7+/fzt5+HGtZqQi4mDa1U+OB0ECOMiggAAAVhJREFUOMvN1OdOwzAUhmG3lKQ2DQltuvde7L35ApQ97/9mCJGKTl278h8Er5QfR+dRZCmK2Z8nXGOa9rljGdoqwhqG7wVQ7seNbLsLXjc9ch44YKblgBibya1Xe0tyXoSyQGHGFnyoGrCwFcCm1nKUltdVuAZ0c5m4nGAKnAfUH4hgOjaYKfZQco1xGT6LEglam0WlZnESqyyqApq3GFdB83+wpcLuMk1osarfxK3xaFyT8c7ad4fD07Pz1mWnc8VYpzUa7m8HYXcyngRRb7fT1sPnPQgW4U/QikpcmuKXG9qrEjvYCPRNAEFwH3jW2scidqVfckuL74EsxcIDNp+U9CG0ZZvRYgD4x/V8kyKAtHw3cGg7YnKJiprzvbzySkvE5ruw52Eh3WRS2mWzBN7Q2UQSnB4lC6AiI7ockPkEQE2HjwGkyGz34GR02PKkpZsRTJsIl/+qL/pUf+OcGQ4QAAAAAElFTkSuQmCC)no-repeat center center;
background-size: 100%;
}
.shop_icon {
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAA3lBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7wiwAAAAAAAAAAAD7wi0AAAAAAAAAAAD/yTL6wiwAAAD7wSwAAAAAAAD6wi0AAAAAAAAAAAD8wi0AAAAAAAAAAAD/2U77wiz6wi0AAAD7wi38wi37wSz6wyz8wy78wiz7wS7/xC//xjkAAAD7wSyT/PkuAAAASHRSTlMA4bj75ncK9vGbIstBEwfZ1KGBamNfNCUD3pOOilJNQy8pHQ7s6L6xq3x8cD4S1M68taWhl4dzT0g5NwbxzMK0k4RuXktCKwmQ/edfAAABrUlEQVQ4y82U2VbiQBCGGzuBJBCWJAQBARFRFtFxm1Fn37+8/wtN4gyDJ6mOXvpdpE/V+XNS/VdV1GulOuna4ch7ibRxWuORtl1V5RxdssMalWrvLdCX0b13OB5YwO2+WXtYg73ptnQ7jYZGrV+B4EkcW9A1iW9gmP+S48vanqaeqzGEA1l8C5Ncar/FsXzHNpVCzoYzsXFwU/QH3oolS/mqwb0HiIpZTUcSe2Cnx3L+6298/fG9UjODHU1w0+Nrcr7JwmUyT8UxrJVEHSt9/j5P5ssf398kybs0CiAWxSvIxmyT6lI+ZNpmBcswnjVaTZXy88vn62+bfzavlMwBuas3NJZpA2ZtcJu7+M6BsTLhHUN9215/oDMzzfRawEUQdbthtop6rcrwXc1/2mfP7HadHc6qbL9npwD9xVWns/ikAWtSWrF2p9uKogrosMwL7+m0BIIfsssZYwctOn2FMLoNjXNU1MZwIexmCG4xe4KO5cHVU2FPFrLzwq6soaFE+rSKVThKZgi9wvsnBvEI7nKpGtZegcduPhR+pVWNROaxPxjkJyToVyQi9Rr5A0ULTH4PXjfXAAAAAElFTkSuQmCC)no-repeat center center;
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAMAAAApWqozAAAA3lBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD7wiwAAAAAAAAAAAD7wi0AAAAAAAAAAAD/yTL6wiwAAAD7wSwAAAAAAAD6wi0AAAAAAAAAAAD8wi0AAAAAAAAAAAD/2U77wiz6wi0AAAD7wi38wi37wSz6wyz8wy78wiz7wS7/xC//xjkAAAD7wSyT/PkuAAAASHRSTlMA4bj75ncK9vGbIstBEwfZ1KGBamNfNCUD3pOOilJNQy8pHQ7s6L6xq3x8cD4S1M68taWhl4dzT0g5NwbxzMK0k4RuXktCKwmQ/edfAAABrUlEQVQ4y82U2VbiQBCGGzuBJBCWJAQBARFRFtFxm1Fn37+8/wtN4gyDJ6mOXvpdpE/V+XNS/VdV1GulOuna4ch7ibRxWuORtl1V5RxdssMalWrvLdCX0b13OB5YwO2+WXtYg73ptnQ7jYZGrV+B4EkcW9A1iW9gmP+S48vanqaeqzGEA1l8C5Ncar/FsXzHNpVCzoYzsXFwU/QH3oolS/mqwb0HiIpZTUcSe2Cnx3L+6298/fG9UjODHU1w0+Nrcr7JwmUyT8UxrJVEHSt9/j5P5ssf398kybs0CiAWxSvIxmyT6lI+ZNpmBcswnjVaTZXy88vn62+bfzavlMwBuas3NJZpA2ZtcJu7+M6BsTLhHUN9215/oDMzzfRawEUQdbthtop6rcrwXc1/2mfP7HadHc6qbL9npwD9xVWns/ikAWtSWrF2p9uKogrosMwL7+m0BIIfsssZYwctOn2FMLoNjXNU1MZwIexmCG4xe4KO5cHVU2FPFrLzwq6soaFE+rSKVThKZgi9wvsnBvEI7nKpGtZegcduPhR+pVWNROaxPxjkJyToVyQi9Rr5A0ULTH4PXjfXAAAAAElFTkSuQmCC)no-repeat center center;
background-size: 100%;
}
text {
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
index f65dfcaad36ed51e35b4589717fc8e4a19436909..830b5fc057b05e47bf83f2b6f92b1d733f4a0724 100755
--- a/components/uni-popup/uni-popup.vue
+++ b/components/uni-popup/uni-popup.vue
@@ -1,11 +1,21 @@
-<template>
- <view v-if="showPopup" class="uni-popup" @touchmove.stop.prevent="clear">
- <uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
- <uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
- <view class="uni-popup__wrapper-box" @click.stop="clear">
- <slot />
- </view>
- </uni-transition>
+<template>
+ <view v-if="showPopup">
+ <view v-if="!scroll" class="uni-popup" @touchmove.stop.prevent="clear">
+ <uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+ <uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+ <view class="uni-popup__wrapper-box" @click.stop="clear">
+ <slot />
+ </view>
+ </uni-transition>
+ </view>
+ <view v-else class="uni-popup">
+ <uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+ <uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+ <view class="uni-popup__wrapper-box" @click.stop="clear">
+ <slot />
+ </view>
+ </uni-transition>
+ </view>
</view>
</template>
@@ -45,6 +55,10 @@
maskClick: {
type: Boolean,
default: true
+ },
+ scroll: {
+ type: Boolean,
+ default: false
}
},
data() {
diff --git a/index.html b/index.html
index 2a3000d90cba30d024f2cf010707b3f6c35114b7..4450a47d0d1b890c54da4013d651ce5e4ac24f5c 100755
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
<meta name="description" content="瀹犵墿琛屼笟涓€绔欏紡B2B閲囪喘骞冲彴">
<meta name="keywords" content="璋涘疂澶氬 璋涘疂澶氬鍟嗗煄 璋涘疂 瀹濆澶� 鏈夊疂 灏忚皼">
<link rel="shortcut icon" href="https://dbc-static.oss-cn-beijing.aliyuncs.com/wx/logo.jpg" type="image/x-icon">
diff --git a/manifest.json b/manifest.json
index e9b56f2c72af405f20e4615d1d9f09ffb7b3e4ca..c7ca3f960c114429c5914bc8f901c84481b375e9 100755
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
"mode": "history",
"base": "/uni"
},
- "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/prod/1.0.29/",
+ "publicPath": "https://dbc-static.oss-cn-beijing.aliyuncs.com/dbc-shop/uni/test/1.0.29/",
"optimization": {
"treeShaking": {
"enable": true
diff --git a/pages/theRights/theRights.vue b/pages/theRights/theRights.vue
index 6f0d0eeb4a8f207026a8abf3e12218392233d5f3..dc2c4c5343f996aca7246b31404cf91f278fc996 100644
--- a/pages/theRights/theRights.vue
+++ b/pages/theRights/theRights.vue
@@ -120,7 +120,7 @@
<view class="open_btn" v-if="status === -1 && Number(is_auth) === -1" @click="reupload">绔嬪嵆寮€閫�</view>
<view class="open_btn" v-else @click="go_open">绔嬪嵆寮€閫�</view>
</view>
- <uni-popup ref="popup">
+ <uni-popup ref="popup" :scroll="true">
<protocal />
</uni-popup>
</view>
@@ -383,7 +383,7 @@
justify-content: center;
margin-top: 52rpx;
.advantage_item {
- width: 160rpx;
+ width: 170rpx;
margin-bottom: 24rpx;
.icon {
width: 92rpx;
@@ -443,7 +443,7 @@
}
}
.advantage_item:nth-of-type(3n-1) {
- margin: 0 52rpx;
+ margin: 0 42rpx;
}
}
.advantage_btn {