diff --git a/main.js b/main.js
index d78f9d4..85f08be 100644
--- a/main.js
+++ b/main.js
@@ -16,7 +16,7 @@ Vue.prototype.$noMultipleClicks = common.noMultipleClicks
Vue.prototype.$c = common;
//var loginPage = "http://api.zpc-xy.com/login.html";
// var loginPage="http://api.zpc-xy.com/login.html";
-var loginPage="https://xinglanmh.shequtuangou.vip/login.html";
+var loginPage = "https://xinglanmh.shequtuangou.vip/login.html";
Vue.prototype.$loginPage = loginPage;
Vue.prototype.$wxloginPage =
`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx0e33d80d35e4a3b1&redirect_uri=${escape(loginPage)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`;
@@ -191,7 +191,31 @@ function loadScript(url) {
loadScript('https://res.wx.qq.com/open/js/jweixin-1.6.0.js');
// #endif
+// #ifdef MP-WEIXIN
+const updateManager = wx.getUpdateManager()
+console.log(updateManager);
+updateManager.onCheckForUpdate(function(res) {
+ // 请求完新版本信息的回调
+ console.log(res.hasUpdate)
+})
+updateManager.onUpdateReady(function() {
+ wx.showModal({
+ title: '更新提示',
+ content: '新版本已经准备好,是否重启应用?',
+ success(res) {
+ if (res.confirm) {
+ // 新的版本已经下载好,调用 applyUpdate 应用新版本并重启
+ updateManager.applyUpdate()
+ }
+ }
+ })
+})
+
+updateManager.onUpdateFailed(function() {
+ // 新版本下载失败
+})
+// #endif
Vue.prototype.onBridgeReady = function(data) {
var x = {
"appId": "wx2421b1c4370ec43b", //公众号ID,由商户传入
diff --git a/pages/sangdai/sangdai.vue b/pages/sangdai/sangdai.vue
index 93728a6..fefecab 100644
--- a/pages/sangdai/sangdai.vue
+++ b/pages/sangdai/sangdai.vue
@@ -86,6 +86,7 @@
×{{ a.prize_num }}
+ 已发货
@@ -420,7 +421,7 @@
(pre, item) => pre + item.chooseNum * item.goodslist_money,
0
)
- console.log("8888888" , total);
+ console.log("8888888", total);
return total.toFixed(2);
},
@@ -925,7 +926,7 @@
width: 155rpx;
height: 68rpx;
position: relative;
- margin-right: 30rpx;
+ margin-right: 25rpx;
font-family: YouSheBiaoTiHei;
&.act {
diff --git a/pages/shouye/yaoqing_ranking.vue b/pages/shouye/yaoqing_ranking.vue
index a0b22e6..74ae291 100644
--- a/pages/shouye/yaoqing_ranking.vue
+++ b/pages/shouye/yaoqing_ranking.vue
@@ -15,7 +15,7 @@
:style="{top:$sys().statusBarHeight+'px'}" @tap="$c.back(1)" color="#FFFFFF">
- 邀请榜
+ 邀新排行榜
diff --git a/pages/user/order.vue b/pages/user/order.vue
index fe5f88f..6b57220 100644
--- a/pages/user/order.vue
+++ b/pages/user/order.vue
@@ -35,6 +35,9 @@
×{{ item.prize_num }}
+ 已发货
{{ item.goodslist_title }}
@@ -71,14 +74,14 @@
this.getData(e.id)
},
methods: {
- copy(num){
+ copy(num) {
uni.setClipboardData({
data: num + '',
showToast: false,
success: (res) => {
uni.showToast({
- title:'复制成功',
- icon:"none"
+ title: '复制成功',
+ icon: "none"
})
}
})
@@ -171,8 +174,8 @@
padding: 20rpx 0;
display: flex;
align-items: center;
-
- >image{
+
+ >image {
width: 40rpx;
height: 40rpx;
margin-left: 10rpx;