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/manifest.json b/manifest.json
index 5d9c9a9..377f67b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "吧唧一番赏",
- "appid" : "__UNI__0A3F586",
+ "appid" : "__UNI__46B4383",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : 101,
diff --git a/package/index/leitai.vue b/package/index/leitai.vue
index 739e01d..281b398 100644
--- a/package/index/leitai.vue
+++ b/package/index/leitai.vue
@@ -24,7 +24,8 @@
- 第{{ pageData.goods.num }}/{{pageData.goods.stock}}箱
+ 第{{ pageData.goods.num }}/{{pageData.goods.stock}}箱
+
换箱
@@ -49,7 +50,8 @@
- 剩余库存{{pageData.goods.goodslist_surplus_stock}}/{{pageData.goods.goodslist_stock}}
+ 剩余库存{{pageData.goods.goodslist_surplus_stock}}/{{pageData.goods.goodslist_stock}}
+
@@ -64,7 +66,8 @@
- {{ item.shang_info.title }}
+
+ {{ item.shang_info.title }}
{{ item.surplus_stock }}/{{ item.stock }}
预售
@@ -246,7 +249,7 @@
? `-${couponData.price}`
: '未选择'
}}
-
+
@@ -286,15 +289,15 @@
-
+
@@ -302,8 +305,10 @@
{{ orderData.use_money }} (剩余:{{ orderData.money }})
-
-
+
+
+
@@ -400,7 +405,7 @@
boxNum: '',
buyNum: 0,
useMoney: true,
- useIntegral: true,
+ useIntegral: false,
// 下拉刷新的配置(可选, 绝大部分情况无需配置)
downOption: {
auto: false
@@ -419,7 +424,7 @@
2: {
title: '概率'
},
- 3:{
+ 3: {
title: '记录'
},
},
@@ -449,7 +454,7 @@
logList: [],
sendRuleData: '',
previewData: '',
- current:0
+ current: 0
}
},
@@ -733,7 +738,7 @@
this.subTabChange(this.subTabCur)
break
case 4:
-
+
break
}
},
@@ -770,7 +775,7 @@
num,
size
}) {
- if(num>1) return this.mescroll.endByPage(this.logList.length, 1)
+ if (num > 1) return this.mescroll.endByPage(this.logList.length, 1)
this.req({
url: 'shang_log',
data: {
@@ -847,32 +852,39 @@
.content {
padding: 0 0 300rpx;
- .gailvList{
+
+ .gailvList {
width: 686rpx;
margin: 0 auto 0;
- &-item{
+
+ &-item {
margin: 28rpx 0 0;
background: #3B3941;
border: 1px solid #FFFFFF;
box-sizing: border-box;
padding: 28rpx 32rpx;
- >view:nth-child(1){
+
+ >view:nth-child(1) {
width: 100rpx;
font-weight: 700;
font-size: 28rpx;
}
- >view:nth-child(2){
+
+ >view:nth-child(2) {
font-weight: 400;
font-size: 28rpx;
color: #FFFFFF;
- >text:nth-child(1){
+
+ >text:nth-child(1) {
flex: 1;
}
- >text:nth-child(2){
+
+ >text:nth-child(2) {
flex: 3;
}
}
- >view:nth-child(3){
+
+ >view:nth-child(3) {
font-weight: 700;
font-size: 28rpx;
color: #3BFFF9;
@@ -910,7 +922,7 @@
color: #FFFFFF;
background: #3B3941;
border-radius: 8rpx 8rpx 8rpx 8rpx;
- border: 2rpx solid rgba(255,255,255,0.27);
+ border: 2rpx solid rgba(255, 255, 255, 0.27);
}
&:last-child {
@@ -965,7 +977,8 @@
padding-left: 60rpx;
display: flex;
align-items: center;
- .prize-shang{
+
+ .prize-shang {
height: 40rpx;
padding: 0 20rpx;
background: #B07AF3;
@@ -975,6 +988,7 @@
font-size: 24rpx;
color: #FFFFFF;
}
+
.pic {
width: 80rpx;
height: 80rpx;
@@ -1000,28 +1014,33 @@
}
}
- .header{
+ .header {
padding: 80rpx 0 0;
- &-title{
+
+ &-title {
z-index: 10;
- >text{
+
+ >text {
color: #FFFFFF;
margin: 0 10rpx;
font-weight: 400;
font-size: 50rpx;
text-shadow: #894DD3 1rpx 0 0, #894DD3 0 1rpx 0, #894DD3 -1rpx 0 0, #894DD3 0 -1rpx 0;
}
- >image{
+
+ >image {
width: 24rpx;
height: 32rpx;
}
}
- &-main{
+
+ &-main {
width: 686rpx;
height: 546rpx;
margin: -28rpx auto 0;
background: url($imgurl+'index/lianji.png') no-repeat 0 0 / 100% 100%;
- &-title{
+
+ &-title {
width: 500rpx;
padding-top: 80rpx;
font-weight: 400;
@@ -1029,27 +1048,31 @@
color: #FFFFFF;
text-align: center;
}
- &-wuzhe{
+
+ &-wuzhe {
width: 160rpx;
height: 60rpx;
position: absolute;
- top:300rpx;
+ top: 300rpx;
left: 0;
z-index: 20;
}
- &-swiper{
+
+ &-swiper {
margin-top: 14rpx;
width: 646rpx;
height: 238rpx;
- &-item{
+
+ &-item {
width: 646rpx;
height: 238rpx;
border-radius: 20rpx;
overflow: hidden;
}
- &-num{
+
+ &-num {
height: 38rpx;
- background: rgba(0,0,0,0.3);
+ background: rgba(0, 0, 0, 0.3);
padding: 0 20rpx;
font-weight: 400;
font-size: 24rpx;
@@ -1060,7 +1083,8 @@
transform: translateX(-50%);
z-index: 10;
}
- &-huanxiang{
+
+ &-huanxiang {
width: 88rpx;
height: 42rpx;
background: #B07AF3;
@@ -1075,33 +1099,39 @@
z-index: 10;
}
}
- &-huanxiang{
+
+ &-huanxiang {
width: 646rpx;
- >view:nth-child(2){
+
+ >view:nth-child(2) {
min-width: 260rpx;
height: 66rpx;
padding: 0 20rpx;
background: url($imgurl+'index/leitai.png') no-repeat 0 0 / 100% 100%;
- >text:nth-child(1){
+
+ >text:nth-child(1) {
font-weight: bold;
font-size: 32rpx;
color: #000000;
}
- >text:nth-child(2){
+
+ >text:nth-child(2) {
font-weight: 400;
font-size: 26rpx;
color: #000000;
}
}
- >view:nth-child(2n+1){
- >view:nth-child(1){
+
+ >view:nth-child(2n+1) {
+ >view:nth-child(1) {
width: 74rpx;
height: 56rpx;
background: #FFFFFF;
border-radius: 12rpx;
border: 2rpx solid #000000;
}
- >view:nth-child(2){
+
+ >view:nth-child(2) {
margin-top: 8rpx;
font-weight: 400;
font-size: 20rpx;
@@ -1109,19 +1139,22 @@
}
}
}
- &-jidu{
- >view:nth-child(1){
+
+ &-jidu {
+ >view:nth-child(1) {
width: 366rpx;
height: 16rpx;
- background: rgba(#FFDE52,0.3);
+ background: rgba(#FFDE52, 0.3);
border-radius: 40rpx;
- >text{
+
+ >text {
height: 16rpx;
background: #FFDE52;
border-radius: 40rpx;
}
}
- >view:nth-child(2){
+
+ >view:nth-child(2) {
font-weight: 400;
font-size: 24rpx;
color: #FFFFFF;
@@ -1130,19 +1163,20 @@
}
}
}
+
.tab {
display: flex;
align-items: center;
-
+
.tab-item {
width: 155rpx;
height: 58rpx;
font-weight: 400;
margin-right: 30rpx;
-
+
&.act {
background: url($imgurl+'index/checkTab.png') no-repeat 0 0 / 100% 100%;
-
+
>text {
font-weight: 400;
font-size: 28rpx;
@@ -1150,10 +1184,10 @@
text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
}
}
-
+
&.unact {
background: url($imgurl+'index/uncheckTab.png') no-repeat 0 0 / 100% 100%;
-
+
>text {
font-weight: 400;
font-size: 28rpx;
@@ -1162,13 +1196,14 @@
}
}
}
+
.guizeSc {
>view {
>image {
width: 28rpx;
height: 28rpx;
}
-
+
>text {
font-weight: 400;
font-size: 24rpx;
@@ -1365,7 +1400,8 @@
font-size: 44rpx;
color: #FFFFFF;
background: url($imgurl+'index/chouleitai.png') no-repeat 0 0 / 100% 100%;
- >text{
+
+ >text {
margin-bottom: 22rpx;
}
}
@@ -1411,17 +1447,19 @@
position: relative;
width: 570rpx;
box-sizing: border-box;
-
+
.pic {
width: 570rpx;
height: 598rpx;
background: #8953DC;
border: 2rpx solid #FFFFFF;
- >image{
+
+ >image {
width: 548rpx;
height: 549rpx;
}
- >view{
+
+ >view {
width: 130rpx;
height: 46rpx;
position: absolute;
@@ -1434,7 +1472,7 @@
background: url($imgurl+'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
}
}
-
+
.title {
margin: 40rpx auto 0;
width: 574rpx;
@@ -1448,30 +1486,30 @@
border: 2rpx solid #894DD3;
border-radius: 12rpx;
background: #313133;
-
+
>text {
font-weight: 400;
font-size: 32rpx;
color: #FFFFFF;
}
}
-
+
.d-list {
display: flex;
flex-flow: row wrap;
justify-content: space-between;
padding: 20rpx 0 0;
-
+
.d-item {
margin-top: 14rpx;
-
+
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #ffffff;
}
}
-
+
.close {
width: 48rpx;
height: 48rpx;
@@ -1680,11 +1718,13 @@
justify-content: center;
font-weight: 500;
color: #7825DE;
- >text:nth-child(1){
+
+ >text:nth-child(1) {
font-size: 28rpx;
margin-top: 32rpx;
}
- >text:nth-child(2){
+
+ >text:nth-child(2) {
font-size: 36rpx;
margin-top: 26rpx;
}
@@ -1723,7 +1763,8 @@
position: relative;
background: #8953DC;
border: 2rpx solid #FFFFFF;
- >image{
+
+ >image {
width: 202rpx;
height: 202rpx;
}
@@ -1755,6 +1796,7 @@
text-shadow: #000 1rpx 0 0, #000 0 1rpx 0, #000 -1rpx 0 0, #000 0 -1rpx 0;
}
}
+
.title {
padding: 10rpx 10rpx 0;
font-weight: 400;
@@ -1782,14 +1824,17 @@
height: 116rpx;
font-weight: 400;
font-size: 28rpx;
- >text{
+
+ >text {
margin-top: 36rpx;
}
}
- >view:nth-child(1){
+
+ >view:nth-child(1) {
color: #DE6025;
}
- >view:nth-child(2){
+
+ >view:nth-child(2) {
color: #7825DE;
}
}
diff --git a/pages.json b/pages.json
index 4b78b05..8b8a092 100644
--- a/pages.json
+++ b/pages.json
@@ -416,6 +416,16 @@
"style": {
"navigationBarTitleText": "绑定手机号"
}
+ },
+
+ {
+ "path" : "pages/shouye/yaoqing_ranking",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
}
],
"subPackages": [{
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index cdd6298..026f53e 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -95,7 +95,7 @@
- 吧唧币¥
+ 吧唧币
{{ orderData.goods.price*100 }} (剩余:{{ orderData.use_integral }})
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/index.vue b/pages/shouye/index.vue
index 36d36db..dd70cfa 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -151,10 +151,14 @@
-
-
+
+
+
+
@@ -491,6 +495,11 @@
uni.navigateTo({
url: '/pages/shouye/ranking'
});
+ },
+ toyaoqingRanking() {
+ uni.navigateTo({
+ url: '/pages/shouye/yaoqing_ranking'
+ });
}
}
}
diff --git a/pages/shouye/yaoqing_ranking.vue b/pages/shouye/yaoqing_ranking.vue
new file mode 100644
index 0000000..74ae291
--- /dev/null
+++ b/pages/shouye/yaoqing_ranking.vue
@@ -0,0 +1,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 邀新排行榜
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{index+1}}
+
+
+
+
+
+
+ {{item.nickname}}
+
+
+ {{item.invitenumber}}人
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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;