From 83e49ed8b1ab05dd332def0fba6c3703d1e91373 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 11 八月 2023 16:32:28 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.5开发' into develop
---
uniapp/pages/mine/mine.vue | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 155 insertions(+), 25 deletions(-)
diff --git a/uniapp/pages/mine/mine.vue b/uniapp/pages/mine/mine.vue
index dd7451d..87f34a6 100644
--- a/uniapp/pages/mine/mine.vue
+++ b/uniapp/pages/mine/mine.vue
@@ -1,5 +1,8 @@
<template>
- <view class="minePage-wrapper">
+ <view v-if="isshowtype">
+ <minePage></minePage>
+ </view>
+ <view v-else class="minePage-wrapper">
<view class="fixed-box colCen" style="background:linear-gradient(263deg, #D20CFC, #8905F6);">
<view class="topbarbox"></view>
<view class="navigate-container rowCenBet">
@@ -81,8 +84,8 @@
</view>
</view>
</view>
-
<view class="account-assets-container rowCenCen borderBox" v-if="!showtar || platform!='iOS'">
+
<view class="cardBac-container rowStaBet borderBox">
<view class="left-content">
<view class="balance">
@@ -124,19 +127,39 @@
</view>
</view>
</view>
-
+
+ <view class="vip-info-container rowCenBet" v-if="!showtar || platform!='iOS'">
+ <view class="left-info" v-if="user.level != 3">
+ 鍗囩骇绛夌骇鍙嬁鏇撮珮鏀剁泭
+ </view>
+ <view class="left-info" v-else>
+ 鎮ㄥ凡缁忔槸鏈�楂樼瓑绾�,蹇幓閭�璇峰ソ鍙嬭禋浣ｉ噾鍚�!
+ </view>
+ <view class="rt-btn rowCenCen" @tap="golevelRules()" v-if="user.level != 3">
+ <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
+ <view class="level-txt">
+ 绔嬪嵆鍗囩骇
+ </view>
+ </view>
+ <view class="rt-btn rowCenCen" @tap="golevelRules()" v-else>
+ <image class="vipimg" src="../../static/images/goods/vip.png" mode="aspectFill"></image>
+ <view class="level-txt">
+ 绔嬪嵆鏌ョ湅
+ </view>
+ </view>
+ </view>
<view class="swiper-container borderBox" v-if="bannerList.length>0">
<swiper class="banerContent" :autoplay="true" :interval="3000" :duration="1000" circular>
<swiper-item v-for="(items,index) in bannerList" :key="index" @tap="goUrl(items)">
<view class="swiper-items defIcon">
- <image :src="items.pic" mode="aspectFit"></image>
+ <image :src="items.image" mode="aspectFit"></image>
</view>
</swiper-item>
</swiper>
</view>
- <view style="justify-content:end;padding-left:10px" class="matter-tranform-container rowCenCen" v-if="wuLiaoList.length>0">
- <!-- <view class="pushing-matter rowCen" @tap="goUrl(wuLiaoList[0])">
+ <!-- <view style="justify-content:end;padding-left:10px" class="matter-tranform-container rowCenCen" v-if="wuLiaoList.length>0">
+ <view class="pushing-matter rowCen" @tap="goUrl(wuLiaoList[0])">
<view class="leftIteminfo">
<view class="itemName">
{{wuLiaoList[0].mname}}
@@ -149,7 +172,7 @@
<image :src="wuLiaoList[0].image" mode="aspectFill"></image>
</view>
</view>
- <view class="centerBorder"></view> -->
+ <view class="centerBorder"></view>
<view class="pushing-matter rowCen" @tap="goUrl(wuLiaoList[1])">
<view class="leftIteminfo">
<view class="itemName">
@@ -165,7 +188,7 @@
</view>
- </view>
+ </view>-->
<view class="commonFunctions-container" v-if="cygnList.length>0">
<view class="card-title">
@@ -243,10 +266,12 @@
import APPUpdate from "../../utils/appUpdate.js";
import inviteCodeModel from '../../components/inviteCode.vue'
import inviterModel from '../../components/inviterModel.vue'
+ import minePage from '../../components/sh_page/minePage.vue'
export default {
components: {
inviteCodeModel,
- inviterModel
+ inviterModel,
+ minePage,
},
data() {
return {
@@ -262,10 +287,11 @@
platform: '',
showtar: false,
bbcList:'',
-
sct: 0,
inviteCodeShow:false,
- inviterShow:false
+ inviterShow:false,
+ isshowtype:false,
+ hasshow:false
}
},
onPageScroll(e) {
@@ -278,6 +304,7 @@
this.getuserInfo();
this.centerInfo();
this.getmoneyInfo();
+ this.getInit();
uni.stopPullDownRefresh();
},
onLoad() {
@@ -286,24 +313,60 @@
url:"/pages/login/wxlogin"
})
}else{
- // #ifdef APP-PLUS
- this.appInfo = uni.getStorageSync('appInfo');
- console.log(this.appInfo.iosExamine);
- this.showtar = getApp().globalData.ifwt == 1 ? false : true;
- this.platform = plus.os.name
- // #endif
+ //getApp().watch(this.ifwtChange,'ifwt')
this.centerInfo()
this.getbanner()
}
-
},
onShow() {
if(this.hasLogin){
+ this.getInit();
this.getmoneyInfo()
this.getuserInfo()
}
+ if(!this.hasshow)
+ {
+ this.shShow();
+ }
},
methods: {
+ shShow()
+ {
+ var that=this;
+ this.$u.api.comminInt({}).then(e => {
+ that.hasshow=true;
+ // #ifdef APP-PLUS
+ if (plus.os.name == 'iOS') {
+ if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
+ that.isshowtype=true;
+ } else {
+ that.isshowtype=false;
+ }
+ }
+ // #endif
+ }).catch(function(err) {
+ console.log(err);
+ })
+ },
+ getInit()
+ {
+ console.log(getApp().globalData)
+ if(!getApp().globalData.hasinit)
+ {
+ console.log('鍒濆鍖�1111')
+ getApp().getAppInfo();
+ setTimeout(()=>{
+ this.getInit();
+ },2000)
+ }
+ // #ifdef APP-PLUS
+ console.log(getApp().globalData.ifwt)
+ this.appInfo = uni.getStorageSync('appInfo');
+ this.showtar = getApp().globalData.ifwt == 1 ? false : true;
+ this.platform = plus.os.name;
+
+ // #endif
+ },
getmoneyInfo() {
var that = this;
this.$u.api.getEstimateAmount({}).then(e => {
@@ -312,7 +375,11 @@
}).catch(function (err) {
})
},
-
+ golevelRules() {
+ uni.navigateTo({
+ url: '../goods/privilege'
+ })
+ },
getuserInfo() {
var that = this;
this.$u.api.getUserInfo({}).then(e => {
@@ -322,7 +389,6 @@
console.log(err)
})
},
-
getbanner() {
// banner鏁版嵁
var that = this;
@@ -334,6 +400,7 @@
},
centerInfo() {
+ this.user = uni.getStorageSync('userInfo');
var that = this;
this.$u.api.userHomemenu({}).then(e => {
var res = e.data.list;
@@ -381,10 +448,41 @@
},
goUrl(info) {
- util.goUrl(info,this)
+ console.log(info)
+ if(info.url_type == 15)
+ {//寰俊瀹㈡湇
+ let wechat = null
+ let parameter = info.parameter_json;
+ plus.share.getServices(res => {
+ wechat = res.find(i => i.id === 'weixin')
+ if (wechat) {
+ wechat.openCustomerServiceChat({
+ corpid: parameter.cmark, //浼佷笟ID
+ url: parameter.url, //瀹㈡湇鍦板潃
+ }, src => {
+ console.log("success:", JSON.stringify(src))
+ }, err => {
+ console.log("error:", JSON.stringify(err))
+ })
+ } else {
+ uni.showToast({
+ title: '褰撳墠鐜涓嶆敮鎸佸井淇℃搷浣�',
+ icon: "error"
+ });
+ }
+ }, function() {
+ uni.showToast({
+ title: "鑾峰彇鏈嶅姟澶辫触锛屼笉鏀寔璇ユ搷浣溿��" + JSON.stringify(e),
+ icon: 'none'
+ })
+ });
+ }
+ else
+ {
+ util.goUrl(info,this)
+ }
+
},
-
-
cpr_version(a, b) {
console.log(a);
var _a = this.toNum(a),
@@ -668,10 +766,42 @@
}
}
}
-
+ .vip-info-container {
+ width: 100%;
+ height: 60rpx;
+ background: #FFF2CF;
+ border-radius: 16rpx;
+ padding: 0 20rpx;
+ margin-bottom: 20rpx;
+
+ .left-info {
+ font-size: 24rpx;
+ font-weight: 500;
+ color: #593A0F;
+ }
+
+ .rt-btn {
+ width: 152rpx;
+ height: 44rpx;
+ background-color: rgba(0, 0, 0, 0.6);
+ border-radius: 22rpx;
+
+ .vipimg {
+ width: 27rpx;
+ height: 24rpx;
+ }
+
+ .level-txt {
+ font-size: 24rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ margin-left: 10rpx;
+ }
+ }
+ }
.mine-under-container {
width: 100%;
- margin-top: 85rpx;
+ margin-top: 95rpx;
padding: 0 30rpx;
.nav-container {
--
Gitblit v1.9.3